feat(cubestore): Upgrade rust to 1.77.0-nightly

.github/workflows/birdbox.yml

@@ -33,12 +33,6 @@ jobs:
         run: rustup set auto-self-update disable
         if: contains(runner.os, 'windows')
         shell: bash
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - name: Install Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -101,12 +95,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - name: Install Node.js 16.x
         uses: actions/setup-node@v3
         with:
@@ -170,12 +158,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - name: Install Node.js 16.x
         uses: actions/setup-node@v3
         with:

.github/workflows/cloud.yml

@@ -66,12 +66,6 @@ jobs:
         run: rustup set auto-self-update disable
         if: contains(runner.os, 'windows')
         shell: bash
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - name: Install Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

.github/workflows/drivers-tests.yml

@@ -118,13 +118,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
-
       - name: Install Node.js 16.x
         uses: actions/setup-node@v3
         with:

.github/workflows/publish.yml

@@ -732,13 +732,6 @@ jobs:
         run: rustup set auto-self-update disable
         if: contains(runner.os, 'windows')
         shell: bash
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          target: ${{ matrix.target }}
-          override: true
-          components: rustfmt
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./rust/cubestore -> target
@@ -819,13 +812,6 @@ jobs:
         run: rustup set auto-self-update disable
         if: contains(runner.os, 'windows')
         shell: bash
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          target: ${{ matrix.target }}
-          override: true
-          components: rustfmt
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./rust/cubestore -> target

.github/workflows/push.yml

@@ -225,12 +225,6 @@ jobs:
           df -h
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./rust/cubestore -> target

.github/workflows/rust-cubesql.yml

@@ -58,12 +58,6 @@ jobs:
         with:
           # pulls all commits (needed for codecov)
           fetch-depth: 2
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2022-06-22
-          override: true
-          components: rustfmt
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./rust/cubesql -> target

.github/workflows/rust-cubestore-master.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly-2022-06-22]
+        rust: [nightly-2024-01-09]
     env:
       RUST: ${{ matrix.rust }}
     steps:
@@ -237,7 +237,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-06-22
+          toolchain: nightly-2024-01-09
           target: ${{ matrix.target }}
           override: true
           components: rustfmt

.github/workflows/rust-cubestore.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly-2022-06-22]
+        rust: [nightly-2024-01-09]
     env:
       RUST: ${{ matrix.rust }}
     steps:
@@ -178,7 +178,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-06-22
+          toolchain: nightly-2024-01-09
           target: ${{ matrix.target }}
           override: true
           components: rustfmt

rust/cubestore/Dockerfile

@@ -1,8 +1,8 @@
 FROM rust:1-bullseye as builder
 
 RUN rustup update && \
-    rustup default nightly-2022-06-22 && \
-    rustup component add --toolchain nightly-2022-06-22 rustfmt;
+    rustup default nightly-2024-01-10 && \
+    rustup component add --toolchain nightly-2024-01-10 rustfmt;
 
 RUN apt update \
 	&& apt upgrade -y \

rust/cubestore/cubehll/src/instance.rs

@@ -1196,7 +1196,7 @@ fn alpha(index_bit_len: u8) -> f64 {
         4 => 0.673,
         5 => 0.697,
         6 => 0.709,
-        _ => (0.7213 / (1. + 1.079 / number_of_buckets(index_bit_len) as f64)),
+        _ => 0.7213 / (1. + 1.079 / number_of_buckets(index_bit_len) as f64),
     };
 }
 

rust/cubestore/cubestore/Cargo.toml

@@ -16,7 +16,7 @@ libc = { version = "0.2.97", optional = true }
 [dependencies]
 base64 = "0.13.0"
 bumpalo = "3.6.1"
-tokio = { version = "1.0", features = ["full", "rt"] }
+tokio = { version = "1", features = ["full", "rt"] }
 warp = { version = "0.3.6" }
 sqlparser = { git = 'https://github.com/cube-js/sqlparser-rs.git', rev = "4388f6712dae5073c2d71d74f64cae2edd418066" }
 serde_derive = "1.0.115"
@@ -74,6 +74,7 @@ tempfile = "3.2.0"
 tarpc = { version = "0.24", features = ["tokio1"] }
 pin-project-lite = "0.2.4"
 paste = "1.0.4"
+memchr = "2"
 flatbuffers = "23.1.21"
 http-auth-basic = "0.1.2"
 tracing = "0.1.25"

