Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 0.13 #71

Merged
merged 2 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ gradle-app.setting
.idea/
out/
bin/
.vscode/
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group = 'io.github.datafusion-contrib'
version = '0.13.0-SNAPSHOT'
version = '0.14.0-SNAPSHOT'

repositories {
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions datafusion-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions datafusion-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,24 +105,24 @@ public CompletableFuture<Void> writeCsv(Path path) {
}

public CompletableFuture<Void> registerTable(SessionContext ctx, String name) {
Runtime runtime = context.getRuntime();
long runtimePointer = runtime.getPointer();
long dataframe = getPointer();
long contextPointer = ctx.getPointer();
CompletableFuture<Void> 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<Void> 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
Expand Down
2 changes: 1 addition & 1 deletion datafusion-jni/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
Expand Down
6 changes: 6 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'