update arrow and rustc in CI (#2919)

* update arrow and rustc in CI * clippy
pola-rs · Mar 16, 2022 · 77908cd · 77908cd
1 parent d349899
commit 77908cd
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 37 deletions.
diff --git a/.github/deploy_manylinux.sh b/.github/deploy_manylinux.sh
@@ -7,7 +7,7 @@ ls -la
 rm py-polars/README.md
 cp README.md py-polars/README.md
 cd py-polars
-rustup override set nightly-2022-03-03
+rustup override set nightly-2022-03-16
 export RUSTFLAGS='-C target-feature=+fxsr,+sse,+sse2,+sse3,+ssse3,+sse4.1+sse4.2,+popcnt,+avx,+fma'
 maturin publish \
   --skip-existing \

diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - name: Set up Python
@@ -32,7 +32,7 @@ jobs:
           source venv/bin/activate
           pip install -r py-polars/build.requirements.txt
           cd py-polars
-          rustup override set nightly-2022-03-03 && RUSTFLAGS="-C embed-bitcode" maturin develop --rustc-extra-args="-C codegen-units=8 -C lto=thin -C target-cpu=native" --release
+          rustup override set nightly-2022-03-16 && RUSTFLAGS="-C embed-bitcode" maturin develop --rustc-extra-args="-C codegen-units=8 -C lto=thin -C target-cpu=native" --release
           cd tests/db-benchmark
           Rscript -e 'install.packages("data.table", repos="https://Rdatatable.github.io/data.table")'
           Rscript groupby-datagen.R 1e7 1e2 5 0

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Install Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
       - uses: Swatinem/rust-cache@v1
       - name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy, miri
       - name: Cache Cargo

diff --git a/.github/workflows/create-py-mac-universal2-release.yaml b/.github/workflows/create-py-mac-universal2-release.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - name: Setup universal2 targets for Rust
@@ -35,7 +35,7 @@ jobs:
           rm py-polars/README.md
           cp README.md py-polars/README.md
           cd py-polars
-          rustup override set nightly-2022-03-03
+          rustup override set nightly-2022-03-16
       - name: maturin publish
         uses: messense/maturin-action@v1
         env:

diff --git a/.github/workflows/create-py-release-manylinux.yaml b/.github/workflows/create-py-release-manylinux.yaml
@@ -24,7 +24,7 @@ jobs:
         env:
           MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }}
         with:
-          rust-toolchain: nightly-2022-03-03
+          rust-toolchain: nightly-2022-03-16
           manylinux: '2_24'
           target: aarch64-unknown-linux-gnu
           maturin-version: 0.12.1

diff --git a/.github/workflows/create-py-release-windows-macos.yaml b/.github/workflows/create-py-release-windows-macos.yaml
@@ -18,7 +18,7 @@ jobs:
         - name: Install latest Rust nightly
           uses: actions-rs/toolchain@v1
           with:
-            toolchain: nightly-2022-03-03
+            toolchain: nightly-2022-03-16
             override: true
             components: rustfmt, clippy
         - name: Set up Python
@@ -37,7 +37,7 @@ jobs:
             rm py-polars/README.md
             cp README.md py-polars/README.md
             cd py-polars
-            rustup override set nightly-2022-03-03
+            rustup override set nightly-2022-03-16
             export RUSTFLAGS='-C target-feature=+fxsr,+sse,+sse2,+sse3'
             maturin publish \
             --no-sdist \

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - name: Set up Node

diff --git a/.github/workflows/test-js.yaml b/.github/workflows/test-js.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - run: yarn --version

diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - name: Set up Python
@@ -30,7 +30,7 @@ jobs:
           pip install -r py-polars/build.requirements.txt
       - name: Run formatting checks
         run: |
-          cd py-polars && black --check . && blackdoc --check . && isort --check . && rustup override set nightly-2022-03-03 && cargo fmt --all -- --check && cd ..
+          cd py-polars && black --check . && blackdoc --check . && isort --check . && rustup override set nightly-2022-03-16 && cargo fmt --all -- --check && cd ..
       - name: Run linting
         run: |
           cd py-polars && flake8 && cd ..
@@ -40,7 +40,7 @@ jobs:
       - name: Run tests
         run: |
           export RUSTFLAGS="-C debuginfo=0"
-          cd py-polars && rustup override set nightly-2022-03-03 && make venv && make test-with-cov
+          cd py-polars && rustup override set nightly-2022-03-16 && make venv && make test-with-cov
           cargo clippy
       - name: Check doc examples
         run: |

diff --git a/.github/workflows/test-windows-python.yaml b/.github/workflows/test-windows-python.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
           components: rustfmt, clippy
       - name: Set up Python
@@ -28,7 +28,7 @@ jobs:
         shell: bash
         run: |
           export RUSTFLAGS="-C debuginfo=0"
-          cd py-polars && rustup override set nightly-2022-03-03 && make build-and-test-no-venv
+          cd py-polars && rustup override set nightly-2022-03-16 && make build-and-test-no-venv
           cargo clippy
       # test if we can import polars without any requirements
       - name: Import polars

diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Install latest Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2022-03-03
+          toolchain: nightly-2022-03-16
           override: true
       - name: Run tests
         run: |

diff --git a/nodejs-polars/rust-toolchain b/nodejs-polars/rust-toolchain
@@ -1 +1 @@
-nightly-2022-03-03
+nightly-2022-03-16
diff --git a/polars/Cargo.toml b/polars/Cargo.toml
@@ -211,9 +211,6 @@ bench = [
 ]
 
 [dependencies]
-# fixed because of compilation error
-# todo! remove
-crossbeam-epoch = "=0.9.7"
 polars-core = { version = "0.20.0", path = "./polars-core", features = ["docs", "private"], default-features = false }
 polars-io = { version = "0.20.0", path = "./polars-io", features = ["private"], default-features = false, optional = true }
 polars-lazy = { version = "0.20.0", path = "./polars-lazy", features = ["private"], default-features = false, optional = true }

diff --git a/polars/polars-arrow/Cargo.toml b/polars/polars-arrow/Cargo.toml
@@ -9,9 +9,9 @@ description = "Arrow interfaces for Polars DataFrame library"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe", default-features = false }
+arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "5658512460d64f8eca0d0ce0ae53aea41c35ab9d", default-features = false }
 # arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "cherry_pick", default-features = false }
-arrow = { package = "arrow2", version = "0.10", default-features = false, features = ["compute_concatenate"] }
+# arrow = { package = "arrow2", version = "0.10", default-features = false, features = ["compute_concatenate"] }
 hashbrown = "0.12"
 num = "^0.4"
 thiserror = "^1.0"

diff --git a/polars/polars-core/Cargo.toml b/polars/polars-core/Cargo.toml
@@ -150,7 +150,6 @@ ndarray = { version = "0.15", optional = true, default_features = false }
 num = "^0.4"
 polars-arrow = { version = "0.20.0", path = "../polars-arrow", features = ["compute"] }
 polars-utils = { version = "0.20.0", path = "../polars-utils", optional = true }
-prettytable-rs = { version = "0.8.0", optional = true }
 rand = { version = "0.8", optional = true, features = ["small_rng", "std"] }
 rand_distr = { version = "0.4", optional = true }
 rayon = "1.5"
@@ -162,9 +161,9 @@ thiserror = "^1.0"
 
 [dependencies.arrow]
 package = "arrow2"
-# git = "https://github.com/jorgecarleitao/arrow2"
+git = "https://github.com/jorgecarleitao/arrow2"
 # git = "https://github.com/ritchie46/arrow2"
-# rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe"
+rev = "5658512460d64f8eca0d0ce0ae53aea41c35ab9d"
 # branch = "cherry_pick"
 version = "0.10"
 default-features = false

diff --git a/polars/polars-io/Cargo.toml b/polars/polars-io/Cargo.toml
@@ -34,9 +34,9 @@ private = []
 [dependencies]
 ahash = "0.7"
 anyhow = "1.0"
-# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "81bfaddb92f432ae25bff4e9fdf200159ecebafe", default-features = false }
+arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "5658512460d64f8eca0d0ce0ae53aea41c35ab9d", default-features = false }
 # arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "cherry_pick", default-features = false }
-arrow = { package = "arrow2", version = "0.10", default-features = false }
+# arrow = { package = "arrow2", version = "0.10", default-features = false }
 csv-core = { version = "0.1.10", optional = true }
 dirs = "4.0"
 flate2 = { version = "1", optional = true, default-features = false }

diff --git a/polars/polars-lazy/src/logical_plan/projection.rs b/polars/polars-lazy/src/logical_plan/projection.rs
@@ -181,7 +181,8 @@ fn prepare_excluded(expr: &Expr, schema: &Schema, keys: &[Expr]) -> Vec<Arc<str>
                         Excluded::Name(name) => {
                             let e = Expr::Column(name.clone());
                             replace_regex(&e, &mut buf, schema);
-                            for col in buf.drain(..) {
+                            // we cannot loop because of bchck
+                            while let Some(col) = buf.pop() {
                                 if let Expr::Column(name) = col {
                                     exclude.push(name)
                                 }

diff --git a/polars/polars-lazy/src/physical_plan/planner.rs b/polars/polars-lazy/src/physical_plan/planner.rs
@@ -71,11 +71,11 @@ pub struct DefaultPlanner {}
 impl PhysicalPlanner for DefaultPlanner {
     fn create_physical_plan(
         &self,
-        root: Node,
-        lp_arena: &mut Arena<ALogicalPlan>,
-        expr_arena: &mut Arena<AExpr>,
+        _root: Node,
+        _lp_arena: &mut Arena<ALogicalPlan>,
+        _expr_arena: &mut Arena<AExpr>,
     ) -> Result<Box<dyn Executor>> {
-        self.create_physical_plan(root, lp_arena, expr_arena)
+        self.create_physical_plan(_root, _lp_arena, _expr_arena)
     }
 }
 

diff --git a/py-polars/Cargo.lock b/py-polars/Cargo.lock