Skip to content

Commit 0358ea7

Browse files
committed
feat(dataframe): add dropColumns method
1 parent 29e2f8c commit 0358ea7

3 files changed

Lines changed: 81 additions & 0 deletions

File tree

‎native/src/lib.rs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,33 @@ pub extern "system" fn Java_org_apache_datafusion_DataFrame_distinctRows<'local>
229229
})
230230
}
231231

232+
#[no_mangle]
233+
pub extern "system" fn Java_org_apache_datafusion_DataFrame_dropColumns<'local>(
234+
mut env: JNIEnv<'local>,
235+
_class: JClass<'local>,
236+
handle: jlong,
237+
column_names: JObjectArray<'local>,
238+
) -> jlong {
239+
try_unwrap_or_throw(&mut env, 0, |env| -> JniResult<jlong> {
240+
if handle == 0 {
241+
return Err("DataFrame handle is null".into());
242+
}
243+
let df = unsafe { &*(handle as *const DataFrame) }.clone();
244+
245+
let len = env.get_array_length(&column_names)?;
246+
let mut owned: Vec<String> = Vec::with_capacity(len as usize);
247+
for i in 0..len {
248+
let elem = env.get_object_array_element(&column_names, i)?;
249+
let jstr: JString = elem.into();
250+
owned.push(env.get_string(&jstr)?.into());
251+
}
252+
let refs: Vec<&str> = owned.iter().map(String::as_str).collect();
253+
254+
let new_df = df.drop_columns(&refs)?;
255+
Ok(Box::into_raw(Box::new(new_df)) as jlong)
256+
})
257+
}
258+
232259
#[no_mangle]
233260
pub extern "system" fn Java_org_apache_datafusion_DataFrame_closeDataFrame<'local>(
234261
mut env: JNIEnv<'local>,

‎src/main/java/org/apache/datafusion/DataFrame.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,17 @@ public DataFrame distinct() {
152152
return new DataFrame(distinctRows(nativeHandle));
153153
}
154154

155+
/**
156+
* Drop the named columns. The inverse of {@link #select(String...)}. The receiver remains usable
157+
* and must still be closed independently.
158+
*/
159+
public DataFrame dropColumns(String... columnNames) {
160+
if (nativeHandle == 0) {
161+
throw new IllegalStateException("DataFrame is closed or already collected");
162+
}
163+
return new DataFrame(dropColumns(nativeHandle, columnNames));
164+
}
165+
155166
@Override
156167
public void close() {
157168
if (nativeHandle != 0) {
@@ -177,4 +188,6 @@ public void close() {
177188
private static native long limitRows(long handle, int skip, int fetch);
178189

179190
private static native long distinctRows(long handle);
191+
192+
private static native long dropColumns(long handle, String[] columnNames);
180193
}

‎src/test/java/org/apache/datafusion/DataFrameTransformationsTest.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,45 @@ void distinctIsNonDestructive() {
253253
assertEquals(3L, source.count());
254254
}
255255
}
256+
257+
@Test
258+
void dropColumnsRemovesNamedColumns() throws Exception {
259+
try (BufferAllocator allocator = new RootAllocator();
260+
SessionContext ctx = new SessionContext();
261+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b, 3 AS c");
262+
DataFrame dropped = source.dropColumns("b");
263+
ArrowReader reader = dropped.collect(allocator)) {
264+
assertTrue(reader.loadNextBatch());
265+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
266+
assertArrayEquals(
267+
new String[] {"a", "c"},
268+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
269+
}
270+
}
271+
272+
@Test
273+
void dropColumnsIsNonDestructive() {
274+
try (SessionContext ctx = new SessionContext();
275+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b")) {
276+
try (DataFrame dropped = source.dropColumns("a")) {
277+
assertEquals(1L, dropped.count());
278+
}
279+
assertEquals(1L, source.count());
280+
}
281+
}
282+
283+
@Test
284+
void dropColumnsSilentlyIgnoresUnknownNames() throws Exception {
285+
try (BufferAllocator allocator = new RootAllocator();
286+
SessionContext ctx = new SessionContext();
287+
DataFrame df = ctx.sql("SELECT 1 AS x");
288+
DataFrame dropped = df.dropColumns("not_a_column");
289+
ArrowReader reader = dropped.collect(allocator)) {
290+
assertTrue(reader.loadNextBatch());
291+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
292+
assertArrayEquals(
293+
new String[] {"x"},
294+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
295+
}
296+
}
256297
}

0 commit comments

Comments
 (0)