Merge branch 'main' into enable-union-test

Author: mlafeldt

.cargo/config.toml

@@ -0,0 +1,6 @@
+[target.'cfg(all())']
+rustflags = [
+    "-Dclippy::all",
+    "-Dnonstandard-style",
+    "-Drust-2018-idioms",
+]

.github/.codecov.yml

@@ -2,7 +2,7 @@ name: CD
 
 on:
   push:
-    tags: [ '*' ]
+    tags: ["*"]
 env:
   RUST_BACKTRACE: 1
 jobs:
@@ -11,19 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # This has a matcher for test panics, so we use it even though elsewhere
-      # we use actions-rs/toolchain.
-      - uses: hecrj/setup-rust-action@v1
-        with:
-          rust-version: stable${{ matrix.host }}
-          targets: ${{ matrix.target }}
-          components: 'rustfmt, clippy'
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       # cargo publish
       - name: publish crates
         uses: katyo/publish-crates@v2
         with:
-          path: './'
+          path: "./"
           args: --no-verify --allow-dirty --all-features
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
           ignore-unpublished-changes: true

.github/workflows/release.yaml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 env:
   RUST_BACKTRACE: 1
 jobs:
@@ -14,32 +14,29 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - { target: x86_64-pc-windows-msvc, os: windows-latest, duckdb: libduckdb-windows-amd64.zip }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, duckdb: libduckdb-linux-amd64.zip }
-          #- { target: x86_64-apple-darwin, os: macos-latest }
-          #- {
-              #target: x86_64-pc-windows-gnu,
-              #os: windows-latest,
-              #host: -x86_64-pc-windows-gnu,
-            #}
-
+          - {
+              target: x86_64-pc-windows-msvc,
+              os: windows-latest,
+              duckdb: libduckdb-windows-amd64.zip,
+            }
+          - {
+              target: x86_64-unknown-linux-gnu,
+              os: ubuntu-latest,
+              duckdb: libduckdb-linux-amd64.zip,
+            }
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      # This has a matcher for test panics, so we use it even though elsewhere
-      # we use actions-rs/toolchain.
-      - uses: hecrj/setup-rust-action@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          rust-version: stable${{ matrix.host }}
-          targets: ${{ matrix.target }}
-          components: 'rustfmt, clippy'
+          target: ${{ matrix.target }}
 
       # download libduckdb
       - uses: robinraju/[email protected]
         name: Download duckdb
         with:
           repository: "duckdb/duckdb"
-          tag: "v1.1.1"
+          tag: "v1.3.1"
           fileName: ${{ matrix.duckdb }}
           out-file-path: .
 
@@ -54,37 +51,22 @@ jobs:
       - run: cargo fmt --all -- --check
         if: matrix.os == 'ubuntu-latest'
 
-      # TODO: remove
-      - name: Workaround for https://github.com/pola-rs/polars/issues/19063
-        run: |
-          cargo update [email protected] --precise 2.5.0
-
       - name: run cargo clippy
         if: matrix.os == 'ubuntu-latest'
         env:
           DUCKDB_LIB_DIR: ${{ github.workspace }}/libduckdb
           DUCKDB_INCLUDE_DIR: ${{ github.workspace }}/libduckdb
           LD_LIBRARY_PATH: ${{ github.workspace }}/libduckdb
-        run: |
-          cargo clippy --all-targets --workspace --all-features -- -D warnings -A clippy::redundant-closure
-          
+        run: cargo clippy --all-targets --all-features --locked -- -D warnings
 
-      - name: Run cargo-tarpaulin
+      - name: Dry-run release of crates
         if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/[email protected]
+        uses: katyo/publish-crates@v2
         with:
-          # Intentionally omit time feature until we're on time 0.3, at which
-          # point it should be added to `bundled-full`.
-          args: '--features "buildtime_bindgen modern-full vtab-full vtab-loadable" --avoid-cfg-tarpaulin' # TODO restore to normal (https://github.com/xd009642/tarpaulin/issues/756#issuecomment-838769320)
-          version: 0.22.0
-        env:
-          DUCKDB_LIB_DIR: ${{ github.workspace }}/libduckdb
-          DUCKDB_INCLUDE_DIR: ${{ github.workspace }}/libduckdb
-          LD_LIBRARY_PATH: ${{ github.workspace }}/libduckdb
-
-      - name: Upload to codecov.io
-        if: matrix.os == 'ubuntu-latest'
-        uses: codecov/codecov-action@v1
+          path: "./"
+          args: --allow-dirty --all-features
+          dry-run: true
+          ignore-unpublished-changes: true
 
       # For windows
       - name: Windows extract duckdb
