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.

Sign up for GitHub

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

update arrow version #19

Merged
merged 1 commit into from
Nov 15, 2021
Merged

update arrow version #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.12-jdk-bullseye AS builder
FROM openjdk:11-jdk-bullseye AS builder

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -18,11 +18,12 @@ RUN cd datafusion_jni && cargo build --release && cd ..

RUN ./gradlew build

FROM openjdk:11.0.12-jdk-slim-bullseye
FROM openjdk:11-jdk-slim-bullseye

WORKDIR /usr/opt/datafusion_java

COPY --from=builder /usr/opt/datafusion_java/datafusion_examples/build/libs/datafusion_examples-1.0-all.jar ./

COPY --from=builder /usr/opt/datafusion_java/datafusion_jni/target/release/libdatafusion_jni.so ./

CMD ["--class-path", "/usr/opt/datafusion_java/datafusion_examples-1.0-all.jar", "-R", "-Djava.library.path=/usr/opt/datafusion_java"]
Expand Down
4 changes: 2 additions & 2 deletions datafusion_examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
// https://mvnrepository.com/artifact/org.apache.arrow/arrow-format
implementation 'org.apache.arrow:arrow-format:5.0.0'
implementation 'org.apache.arrow:arrow-format:6.0.0'
// https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector
implementation 'org.apache.arrow:arrow-vector:5.0.0'
implementation 'org.apache.arrow:arrow-vector:6.0.0'
}

application {
Expand Down
10 changes: 5 additions & 5 deletions datafusion_java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ publishing {
pom {
name = 'Datafuion Java'
description = 'A Java binding to Apache Arrow Datafusion library'
url = 'https://github.com/Jimexist/datafusion-java'
url = 'https://github.com/datafusion-contrib/datafusion-java'
licenses {
license {
name = 'The Apache License, Version 2.0'
Expand All @@ -43,7 +43,7 @@ publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/Jimexist/datafusion-java")
url = uri("https://github.com/datafusion-contrib/datafusion-java")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
Expand All @@ -62,11 +62,11 @@ dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
// https://mvnrepository.com/artifact/org.apache.arrow/arrow-format
implementation 'org.apache.arrow:arrow-format:5.0.0'
implementation 'org.apache.arrow:arrow-format:6.0.0'
// https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector
implementation 'org.apache.arrow:arrow-vector:5.0.0'
implementation 'org.apache.arrow:arrow-vector:6.0.0'
// https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty
runtimeOnly 'org.apache.arrow:arrow-memory-netty:5.0.0'
runtimeOnly 'org.apache.arrow:arrow-memory-netty:6.0.0'
}

task generateJniHeaders(type: JavaCompile) {
Expand Down
2 changes: 1 addition & 1 deletion datafusion_jni/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2021"
jni = "^0.19.0"
tokio = "^1.12.0"
arrow = "^6.0.0"
datafusion = { git = "https://github.com/apache/arrow-datafusion" }
datafusion = { git = "https://github.com/apache/arrow-datafusion", tag = "6.0.0-rc0" }

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
datafusion = "^6.0"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure that's out yet :-)

Copy link
Member

@houqp houqp Nov 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need one more PMC votes :D

[lib]
crate_type = ["cdylib"]