rust/cubestore/cubestore/src/cachestore/cache_eviction_manager.rs

@@ -234,7 +234,7 @@ impl CacheEvictionManager {
                     raw_size,
                 }) => {
                     let mut ttl_buffer = ttl_buffer_to_move.blocking_write();
-                    if let Some(mut cache_data) = ttl_buffer.get_mut(&row_id) {
+                    if let Some(cache_data) = ttl_buffer.get_mut(&row_id) {
                         let expired_lfu = if let Some(previous_lru) =
                             cache_data.lru.decode_value_as_opt_datetime().unwrap()
                         {

rust/cubestore/cubestore/src/cluster/mod.rs

@@ -1094,7 +1094,7 @@ impl ClusterImpl {
         on_socket_bound: oneshot::Sender<()>,
         process_fn: impl Fn(Arc<ClusterImpl>, TcpStream) -> F + Send + Sync + Clone + 'static,
     ) -> Result<(), CubeError> {
-        let listener = TcpListener::bind(address.clone()).await?;
+        let listener = TcpListener::bind(address).await?;
         let _ = on_socket_bound.send(());
 
         info!("{} port open on {}", name, address);

rust/cubestore/cubestore/src/import/mod.rs

@@ -1,5 +1,5 @@
 use core::mem;
-use core::slice::memchr;
+use memchr;
 use std::convert::TryFrom;
 use std::path::Path;
 use std::pin::Pin;
@@ -567,7 +567,7 @@ impl ImportServiceImpl {
             Ok((temp_file, None))
         } else {
             Ok((
-                File::open(location.clone()).await.map_err(|e| {
+                File::open(location).await.map_err(|e| {
                     CubeError::internal(format!("Open location {}: {}", location, e))
                 })?,
                 None,
@@ -681,7 +681,7 @@ impl ImportServiceImpl {
             })?;
 
         let (file, tmp_path) = self
-            .resolve_location(location.clone(), table.get_id(), &temp_dir)
+            .resolve_location(location, table.get_id(), &temp_dir)
             .await?;
         let mut row_stream = format
             .row_stream(

rust/cubestore/cubestore/src/lib.rs

@@ -1,14 +1,11 @@
 #![feature(test)]
-#![feature(backtrace)]
 #![feature(async_closure)]
-#![feature(drain_filter)]
 #![feature(box_patterns)]
-#![feature(slice_internals)]
 #![feature(vec_into_raw_parts)]
 #![feature(hash_set_entry)]
-#![feature(map_first_last)]
 #![feature(is_sorted)]
 #![feature(result_flattening)]
+#![feature(extract_if)]
 // #![feature(trace_macros)]
 
 // trace_macros!(true);

rust/cubestore/cubestore/src/metastore/listener.rs

@@ -93,11 +93,13 @@ impl MetastoreListenerImpl {
     async fn process_event(&self, event: MetaStoreEvent) -> Result<(), CubeError> {
         let mut wait_fns = self.wait_fns.lock().await;
         let to_notify = wait_fns
-            .drain_filter(|(_, wait_fn)| wait_fn(event.clone()))
+            .extract_if(|(_, wait_fn)| wait_fn(event.clone()))
             .collect::<Vec<_>>();
+
         for (notify, _) in to_notify {
             notify.notify_waiters();
         }
+
         Ok(())
     }
 }

rust/cubestore/cubestore/src/metastore/mod.rs

@@ -1588,7 +1588,7 @@ impl RocksMetaStore {
                 }
 
                 taken[i] = true;
-                index_columns.push(c.clone().replace_index(index_columns.len()));
+                index_columns.push(c.replace_index(index_columns.len()));
             }
 
             let seq_column = table_id.get_row().seq_column().ok_or_else(|| {

rust/cubestore/cubestore/src/sql/cachestore.rs

@@ -575,10 +575,9 @@ impl CacheStoreSqlService {
 
         if track_time {
             app_metrics::QUEUE_QUERY_TIME_MS.report(execution_time.as_millis() as i64);
+            log::debug!("Queue command processing time: {:?}", execution_time);
         }
 
-        log::debug!("Queue command processing time: {:?}", execution_time,);
-
         Ok(result)
     }
 }

rust/cubestore/rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-06-22"
+channel = "nightly-2024-01-09"
 components = ["rustfmt", "rustc-dev", "clippy"]
 profile = "minimal"