toolchain: use latest stable (#225)

skyzh · web-flow · commit 3d81e652c7cd · 2024-11-08T01:13:01.000Z
also bump dependencies

Signed-off-by: Alex Chi &lt;iskyzh@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/datafusion-optd-cli/src/exec.rs b/datafusion-optd-cli/src/exec.rs
@@ -85,7 +85,7 @@ pub async fn exec_from_lines(
     reader: &mut BufReader<File>,
     print_options: &PrintOptions,
 ) {
-    let mut query = "".to_owned();
+    let mut query = String::new();
 
     for line in reader.lines() {
         match line {
@@ -100,7 +100,7 @@ pub async fn exec_from_lines(
                         Ok(_) => {}
                         Err(err) => eprintln!("{err}"),
                     }
-                    query = "".to_owned();
+                    query = String::new();
                 } else {
                     query.push('\n');
                 }
diff --git a/optd-core/Cargo.toml b/optd-core/Cargo.toml
@@ -14,7 +14,7 @@ repository = { workspace = true }
 anyhow = "1"
 tracing = "0.1"
 ordered-float = "4"
-itertools = "0.11"
+itertools = "0.13"
 serde = { version = "1.0", features = ["derive", "rc"] }
 arrow-schema = "47.0.0"
 chrono = "0.4"
diff --git a/optd-core/src/cascades/tasks.rs b/optd-core/src/cascades/tasks.rs
@@ -22,5 +22,7 @@ pub use optimize_inputs::OptimizeInputsTask;
 
 pub trait Task<T: NodeType, M: Memo<T>>: 'static + Send + Sync {
     fn execute(&self, optimizer: &mut CascadesOptimizer<T, M>) -> Result<Vec<Box<dyn Task<T, M>>>>;
+
+    #[allow(dead_code)]
     fn describe(&self) -> String;
 }
diff --git a/optd-datafusion-bridge/Cargo.toml b/optd-datafusion-bridge/Cargo.toml
@@ -14,7 +14,7 @@ repository = { workspace = true }
 datafusion = "32.0.0"
 datafusion-expr = "32.0.0"
 async-trait = "0.1"
-itertools = "0.11"
+itertools = "0.13"
 optd-core = { path = "../optd-core" }
 optd-datafusion-repr = { path = "../optd-datafusion-repr" }
 anyhow = "1"
diff --git a/optd-datafusion-repr-adv-cost/Cargo.toml b/optd-datafusion-repr-adv-cost/Cargo.toml
@@ -15,9 +15,9 @@ optd-datafusion-repr = { path = "../optd-datafusion-repr" }
 optd-core = { path = "../optd-core" }
 serde = { version = "1.0", features = ["derive"] }
 rayon = "1.10"
-itertools = "0.11"
+itertools = "0.13"
 test-case = "3.3"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 optd-gungnir = { path = "../optd-gungnir" }
-serde_with = {version = "3.7.0", features = ["json"]}
+serde_with = { version = "3.7.0", features = ["json"] }
diff --git a/optd-datafusion-repr/Cargo.toml b/optd-datafusion-repr/Cargo.toml
@@ -16,7 +16,7 @@ arrow-schema = "47.0.0"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 pretty-xmlish = "0.1"
-itertools = "0.11"
+itertools = "0.13"
 optd-core = { path = "../optd-core" }
 camelpaste = "0.1"
 datafusion-expr = "32.0.0"
diff --git a/optd-datafusion-repr/src/plan_nodes/predicates.rs b/optd-datafusion-repr/src/plan_nodes/predicates.rs
@@ -46,6 +46,7 @@ pub trait PredExt {
     /// return either Some(usize) or None.
     /// - If it is Some, the column index can be rewritten with the value.
     /// - If any of the columns is None, we will return None all the way up
+    ///
     /// the call stack, and no expression will be returned.
     fn rewrite_column_refs(&self, rewrite_fn: impl FnMut(usize) -> Option<usize>) -> Option<Self>
     where
diff --git a/optd-datafusion-repr/src/rules/filter_pushdown.rs b/optd-datafusion-repr/src/rules/filter_pushdown.rs
@@ -191,6 +191,7 @@ fn apply_filter_inner_join_transpose(
 /// - Push down to the left child (only involves keys from the left child)
 /// - Push down to the right child (only involves keys from the right child)
 /// - Push into the join condition (involves keys from both children)
+///
 /// We will consider each part of the conjunction separately, and push down
 /// only the relevant parts.
 fn filter_join_transpose(
diff --git a/optd-gungnir/Cargo.toml b/optd-gungnir/Cargo.toml
@@ -11,7 +11,7 @@ repository = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-itertools = "0.11"
+itertools = "0.13"
 rand = "0.8"
 crossbeam = "0.8"
 lazy_static = "1.4"
@@ -20,3 +20,4 @@ serde_with = { version = "3.7.0", features = ["json"] }
 ordered-float = "4"
 optd-core = { path = "../optd-core", version = "0.1.0" }
 hashbrown = { version = "0.14", features = ["serde"] }
+murmur2 = "0.1"
diff --git a/optd-gungnir/src/stats/murmur2.rs b/optd-gungnir/src/stats/murmur2.rs
@@ -8,37 +8,7 @@
 
 /// Returns the MurmurHash2 (u64) given a stream of bytes and a seed.
 pub fn murmur_hash(bytes: &[u8], seed: u64) -> u64 {
-    const M: u64 = 0xc6a4a7935bd1e995;
-    const R: u8 = 47;
-
-    let mut hash = seed ^ (bytes.len() as u64).wrapping_mul(M);
-
-    let div = bytes.len() / 8;
-    let rem = bytes.len() % 8;
-
-    let whole_part: &[u64] =
-        unsafe { std::slice::from_raw_parts(bytes.as_ptr() as *const u64, div) };
-
-    for batch in whole_part {
-        let mut k = batch.wrapping_mul(M);
-        k ^= k >> R;
-        k = k.wrapping_mul(M);
-
-        hash ^= k;
-        hash = hash.wrapping_mul(M);
-    }
-
-    if rem > 0 {
-        for i in 0..rem {
-            hash ^= (bytes[div * 8 + i] as u64) << (i * 8);
-        }
-        hash = hash.wrapping_mul(M);
-    }
-
-    hash ^= hash >> R;
-    hash = hash.wrapping_mul(M);
-    hash ^= hash >> R;
-    hash
+    murmur2::murmur64a(bytes, seed)
 }
 
 // Start of unit testing section.
diff --git a/optd-perfbench/Cargo.toml b/optd-perfbench/Cargo.toml
@@ -43,6 +43,5 @@ rayon = "1.10"
 parquet = "47.0.0"
 csv2parquet = { git = "https://github.com/wangpatrick57/arrow-tools.git", branch = "main" }
 
-
-[dev_dependencies]
+[dev-dependencies]
 assert_cmd = "2.0"
diff --git a/optd-sqlplannertest/Cargo.toml b/optd-sqlplannertest/Cargo.toml
@@ -32,7 +32,7 @@ tokio = { version = "1.24", features = [
 ] }
 optd-datafusion-bridge = { path = "../optd-datafusion-bridge" }
 optd-datafusion-repr = { path = "../optd-datafusion-repr" }
-itertools = "0.11"
+itertools = "0.13"
 lazy_static = "1.4.0"
 
 [[test]]
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.76.0
+stable

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,7 @@ pub use optimize_inputs::OptimizeInputsTask;`
`22`	`22`
`23`	`23`	`pub trait Task<T: NodeType, M: Memo<T>>: 'static + Send + Sync {`
`24`	`24`	`fn execute(&self, optimizer: &mut CascadesOptimizer<T, M>) -> Result<Vec<Box<dyn Task<T, M>>>>;`
	`25`	`+`
	`26`	`+ #[allow(dead_code)]`
`25`	`27`	`fn describe(&self) -> String;`
`26`	`28`	`}`