@@ -122,53 +104,28 @@ jobs:
           DUCKDB_INCLUDE_DIR: ${{ github.workspace }}/libduckdb
           LD_LIBRARY_PATH: ${{ github.workspace }}/libduckdb
 
-  Windows:
-    name: Windows build from source
-    needs: test
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cargo/registry/index
-          key: index-${{ runner.os }}-${{ github.run_number }}
-          restore-keys: |
-            index-${{ runner.os }}-
-      - uses: hecrj/setup-rust-action@v1
-        with:
-          rust-version: stable
-          targets: x86_64-pc-windows-msvc
-
-      - run: cargo install cargo-examples
-
   Sanitizer:
     name: Address Sanitizer
-    needs: test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       # Need nightly rust.
-      - uses: hecrj/setup-rust-action@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          rust-version: nightly
-          components: rust-src
+          toolchain: nightly
+          components: "rust-src"
+      # Install LLVM tools
+      - name: Install LLVM
+        run: |
+          sudo apt-get install -y llvm
       - name: Tests with asan
         env:
           RUSTFLAGS: -Zsanitizer=address -C debuginfo=0
           RUSTDOCFLAGS: -Zsanitizer=address
-          ASAN_OPTIONS: "detect_stack_use_after_return=1:detect_leaks=1"
-          # Work around https://github.com/rust-lang/rust/issues/59125 by
-          # disabling backtraces. In an ideal world we'd probably suppress the
-          # leak sanitization, but we don't care about backtraces here, so long
-          # as the other tests have them.
-          RUST_BACKTRACE: "0"
+          ASAN_OPTIONS: "detect_stack_use_after_return=1:detect_leaks=1:symbolize=1"
+        # We cannot run "modern-full" with asan as the chrono feature will auto-load relase binaries of
+        # the ICU-extension, which are not built with ASAN and will cause a crash.
         run: |
-          # TODO switch back to modern-full once polars is fixed
-          cargo -Z build-std test --features "chrono serde_json url r2d2 uuid extensions-full" --target x86_64-unknown-linux-gnu --package duckdb
-      - name: publish crates --dry-run
-        uses: katyo/publish-crates@v2
-        with:
-          path: './'
-          args: --allow-dirty --all-features
-          dry-run: true
-          ignore-unpublished-changes: true
+          export ASAN_SYMBOLIZER_PATH=$(which llvm-symbolizer)
+          echo $ASAN_SYMBOLIZER_PATH
+          cargo -Z build-std test --features "serde_json url r2d2 uuid polars extensions-full" --target x86_64-unknown-linux-gnu --package duckdb

.github/workflows/rust.yaml

@@ -2,14 +2,9 @@
 # will have compiled files and executables
 /target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-
 # Added by cargo
 
 /target

.gitignore

@@ -9,7 +9,7 @@ Most user should use `duckdb`, but our development may happen in both of these c
 ## Development
 
 ### duckdb-c-api
-Some features are still not implemented in the c api, so we may need pull request in the [duckdb repo]((https://github.com/duckdb/duckdb).
+Some features are still not implemented in the c api, so we may need pull request in the [duckdb repo](https://github.com/duckdb/duckdb).
 
 ```shell
 # build duckdb
@@ -53,7 +53,7 @@ cd ~/github/duckdb-rs/crates/libduckdb-sys
 cargo test --features bundled
 ```
 
-Currently in [github actions](https://github.com/wangfenjin/duckdb-rs/actions), we always use the bundled file for testing. So if you change the header in duckdb-cpp repo, you need to make the PR merged and updated the [bundled-file](https://github.com/wangfenjin/duckdb-rs/tree/main/crates/libduckdb-sys/duckdb).
+Currently in [github actions](https://github.com/duckdb/duckdb-rs/actions), we always use the bundled file for testing. So if you change the header in duckdb-cpp repo, you need to make the PR merged and updated the [bundled-file](https://github.com/duckdb/duckdb-rs/tree/main/crates/libduckdb-sys/duckdb).
 You can generated the amalgamated file by:
 
 ```shell