Skip to content

Commit 2b4ef33

Browse files
committed
feat(dataframe): add withColumnRenamed method
1 parent 0358ea7 commit 2b4ef33

3 files changed

Lines changed: 79 additions & 0 deletions

File tree

‎native/src/lib.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,26 @@ pub extern "system" fn Java_org_apache_datafusion_DataFrame_dropColumns<'local>(
256256
})
257257
}
258258

259+
#[no_mangle]
260+
pub extern "system" fn Java_org_apache_datafusion_DataFrame_renameColumn<'local>(
261+
mut env: JNIEnv<'local>,
262+
_class: JClass<'local>,
263+
handle: jlong,
264+
old_name: JString<'local>,
265+
new_name: JString<'local>,
266+
) -> jlong {
267+
try_unwrap_or_throw(&mut env, 0, |env| -> JniResult<jlong> {
268+
if handle == 0 {
269+
return Err("DataFrame handle is null".into());
270+
}
271+
let df = unsafe { &*(handle as *const DataFrame) }.clone();
272+
let old: String = env.get_string(&old_name)?.into();
273+
let new: String = env.get_string(&new_name)?.into();
274+
let new_df = df.with_column_renamed(&old, &new)?;
275+
Ok(Box::into_raw(Box::new(new_df)) as jlong)
276+
})
277+
}
278+
259279
#[no_mangle]
260280
pub extern "system" fn Java_org_apache_datafusion_DataFrame_closeDataFrame<'local>(
261281
mut env: JNIEnv<'local>,

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,14 @@ public DataFrame dropColumns(String... columnNames) {
163163
return new DataFrame(dropColumns(nativeHandle, columnNames));
164164
}
165165

166+
/** Rename a column. The receiver remains usable and must still be closed independently. */
167+
public DataFrame withColumnRenamed(String oldName, String newName) {
168+
if (nativeHandle == 0) {
169+
throw new IllegalStateException("DataFrame is closed or already collected");
170+
}
171+
return new DataFrame(renameColumn(nativeHandle, oldName, newName));
172+
}
173+
166174
@Override
167175
public void close() {
168176
if (nativeHandle != 0) {
@@ -190,4 +198,6 @@ public void close() {
190198
private static native long distinctRows(long handle);
191199

192200
private static native long dropColumns(long handle, String[] columnNames);
201+
202+
private static native long renameColumn(long handle, String oldName, String newName);
193203
}

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,53 @@ void dropColumnsSilentlyIgnoresUnknownNames() throws Exception {
294294
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
295295
}
296296
}
297+
298+
@Test
299+
void withColumnRenamedChangesColumnName() throws Exception {
300+
try (BufferAllocator allocator = new RootAllocator();
301+
SessionContext ctx = new SessionContext();
302+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b");
303+
DataFrame renamed = source.withColumnRenamed("a", "alpha");
304+
ArrowReader reader = renamed.collect(allocator)) {
305+
assertTrue(reader.loadNextBatch());
306+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
307+
assertArrayEquals(
308+
new String[] {"alpha", "b"},
309+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
310+
}
311+
}
312+
313+
@Test
314+
void withColumnRenamedIsNonDestructive() throws Exception {
315+
try (BufferAllocator allocator = new RootAllocator();
316+
SessionContext ctx = new SessionContext();
317+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b")) {
318+
try (DataFrame renamed = source.withColumnRenamed("a", "alpha")) {
319+
assertEquals(1L, renamed.count());
320+
}
321+
try (DataFrame again = source.select("a");
322+
ArrowReader reader = again.collect(allocator)) {
323+
assertTrue(reader.loadNextBatch());
324+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
325+
assertArrayEquals(
326+
new String[] {"a"},
327+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
328+
}
329+
}
330+
}
331+
332+
@Test
333+
void withColumnRenamedUnknownColumnIsNoOp() throws Exception {
334+
try (BufferAllocator allocator = new RootAllocator();
335+
SessionContext ctx = new SessionContext();
336+
DataFrame df = ctx.sql("SELECT 1 AS x");
337+
DataFrame renamed = df.withColumnRenamed("not_a_column", "y");
338+
ArrowReader reader = renamed.collect(allocator)) {
339+
assertTrue(reader.loadNextBatch());
340+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
341+
assertArrayEquals(
342+
new String[] {"x"},
343+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
344+
}
345+
}
297346
}

0 commit comments

Comments
 (0)