From bcaa4f562220a759703625b09a281113e58b26ca Mon Sep 17 00:00:00 2001 From: Jiayu Liu Date: Thu, 31 Aug 2023 15:34:05 +0800 Subject: [PATCH 1/2] release 0.13 --- .gitignore | 1 + .../groovy/datafusion.java-conventions.gradle | 2 +- datafusion-examples/build.gradle | 4 +-- datafusion-java/build.gradle | 6 ++-- .../apache/arrow/datafusion/DataFrame.java | 1 + .../arrow/datafusion/DefaultDataFrame.java | 36 +++++++++---------- datafusion-jni/Cargo.toml | 2 +- settings.gradle | 6 ++++ 8 files changed, 33 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 6854e58..1f14bde 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ gradle-app.setting .idea/ out/ bin/ +.vscode/ diff --git a/buildSrc/src/main/groovy/datafusion.java-conventions.gradle b/buildSrc/src/main/groovy/datafusion.java-conventions.gradle index 98effdc..0562047 100644 --- a/buildSrc/src/main/groovy/datafusion.java-conventions.gradle +++ b/buildSrc/src/main/groovy/datafusion.java-conventions.gradle @@ -3,7 +3,7 @@ plugins { } group = 'io.github.datafusion-contrib' -version = '0.13.0-SNAPSHOT' +version = '0.13.0' repositories { mavenCentral() diff --git a/datafusion-examples/build.gradle b/datafusion-examples/build.gradle index 8e8974f..a41e096 100644 --- a/datafusion-examples/build.gradle +++ b/datafusion-examples/build.gradle @@ -14,8 +14,8 @@ dependencies { implementation project(':datafusion-java') implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'ch.qos.logback:logback-classic:1.4.0' - implementation 'org.apache.arrow:arrow-format:9.0.0' - implementation 'org.apache.arrow:arrow-vector:9.0.0' + implementation 'org.apache.arrow:arrow-format:13.0.0' + implementation 'org.apache.arrow:arrow-vector:13.0.0' } application { diff --git a/datafusion-java/build.gradle b/datafusion-java/build.gradle index 48b413c..15c5984 100644 --- a/datafusion-java/build.gradle +++ b/datafusion-java/build.gradle @@ -9,9 +9,9 @@ plugins { dependencies { implementation 'org.slf4j:slf4j-api:1.7.36' - implementation 'org.apache.arrow:arrow-format:9.0.0' - implementation 'org.apache.arrow:arrow-vector:9.0.0' - runtimeOnly 'org.apache.arrow:arrow-memory-unsafe:9.0.0' + implementation 'org.apache.arrow:arrow-format:13.0.0' + implementation 'org.apache.arrow:arrow-vector:13.0.0' + runtimeOnly 'org.apache.arrow:arrow-memory-unsafe:13.0.0' } spotless { diff --git a/datafusion-java/src/main/java/org/apache/arrow/datafusion/DataFrame.java b/datafusion-java/src/main/java/org/apache/arrow/datafusion/DataFrame.java index 30fc0ac..28c3b4d 100644 --- a/datafusion-java/src/main/java/org/apache/arrow/datafusion/DataFrame.java +++ b/datafusion-java/src/main/java/org/apache/arrow/datafusion/DataFrame.java @@ -46,6 +46,7 @@ public interface DataFrame extends NativeProxy { /** * Register this dataframe as a temporary table. + * * @param context SessionContext to register table to * @param name name of the tmp table * @return null diff --git a/datafusion-java/src/main/java/org/apache/arrow/datafusion/DefaultDataFrame.java b/datafusion-java/src/main/java/org/apache/arrow/datafusion/DefaultDataFrame.java index 64d6da9..394668f 100644 --- a/datafusion-java/src/main/java/org/apache/arrow/datafusion/DefaultDataFrame.java +++ b/datafusion-java/src/main/java/org/apache/arrow/datafusion/DefaultDataFrame.java @@ -105,24 +105,24 @@ public CompletableFuture writeCsv(Path path) { } public CompletableFuture registerTable(SessionContext ctx, String name) { - Runtime runtime = context.getRuntime(); - long runtimePointer = runtime.getPointer(); - long dataframe = getPointer(); - long contextPointer = ctx.getPointer(); - CompletableFuture future = new CompletableFuture<>(); - DataFrames.registerTable( - runtimePointer, - dataframe, - contextPointer, - name, - (String errString) -> { - if (containsError(errString)) { - future.completeExceptionally(new RuntimeException(errString)); - } else { - future.complete(null); - } - }); - return future; + Runtime runtime = context.getRuntime(); + long runtimePointer = runtime.getPointer(); + long dataframe = getPointer(); + long contextPointer = ctx.getPointer(); + CompletableFuture future = new CompletableFuture<>(); + DataFrames.registerTable( + runtimePointer, + dataframe, + contextPointer, + name, + (String errString) -> { + if (containsError(errString)) { + future.completeExceptionally(new RuntimeException(errString)); + } else { + future.complete(null); + } + }); + return future; } @Override diff --git a/datafusion-jni/Cargo.toml b/datafusion-jni/Cargo.toml index 38bd0d9..b7f9be4 100644 --- a/datafusion-jni/Cargo.toml +++ b/datafusion-jni/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "datafusion_jni" -version = "0.12.0" +version = "0.13.0" homepage = "https://github.com/apache/arrow-datafusion" repository = "https://github.com/apache/arrow-datafusion" authors = ["Apache Arrow "] diff --git a/settings.gradle b/settings.gradle index 61dad55..d4f3533 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,8 @@ +// https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' +} + rootProject.name = 'datafusion-java' + include 'datafusion-java', 'datafusion-examples' From be5325e1c4b5f3f3d28e9184b4b651552b9791c2 Mon Sep 17 00:00:00 2001 From: Jiayu Liu Date: Thu, 31 Aug 2023 15:34:39 +0800 Subject: [PATCH 2/2] bump to snapshot version --- buildSrc/src/main/groovy/datafusion.java-conventions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/datafusion.java-conventions.gradle b/buildSrc/src/main/groovy/datafusion.java-conventions.gradle index 0562047..2a94806 100644 --- a/buildSrc/src/main/groovy/datafusion.java-conventions.gradle +++ b/buildSrc/src/main/groovy/datafusion.java-conventions.gradle @@ -3,7 +3,7 @@ plugins { } group = 'io.github.datafusion-contrib' -version = '0.13.0' +version = '0.14.0-SNAPSHOT' repositories { mavenCentral()