Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge feature into main #134

Merged
merged 59 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
1261ea9
Support attaching delta tables as catalogs
samansmink Oct 24, 2024
cc4eea6
minor fixes
samansmink Oct 25, 2024
3c19a20
bump duckdb to main
samansmink Nov 6, 2024
2374e61
bump to recent nightly
samansmink Nov 7, 2024
56200f8
disable mingw build
samansmink Nov 8, 2024
ecfca60
small ci fixes
samansmink Nov 8, 2024
5cf23c8
make python3 available
samansmink Nov 8, 2024
77373bc
bump vcpkg
samansmink Nov 8, 2024
ca12e53
fix mismatching duckdb version
samansmink Nov 8, 2024
49c902b
Merge pull request #110 from samansmink/attach-delta-squashed
samansmink Nov 8, 2024
e92266b
Merge branch 'main' into main-into-feature
samansmink Nov 12, 2024
296f514
format
samansmink Nov 12, 2024
f240e45
add ci tools version
samansmink Nov 12, 2024
febbb79
also skip old arch label
samansmink Nov 12, 2024
756526b
Merge pull request #118 from samansmink/main-into-feature
samansmink Nov 12, 2024
a2364a1
enable deploy for feature
samansmink Nov 14, 2024
ad12b36
add table function tostring
samansmink Nov 14, 2024
1fe8e0d
bump duckdb to 1.1.4.dev2005
samansmink Nov 20, 2024
fdb0b4e
Merge branch 'bump-duckdb-3' into improve-table-function-to-string
samansmink Nov 20, 2024
35114ae
fix upstream MultiFileReader API changes
samansmink Nov 20, 2024
6f25451
add explain table name test
samansmink Nov 20, 2024
35e9d52
format
samansmink Nov 20, 2024
b77a9da
Merge pull request #122 from samansmink/improve-table-function-to-string
samansmink Nov 20, 2024
bc3434f
add filtered files to explain output
samansmink Nov 20, 2024
c08e66b
hide behind option
samansmink Nov 20, 2024
0c815b9
Merge pull request #123 from samansmink/add-total-files-filtered
samansmink Nov 20, 2024
ac80e3a
bump-kernel
samansmink Dec 5, 2024
582202e
fix enum util
samansmink Dec 5, 2024
14e2e45
checkout v4
samansmink Dec 5, 2024
307049a
fix old manylinux based ci job
samansmink Dec 5, 2024
526f5f3
remove old line of azurite initialization
samansmink Dec 5, 2024
8a7721e
Merge pull request #127 from samansmink/bump-kernel-to-0.5.0
samansmink Dec 5, 2024
0c87fd6
minor cleanup
samansmink Dec 19, 2024
4a32608
add locking and parallel test
samansmink Dec 19, 2024
f945b66
disable micro benchmarks for now
samansmink Dec 19, 2024
a9f1977
correctly set endpoint for gcs
samansmink Dec 19, 2024
3da4e72
correctly set endpoint for gcs
samansmink Dec 19, 2024
041a838
bump to v0.6.0, build kernel either debug or release not both
samansmink Dec 19, 2024
6c3c795
add missing windows lib
samansmink Dec 19, 2024
7140762
Merge pull request #128 from samansmink/thread-safety
samansmink Dec 19, 2024
9478771
Merge branch 'fix-gcs-endpoint' into bump-kernel-to-0.6.0
samansmink Dec 19, 2024
2a001d5
Merge branch 'delta-code-cleanup' into bump-kernel-to-0.6.0
samansmink Dec 19, 2024
829103e
add missing test
samansmink Dec 19, 2024
9876698
add kernel expression test function based test
samansmink Dec 19, 2024
fd9dc3e
Merge pull request #129 from samansmink/bump-kernel-to-0.6.0
samansmink Dec 19, 2024
da26428
Merge branch 'feature' into add-expression-test
samansmink Dec 19, 2024
252bad8
format
samansmink Dec 19, 2024
1ed221c
fix booleans
samansmink Dec 19, 2024
23f4e9c
fix optional_idx issue
samansmink Dec 20, 2024
3b768d9
Merge pull request #130 from samansmink/add-expression-test
samansmink Dec 20, 2024
6810aa3
bump duckdb to main
samansmink Jan 13, 2025
e39f308
poc hooking up logging
samansmink Dec 12, 2024
020eb46
finish delta kernel logging forwarding
samansmink Jan 13, 2025
e5ee3e1
format
samansmink Jan 13, 2025
07955a1
remove forgotten print statement
samansmink Jan 13, 2025
89ebdb7
re-enable building test extensions
samansmink Jan 13, 2025
0ece666
fix thread-safety issue for logging singleton
samansmink Jan 13, 2025
7e99954
skip musl
samansmink Jan 13, 2025
4691801
Merge pull request #132 from samansmink/logging-wip
samansmink Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/regression/micro.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
benchmark/micro/snapshot_performance/delta_scan.benchmark
benchmark/micro/snapshot_performance/snapshot_no_pin.benchmark
benchmark/micro/snapshot_performance/snapshot_no_pin_filter.benchmark
benchmark/micro/snapshot_performance/snapshot_pin.benchmark
benchmark/micro/snapshot_performance/snapshot_pin_filter.benchmark
2 changes: 1 addition & 1 deletion .github/workflows/CloudTesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo apt-get update -y -qq
sudo apt-get install -y -qq ninja-build make gcc-multilib g++-multilib zip unzip build-essential checkinstall curl libz-dev openssh-client
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'
Expand Down
53 changes: 33 additions & 20 deletions .github/workflows/LocalTesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
azurite-tests-linux:
name: Azurite (local azure test server) tests (Linux)
runs-on: ubuntu-latest
container: 'quay.io/pypa/manylinux2014_x86_64'
env:
VCPKG_TARGET_TRIPLET: 'x64-linux'
GEN: Ninja
Expand All @@ -24,32 +23,37 @@ jobs:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'

