Skip to content

Commit 68417cb

Browse files
committed
feat(dataframe): add select(String...) method
1 parent e9eb7dd commit 68417cb

3 files changed

Lines changed: 77 additions & 1 deletion

File tree

‎native/src/lib.rs‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use datafusion::arrow::record_batch::RecordBatchIterator;
2626
use datafusion::dataframe::DataFrame;
2727
use datafusion::error::DataFusionError;
2828
use datafusion::prelude::{ParquetReadOptions, SessionContext};
29-
use jni::objects::{JByteArray, JClass, JString};
29+
use jni::objects::{JByteArray, JClass, JObjectArray, JString};
3030
use jni::sys::{jboolean, jint, jlong};
3131
use jni::JNIEnv;
3232
use tokio::runtime::Runtime;
@@ -147,6 +147,33 @@ pub extern "system" fn Java_org_apache_datafusion_DataFrame_showDataFrameWithLim
147147
})
148148
}
149149

150+
#[no_mangle]
151+
pub extern "system" fn Java_org_apache_datafusion_DataFrame_selectColumns<'local>(
152+
mut env: JNIEnv<'local>,
153+
_class: JClass<'local>,
154+
handle: jlong,
155+
column_names: JObjectArray<'local>,
156+
) -> jlong {
157+
try_unwrap_or_throw(&mut env, 0, |env| -> JniResult<jlong> {
158+
if handle == 0 {
159+
return Err("DataFrame handle is null".into());
160+
}
161+
let df = unsafe { &*(handle as *const DataFrame) }.clone();
162+
163+
let len = env.get_array_length(&column_names)?;
164+
let mut owned: Vec<String> = Vec::with_capacity(len as usize);
165+
for i in 0..len {
166+
let elem = env.get_object_array_element(&column_names, i)?;
167+
let jstr: JString = elem.into();
168+
owned.push(env.get_string(&jstr)?.into());
169+
}
170+
let refs: Vec<&str> = owned.iter().map(String::as_str).collect();
171+
172+
let new_df = df.select_columns(&refs)?;
173+
Ok(Box::into_raw(Box::new(new_df)) as jlong)
174+
})
175+
}
176+
150177
#[no_mangle]
151178
pub extern "system" fn Java_org_apache_datafusion_DataFrame_closeDataFrame<'local>(
152179
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
@@ -94,6 +94,17 @@ public void show(int limit) {
9494
showDataFrameWithLimit(nativeHandle, limit);
9595
}
9696

97+
/**
98+
* Project the listed columns into a new DataFrame. The receiver remains usable and must still be
99+
* closed independently.
100+
*/
101+
public DataFrame select(String... columnNames) {
102+
if (nativeHandle == 0) {
103+
throw new IllegalStateException("DataFrame is closed or already collected");
104+
}
105+
return new DataFrame(selectColumns(nativeHandle, columnNames));
106+
}
107+
97108
@Override
98109
public void close() {
99110
if (nativeHandle != 0) {
@@ -111,4 +122,6 @@ public void close() {
111122
private static native void showDataFrame(long handle);
112123

113124
private static native void showDataFrameWithLimit(long handle, int limit);
125+
126+
private static native long selectColumns(long handle, String[] columnNames);
114127
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919

2020
package org.apache.datafusion;
2121

22+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2223
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertTrue;
2325

26+
import org.apache.arrow.memory.BufferAllocator;
27+
import org.apache.arrow.memory.RootAllocator;
28+
import org.apache.arrow.vector.VectorSchemaRoot;
29+
import org.apache.arrow.vector.ipc.ArrowReader;
2430
import org.junit.jupiter.api.Test;
2531

2632
class DataFrameTransformationsTest {
@@ -49,4 +55,34 @@ void showWithLimitDoesNotThrow() {
4955
df.show(1_000_000);
5056
}
5157
}
58+
59+
@Test
60+
void selectProjectsAndReordersColumns() throws Exception {
61+
try (BufferAllocator allocator = new RootAllocator();
62+
SessionContext ctx = new SessionContext();
63+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b, 3 AS c");
64+
DataFrame projected = source.select("b", "a");
65+
ArrowReader reader = projected.collect(allocator)) {
66+
assertTrue(reader.loadNextBatch());
67+
VectorSchemaRoot root = reader.getVectorSchemaRoot();
68+
assertEquals(1, root.getRowCount());
69+
assertArrayEquals(
70+
new String[] {"b", "a"},
71+
root.getSchema().getFields().stream().map(f -> f.getName()).toArray(String[]::new));
72+
}
73+
}
74+
75+
@Test
76+
void selectIsNonDestructive() {
77+
try (SessionContext ctx = new SessionContext();
78+
DataFrame source = ctx.sql("SELECT 1 AS a, 2 AS b")) {
79+
try (DataFrame first = source.select("a")) {
80+
assertEquals(1L, first.count());
81+
}
82+
try (DataFrame second = source.select("b")) {
83+
assertEquals(1L, second.count());
84+
}
85+
assertEquals(1L, source.count());
86+
}
87+
}
5288
}

0 commit comments

Comments
 (0)