comments

Author: a10y

java/build.gradle.kts

@@ -62,7 +62,6 @@ allprojects {
 
         tasks.withType<JavaCompile> {
             options.errorprone.disable("UnusedVariable")
-            // options.compilerArgs.add("--enable-preview")
             options.release = 11
 
             // Needed to make sure that the barista-annotations emits to the correct directory

java/vortex-jni/src/main/java/dev/vortex/api/Array.java

@@ -15,9 +15,7 @@
  */
 package dev.vortex.api;
 
-import java.io.Closeable;
-
-public interface Array extends Closeable {
+public interface Array extends AutoCloseable {
     long getLen();
 
     DType getDataType();

java/vortex-jni/src/main/java/dev/vortex/api/ArrayStream.java

@@ -15,9 +15,7 @@
  */
 package dev.vortex.api;
 
-import java.io.Closeable;
-
-public interface ArrayStream extends Closeable {
+public interface ArrayStream extends AutoCloseable {
     Array getCurrent();
 
     /**

java/vortex-jni/src/main/java/dev/vortex/api/DType.java

@@ -15,14 +15,13 @@
  */
 package dev.vortex.api;
 
-import com.google.common.collect.ImmutableList;
-import java.io.Closeable;
+import java.util.List;
 import java.util.Optional;
 
 /**
  * Vortex logical type.
  */
-public interface DType extends Closeable {
+public interface DType extends AutoCloseable {
 
     Variant getVariant();
 
@@ -31,12 +30,12 @@ public interface DType extends Closeable {
     /**
      * Get the field names for a STRUCT type.
      */
-    ImmutableList<String> getFieldNames();
+    List<String> getFieldNames();
 
     /**
      * Get the field types for a STRUCT type.
      */
-    ImmutableList<DType> getFieldTypes();
+    List<DType> getFieldTypes();
 
     /**
      * Get the element type for a LIST type.

java/vortex-jni/src/main/java/dev/vortex/api/File.java

@@ -15,9 +15,7 @@
  */
 package dev.vortex.api;
 
-import java.io.Closeable;
-
-public interface File extends Closeable {
+public interface File extends AutoCloseable {
     DType getDType();
 
     ArrayStream newScan(ScanOptions options);

java/vortex-jni/src/main/java/dev/vortex/impl/BaseWrapped.java

@@ -15,14 +15,12 @@
  */
 package dev.vortex.impl;
 
-import java.io.Closeable;
-
 /**
  * Base class for all objects that are wrappers around some native {@code T} exposed by FFI.
  * <p>
  * Each wrapped type has a close implementation that will free the native resource.
  */
-public abstract class BaseWrapped<T> implements Closeable {
+public abstract class BaseWrapped<T> implements AutoCloseable {
     protected T inner;
 
     protected BaseWrapped(T inner) {

java/vortex-jni/src/test/java/dev/vortex/jni/FFITest.java

@@ -17,11 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.google.common.io.Closer;
 import dev.vortex.api.DType;
 import dev.vortex.api.ScanOptions;
 import dev.vortex.impl.NativeFile;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.junit.jupiter.api.Test;
@@ -57,18 +55,15 @@ public void testScan() {
                 .toString();
 
         long rowCount = 0;
-        try (Closer closer = Closer.create()) {
-            var file = closer.register(NativeFile.open(path));
-            var scan = closer.register(file.newScan(ScanOptions.of()));
+        try (var file = NativeFile.open(path);
+                var scan = file.newScan(ScanOptions.of())) {
 
             while (scan.next()) {
-                System.out.println("start batch");
                 try (var array = scan.getCurrent()) {
                     rowCount += array.getLen();
                 }
-                System.out.println("end batch");
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new RuntimeException("Failed closing resources", e);
         }
 

java/vortex-spark/src/main/java/dev/vortex/spark/SparkTypes.java

@@ -95,7 +95,7 @@ public static DataType toDataType(DType dType) {
                     return TimestampType$.MODULE$;
                 }
 
-                // TODO(aduffy): temporal types
+                // TODO(aduffy): other extension types
                 throw new IllegalArgumentException("Unsupported non-temporal extension type");
             default:
                 throw new IllegalArgumentException("unreachable");

java/vortex-spark/src/test/java/dev/vortex/spark/VortexScanTest.java

@@ -50,30 +50,28 @@ public void testSparkRead() {
         }
 
         // Execute the TPC-H queries
-        var plan = spark.sql(
-                """
-                        select
-                            l_returnflag,
-                            l_linestatus,
-                            sum(l_quantity) as sum_qty,
-                            sum(l_extendedprice) as sum_base_price,
-                            sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
-                            sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
-                            avg(l_quantity) as avg_qty,
-                            avg(l_extendedprice) as avg_price,
-                            avg(l_discount) as avg_disc,
-                            count(*) as count_order
-                        from
-                            lineitem
-                        where
-                                l_shipdate <= date '1998-09-02'
-                        group by
-                            l_returnflag,
-                            l_linestatus
-                        order by
-                            l_returnflag,
-                            l_linestatus
-                        """);
+        var q1 = "select\n" + "    l_returnflag,\n"
+                + "    l_linestatus,\n"
+                + "    sum(l_quantity) as sum_qty,\n"
+                + "    sum(l_extendedprice) as sum_base_price,\n"
+                + "    sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,\n"
+                + "    sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,\n"
+                + "    avg(l_quantity) as avg_qty,\n"
+                + "    avg(l_extendedprice) as avg_price,\n"
+                + "    avg(l_discount) as avg_disc,\n"
+                + "    count(*) as count_order\n"
+                + "from\n"
+                + "    lineitem\n"
+                + "where\n"
+                + "        l_shipdate <= date '1998-09-02'\n"
+                + "group by\n"
+                + "    l_returnflag,\n"
+                + "    l_linestatus\n"
+                + "order by\n"
+                + "    l_returnflag,\n"
+                + "    l_linestatus\n";
+
+        var plan = spark.sql(q1);
 
         long start = System.nanoTime();
         var results = plan.collectAsList();

vortex-ffi/src/file.rs

@@ -47,12 +47,8 @@ pub unsafe extern "C" fn File_dtype(file: *const FFIFile) -> *const DType {
 
 /// Build a new Scan that will stream batches of `FFIArray` from the file.
 #[unsafe(no_mangle)]
-pub unsafe extern "C" fn File_scan(
-    file: *const FFIFile,
-    // options: Option<*const FFIFileScanOptions>,
-) -> *mut FFIArrayStream {
-    // We can say there are a specific set of of row indices to provide instead.
-
+pub unsafe extern "C" fn File_scan(file: *const FFIFile) -> *mut FFIArrayStream {
+    // TODO(aduffy): pass ScanOptions to projection, filter predicate, etc.
     let file = unsafe { &*file };
     let stream = file
         .inner