- name: Install Ninja
shell: bash
run: sudo apt-get update -y -qq && sudo apt-get install -y -qq ninja-build

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
with:
key: ${{ github.job }}

- name: Setup vcpkg
uses: lukka/[email protected]
with:
vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6

- uses: actions/setup-node@v4

- name: install Azure test service
run: |
yum install -y nodejs npm
npm install -g azurite
echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | tee /etc/yum.repos.d/azure-cli.repo
yum install -y azure-cli

- name: Setup ManyLinux2014
run: |
./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh python_alias openssl
sudo apt-get install -y azure-cli

- name: Setup Rust for manylinux (dtolnay/rust-toolchain doesn't work due to curl being old here)
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

- name: Setup vcpkg
uses: lukka/[email protected]
with:
vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6

- name: Handle OpenSSL dependency for rust build
run: |
echo "OPENSSL_ROOT_DIR=`pwd`/build/release/vcpkg_installed/x64-linux" >> $GITHUB_ENV
Expand Down Expand Up @@ -90,7 +94,7 @@ jobs:
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'
Expand Down Expand Up @@ -179,7 +183,7 @@ jobs:
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'true'
Expand Down Expand Up @@ -210,12 +214,14 @@ jobs:

- name: Build
shell: bash
run: make generate-data
run: |
make generate-data
make release

- name: Test
shell: bash
run: |
GENERATED_DATA_AVAILABLE=1 make test
GENERATED_DATA_AVAILABLE=1 make test_release

regression-test-benchmark-runner:
name: Performance Regression Tests
Expand Down Expand Up @@ -280,13 +286,20 @@ jobs:
if: always()
shell: bash
run: |
python3 ./duckdb/scripts/regression_test_runner.py --old=duckdb_delta/build/release/benchmark/benchmark_runner --new=build/release/benchmark/benchmark_runner --benchmarks=.github/regression/tpch_sf1_local.csv --verbose --threads=2 --root-dir=.
python3 ./duckdb/scripts/regression/test_runner.py --old=duckdb_delta/build/release/benchmark/benchmark_runner --new=build/release/benchmark/benchmark_runner --benchmarks=.github/regression/tpch_sf1_local.csv --verbose --threads=2 --root-dir=.

- name: Regression Test TPC-DS
if: always()
shell: bash
run: |
python ./duckdb/scripts/regression_test_runner.py --old=duckdb_delta/build/release/benchmark/benchmark_runner --new=build/release/benchmark/benchmark_runner --benchmarks=.github/regression/tpcds_sf1_local.csv --verbose --threads=2 --root-dir=.
python ./duckdb/scripts/regression/test_runner.py --old=duckdb_delta/build/release/benchmark/benchmark_runner --new=build/release/benchmark/benchmark_runner --benchmarks=.github/regression/tpcds_sf1_local.csv --verbose --threads=2 --root-dir=.

# FIXME: re-enable
# - name: Regression Test Micro
# if: always()
# shell: bash
# run: |
# python ./duckdb/scripts/regression/test_runner.py --old=duckdb_delta/build/release/benchmark/benchmark_runner --new=build/release/benchmark/benchmark_runner --benchmarks=.github/regression/micro.csv --verbose --threads=2 --root-dir=.

- name: Test benchmark makefile
shell: bash
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@ concurrency:
jobs:
duckdb-stable-build:
name: Build extension binaries
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.3
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
with:
duckdb_version: v1.1.3
ci_tools_version: v1.1.3
duckdb_version: main
ci_tools_version: main
extension_name: delta
enable_rust: true
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl'
extra_toolchains: 'python3'

duckdb-stable-deploy:
name: Deploy extension binaries
needs: duckdb-stable-build
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.3
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
secrets: inherit
with:
extension_name: delta
duckdb_version: v1.1.3
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
duckdb_version: main
ci_tools_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl'
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ test/python/__pycache__/
data/generated
__azurite*__.json
__blobstorage__
.venv
venv
.vscode
Loading
Loading