Merge main into sketchlib-count-min and resolve Cargo dependency conflicts

Author: GnaneshGnani

.github/workflows/rust.yml

@@ -38,6 +38,11 @@ jobs:
         toolchain: stable
         components: rustfmt, clippy
 
+    - name: Install protoc
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y protobuf-compiler
+
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.4
 
@@ -48,13 +53,13 @@ jobs:
           ~/.cargo/registry
           ~/.cargo/git
           target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
 
     - name: Check formatting
       run: cargo fmt --all -- --check
 
     - name: Run clippy
-      run: cargo clippy --workspace --all-targets --all-features -- -D warnings
+      run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
       env:
         RUSTC_WRAPPER: sccache
 
@@ -68,6 +73,11 @@ jobs:
       with:
         toolchain: stable
 
+    - name: Install protoc
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y protobuf-compiler
+
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.4
 
@@ -78,10 +88,10 @@ jobs:
           ~/.cargo/registry
           ~/.cargo/git
           target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
 
     - name: Run all workspace tests
-      run: cargo test --workspace
+      run: cargo test --workspace --locked
       env:
         RUSTC_WRAPPER: sccache
 
@@ -98,4 +108,4 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build Docker image
-      run: docker build -f asap-query-engine/Dockerfile -t sketchdb-queryengine-rust:latest .
+      run: docker build -f asap-query-engine/Dockerfile -t sketchdb-queryengine-rust:latest .