From cfeb742f1d3ed43b62fb34277e41c4a3d5c82479 Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Mon, 27 May 2024 11:09:51 +0200 Subject: [PATCH] add-debug-tests --- .github/workflows/GeneratedTests.yml | 42 +++++++++++++++++++++++++++- duckdb | 2 +- test/sql/dat/basic_append.test | 12 +++----- test/sql/generated/tpcds.test_slow | 3 -- 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/workflows/GeneratedTests.yml b/.github/workflows/GeneratedTests.yml index bd106a5..86b5d75 100644 --- a/.github/workflows/GeneratedTests.yml +++ b/.github/workflows/GeneratedTests.yml @@ -50,4 +50,44 @@ jobs: - name: Test shell: bash run: | - GENERATED_DATA_AVAILABLE=1 make test \ No newline at end of file + GENERATED_DATA_AVAILABLE=1 make test + + debug-tests-linux: + name: Generated Tests (Linux) + runs-on: ubuntu-latest + env: + GEN: ninja + VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + submodules: 'true' + + - name: Install + 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 }} + + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: Setup vcpkg + uses: lukka/run-vcpkg@v11.1 + with: + vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 + + - name: Build + shell: bash + run: make generate-data + + - name: Test + shell: bash + run: | + make test_debug \ No newline at end of file diff --git a/duckdb b/duckdb index 70fd6a8..b9c55c3 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 70fd6a8a2450c1e2a7d0547d4c0666a649dc378e +Subproject commit b9c55c358996a519ecfbc5cda238b4b516a2b1c5 diff --git a/test/sql/dat/basic_append.test b/test/sql/dat/basic_append.test index 4ff31bc..f1b4446 100644 --- a/test/sql/dat/basic_append.test +++ b/test/sql/dat/basic_append.test @@ -9,10 +9,11 @@ require delta require-env DAT_PATH # Note: this table has 2 parquet files: -# - part-00000-ef42f28f-e8e8-4d54-b51f-c3af96c72a44-c000.snappy.parquet +# - .snappy.parquet # - contains letters a,b,c -# - part-00000-c156ac8b-f738-4479-803d-750072dd4c51-c000.snappy.parquet +# - .snappy.parquet # - contains letters d,e +mode skip query I SELECT count(*) @@ -56,8 +57,7 @@ FROM delta_scan('${DAT_PATH}/out/reader_tests/generated/basic_append/delta') 2 3 -# TODO: Figure out what's wrong here -mode skip +# FIXME add tests to confirm this filters out the files! # Now we add a filter that filters out one of the files query II @@ -67,8 +67,6 @@ WHERE number < 2 ---- a 1 -mode unskip - # Now we add a filter that filters out the other file query III SELECT a_float, letter, number, @@ -77,8 +75,6 @@ WHERE number > 4 ---- 5.5 e 5 -mode skip - # Now we add a filter that filters out all columns query III SELECT a_float, number, letter diff --git a/test/sql/generated/tpcds.test_slow b/test/sql/generated/tpcds.test_slow index b3d7e00..2234072 100644 --- a/test/sql/generated/tpcds.test_slow +++ b/test/sql/generated/tpcds.test_slow @@ -25,9 +25,6 @@ create view ${table} as from ${table}_delta endloop -# FIXME: for now this sporadically hits too many open files -mode skip - mode output_result loop i 1 9