Fix cargo.toml

Signed-off-by: Marc Handalian <[email protected]>
mch2 · Jan 23, 2025 · 08e7ef1 · 08e7ef1
1 parent 364edbe
commit 08e7ef1
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 5 deletions.
diff --git a/libs/datafusion/build.gradle b/libs/datafusion/build.gradle
@@ -6,6 +6,22 @@
  * compatible open source license.
  */
 
+import org.gradle.internal.jvm.Jvm
+import org.opensearch.gradle.test.RestIntegTestTask
+import org.opensearch.gradle.testclusters.OpenSearchCluster
+import org.apache.tools.ant.taskdefs.condition.Os
+import java.nio.file.Paths
+import java.util.concurrent.Callable
+import org.opensearch.gradle.LoggedExec
+import org.opensearch.gradle.MavenFilteringHack
+import org.opensearch.gradle.OS
+import org.opensearch.gradle.info.BuildParams
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
 dependencies {
   api project(':libs:opensearch-common')
   api project(':libs:opensearch-arrow')
@@ -25,13 +41,34 @@ dependencies {
   }
 }
 
+  base {
+    archivesName = 'opensearch-datafusion'
+  }
+compileJava {
+  dependsOn "cargoBuild"
+}
+
+assemble.enabled = true
+
+tasks.named("assemble").configure {
+  dependsOn "cargoBuild"
+}
+
 tasks.named('forbiddenApisMain').configure {
   replaceSignatureFiles 'jdk-signatures'
 }
 
+
 task cargoBuild(type:Exec) {
+  println("Running Cargo Build")
   workingDir 'jni'
+//  commandLine 'which', 'cargo'
   commandLine 'cargo', 'build', '--release'
+  println("Finished Cargo Build")
+}
+
+build {
+  dependsOn cargoBuild
 }
 
 build.doFirst {

diff --git a/libs/datafusion/jni/Cargo.toml b/libs/datafusion/jni/Cargo.toml
@@ -5,15 +5,29 @@ edition = "2021"
 
 [dependencies]
 jni = "0.21.1"
-datafusion = "42.2.0"
-datafusion-table-providers = { version = "0.2.3", features = ["flight"] }
+datafusion = "44.0.0"
+datafusion-table-providers = { version = "0.2.2", features = ["flight"] }
 tokio = { version = "1.41.0", features = ["full"] }
-arrow = { version = "53.2.0", features = ["ffi" ] }
-arrow-flight = "53.2.0"
+arrow = { version = "53.1.0", features = ["ffi" ] }
+arrow-flight = "53.0.0"
 futures = "0.3"
 serde_json = "1.0.132"
 tonic = "0.12.3"
 bytes = "1.8.0"
+async-trait = "0.1"
+
+[dev-dependencies]
+anyhow = "1.0"
+bollard = "0.18.1"
+geozero = { version = "0.14.0", features = ["with-wkb"] }
+insta = { version = "1.42.0", features = ["filters"] }
+prost = { version = "0.13" }
+rand = "0.8"
+reqwest = "0.12"
+rstest = "0.24.0"
+test-log = { version = "0.2", features = ["trace"] }
+tokio-stream = { version = "0.1", features = ["net"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lib]
-crate_type = ["cdylib"]
+crate_type = ["cdylib"]