Merge pull request #759 from sfu-db/dependabot/cargo/j4rs-0.22.0

build(rust): bump j4rs from 0.17.2 to 0.22.0

Author: wangxiaoying

Cargo.lock

@@ -54,7 +54,7 @@ tokio = {version = "1", features = ["rt", "rt-multi-thread", "net"], optional =
 tokio-util = {version = "0.7", features = ["compat"], optional = true}
 urlencoding = {version = "2.1", optional = true}
 uuid = {version = "1", optional = true}
-j4rs = {version = "0.17", optional = true}
+j4rs = {version = "0.22", optional = true}
 datafusion = {version = "44", optional = true}
 prusto = {version = "0.5", optional = true}
 serde = {version = "1", optional = true}

connectorx/Cargo.toml

@@ -85,12 +85,12 @@ fn create_sources(
 ) -> (Instance, Instance) {
     debug!("Could not find environment variable `FED_CONFIG_PATH`, use manual configuration (c++ API only)!");
     let mut db_config = vec![];
-    let db_manual = jvm.create_instance("java.util.HashMap", &[])?;
+    let db_manual = jvm.create_instance("java.util.HashMap", InvocationArg::empty())?;
 
     for (db_name, db_info) in db_map.iter() {
         if db_info.manual_info.is_some() {
             let manual_info = db_info.manual_info.as_ref().unwrap();
-            let schema_info = jvm.create_instance("java.util.HashMap", &[])?;
+            let schema_info = jvm.create_instance("java.util.HashMap", InvocationArg::empty())?;
             for (name, columns) in manual_info {
                 let arr_instance = jvm.java_list("java.lang.String", columns.to_vec())?;
                 jvm.invoke(
@@ -133,7 +133,7 @@ fn create_sources2(
 ) -> (Instance, Instance) {
     debug!("Found environment variable `FED_CONFIG_PATH`, use configurations!");
     let mut dbs = vec![];
-    let db_manual = jvm.create_instance("java.util.HashMap", &[])?;
+    let db_manual = jvm.create_instance("java.util.HashMap", InvocationArg::empty())?;
     for db in db_map.keys() {
         dbs.push(String::from(db));
     }
@@ -157,12 +157,15 @@ pub fn rewrite_sql(
         Ok(_) => create_sources2(&jvm, db_map)?,
         _ => create_sources(&jvm, db_map)?,
     };
-    let rewriter = jvm.create_instance("ai.dataprep.accio.FederatedQueryRewriter", &[])?;
+    let rewriter = jvm.create_instance(
+        "ai.dataprep.accio.FederatedQueryRewriter",
+        InvocationArg::empty(),
+    )?;
     let db_config = InvocationArg::try_from(db_config).unwrap();
     let db_manual = InvocationArg::try_from(db_manual).unwrap();
     let plan = jvm.invoke(&rewriter, "rewrite", &[sql, db_config, db_manual, strategy])?;
 
-    let count = jvm.invoke(&plan, "getCount", &[])?;
+    let count = jvm.invoke(&plan, "getCount", InvocationArg::empty())?;
     let count: i32 = jvm.to_rust(count)?;
     debug!("rewrite finished, got {} queries", count);