From 5ea43fff244d96d82f8af95e0d8171d3644ff5fb Mon Sep 17 00:00:00 2001 From: everpcpc Date: Wed, 20 Nov 2024 17:48:16 +0800 Subject: [PATCH] chore(ci): adjust runner size (#16879) * chore(ci): adjust runner size * z * z * z * z * z * z * z * z * z * z --- .github/workflows/bindings.python.yml | 2 +- .github/workflows/cloud.yml | 4 +- .github/workflows/meta.yml | 4 +- .github/workflows/release.yml | 22 ++-- .github/workflows/reuse.benchmark.yml | 2 +- .github/workflows/reuse.linux.hive.yml | 4 +- .github/workflows/reuse.linux.yml | 44 ++++---- .github/workflows/reuse.sqllogic.yml | 100 ++++++++---------- Cargo.toml | 8 +- tests/sqllogictests/suites/query/set.test | 12 +-- .../suites/tpch_iceberg/prune.test | 6 +- 11 files changed, 96 insertions(+), 112 deletions(-) diff --git a/.github/workflows/bindings.python.yml b/.github/workflows/bindings.python.yml index d8a0a2fbc8295..2a0fc2ba34c00 100644 --- a/.github/workflows/bindings.python.yml +++ b/.github/workflows/bindings.python.yml @@ -22,7 +22,7 @@ concurrency: jobs: linux: - runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c16g, aws] + runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 4c16g, aws] strategy: matrix: include: diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml index 6bb7c37488bea..d899dce3c1bee 100644 --- a/.github/workflows/cloud.yml +++ b/.github/workflows/cloud.yml @@ -45,7 +45,7 @@ jobs: build: needs: info - runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 16c32g, aws] + runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws] strategy: matrix: include: @@ -71,7 +71,7 @@ jobs: docker: needs: [info, build] timeout-minutes: 10 - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] outputs: tag: ${{ steps.prepare.outputs.tag }} steps: diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index 34c694744c251..bba330a4efe2f 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -36,7 +36,7 @@ jobs: build: needs: info - runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 16c32g, aws] + runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws] strategy: matrix: include: @@ -56,7 +56,7 @@ jobs: chaos: needs: [info, build] - runs-on: [self-hosted, X64, Linux, 8c16g, aws] + runs-on: [self-hosted, X64, Linux, 4c16g, aws] steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b956abaec2a8d..366a7c7a3d137 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: delete-branch: true build_default: - runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 16c32g, aws] + runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws] needs: create_release strategy: fail-fast: false @@ -132,7 +132,7 @@ jobs: bash ./scripts/ci/ci-run-sqllogic-tests.sh base build_musl: - runs-on: [self-hosted, X64, Linux, 16c32g, aws] + runs-on: [self-hosted, X64, Linux, 8c32g, aws] needs: create_release strategy: fail-fast: false @@ -157,7 +157,7 @@ jobs: artifacts: query,meta,metactl build_udf: - runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 16c32g, aws] + runs-on: [self-hosted, "${{ matrix.runner }}", Linux, 8c32g, aws] needs: create_release strategy: fail-fast: false @@ -184,7 +184,7 @@ jobs: category: udf publish: - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] needs: [create_release, build_default, build_musl] strategy: fail-fast: false @@ -251,7 +251,7 @@ jobs: category: ${{ matrix.category }} publish_testsuite: - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] needs: [create_release, build_default] strategy: fail-fast: false @@ -295,7 +295,7 @@ jobs: category: testsuite docker_all_in_one: - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] needs: [create_release, build_default] steps: - name: Checkout @@ -370,7 +370,7 @@ jobs: readme-filepath: ./docker/README.md docker_service: - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] needs: [create_release, build_udf] strategy: fail-fast: false @@ -441,7 +441,7 @@ jobs: file: ./docker/service/${{ matrix.service }}.Dockerfile distribution: - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] needs: [create_release, build_default] strategy: matrix: @@ -592,7 +592,7 @@ jobs: sqlsmith: needs: [create_release, notify] - runs-on: [self-hosted, X64, Linux, 4c8g, aws] + runs-on: [self-hosted, X64, Linux, 2c8g, aws] steps: - uses: actions/checkout@v4 with: @@ -617,7 +617,7 @@ jobs: metachaos: needs: [create_release, notify] - runs-on: [self-hosted, X64, Linux, 8c16g, aws] + runs-on: [self-hosted, X64, Linux, 4c16g, aws] steps: - uses: actions/checkout@v4 with: @@ -643,7 +643,7 @@ jobs: await script({context, core}) # sharing: - # runs-on: [self-hosted, X64, Linux, 4c8g, aws] + # runs-on: [self-hosted, X64, Linux, 2c8g, aws] # needs: [create_release, notify] # steps: # - uses: actions/checkout@v4 diff --git a/.github/workflows/reuse.benchmark.yml b/.github/workflows/reuse.benchmark.yml index 32042aacd5cf8..d8097d9297d06 100644 --- a/.github/workflows/reuse.benchmark.yml +++ b/.github/workflows/reuse.benchmark.yml @@ -44,7 +44,7 @@ env: jobs: local: timeout-minutes: 60 - runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 8c32g, "${{ inputs.runner_provider }}"] strategy: matrix: dataset: diff --git a/.github/workflows/reuse.linux.hive.yml b/.github/workflows/reuse.linux.hive.yml index eeae250f49217..e189608c6a1b9 100644 --- a/.github/workflows/reuse.linux.hive.yml +++ b/.github/workflows/reuse.linux.hive.yml @@ -20,7 +20,7 @@ env: jobs: build: - runs-on: [self-hosted, X64, Linux, 8c16g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 4c16g, "${{ inputs.runner_provider }}"] strategy: matrix: include: @@ -43,7 +43,7 @@ jobs: test_stateful_hive_standalone: needs: build - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/test_stateful_hive_standalone diff --git a/.github/workflows/reuse.linux.yml b/.github/workflows/reuse.linux.yml index 116c6c719995b..91652bed3739a 100644 --- a/.github/workflows/reuse.linux.yml +++ b/.github/workflows/reuse.linux.yml @@ -25,7 +25,7 @@ env: jobs: check: - runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 8c32g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 with: @@ -41,7 +41,7 @@ jobs: - self-hosted - "${{ matrix.runner }}" - Linux - - 16c32g + - 8c32g - "${{ inputs.runner_provider }}" strategy: fail-fast: false @@ -67,7 +67,7 @@ jobs: - self-hosted - "${{ matrix.runner }}" - Linux - - 16c32g + - 8c32g - "${{ inputs.runner_provider }}" strategy: fail-fast: false @@ -96,7 +96,7 @@ jobs: # - self-hosted # - "${{ matrix.runner }}" # - Linux - # - 16c32g + # - 8c32g # - "${{ inputs.runner_provider }}" # strategy: # fail-fast: false @@ -115,7 +115,7 @@ jobs: # artifacts: query test_unit: - runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 8c32g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 with: @@ -125,7 +125,7 @@ jobs: timeout-minutes: 60 test_metactl: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -133,7 +133,7 @@ jobs: timeout-minutes: 10 test_compat_meta_query: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -141,7 +141,7 @@ jobs: timeout-minutes: 10 test_compat_fuse: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -149,7 +149,7 @@ jobs: timeout-minutes: 20 test_compat_meta_meta: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -157,7 +157,7 @@ jobs: timeout-minutes: 20 test_logs: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -165,7 +165,7 @@ jobs: timeout-minutes: 20 test_meta_cluster: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -173,7 +173,7 @@ jobs: timeout-minutes: 10 test_stateless_standalone: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -181,7 +181,7 @@ jobs: timeout-minutes: 15 test_stateless_cluster: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -193,7 +193,7 @@ jobs: timeout-minutes: 15 test_stateful_standalone: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -206,7 +206,7 @@ jobs: name: test-stateful-standalone-linux test_stateful_cluster: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -224,7 +224,7 @@ jobs: test_stateful_large_data: if: contains(github.event.pull_request.labels.*.name, 'ci-largedata') - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -232,7 +232,7 @@ jobs: timeout-minutes: 60 test_stateful_iceberg_rest: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] needs: [build, check] steps: - uses: actions/checkout@v4 @@ -245,7 +245,7 @@ jobs: name: test-stateful-iceberg-rest-standalone # test_fuzz_standalone: - # runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + # runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] # needs: [build, check] # steps: # - uses: actions/checkout@v4 @@ -255,7 +255,7 @@ jobs: test_ee_standalone: needs: [build, check] - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup_license @@ -272,7 +272,7 @@ jobs: test_ee_standalone_background: needs: [build, check] - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup_bendsql @@ -295,7 +295,7 @@ jobs: # # test_ee_standalone_fake_time: # needs: [build, check] - # runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + # runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] # steps: # - uses: actions/checkout@v4 # - uses: ./.github/actions/setup_license @@ -312,7 +312,7 @@ jobs: test_ee_management_mode: needs: [build, check] - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup_bendsql diff --git a/.github/workflows/reuse.sqllogic.yml b/.github/workflows/reuse.sqllogic.yml index ea56077fad833..a959a38c470c5 100644 --- a/.github/workflows/reuse.sqllogic.yml +++ b/.github/workflows/reuse.sqllogic.yml @@ -25,7 +25,7 @@ env: jobs: management_mode: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/test_sqllogic_management_mode_linux @@ -35,18 +35,24 @@ jobs: handlers: mysql,http standalone: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: + - self-hosted + - X64 + - Linux + - "${{ matrix.tests.runner }}" + - "${{ inputs.runner_provider }}" strategy: fail-fast: false matrix: - dirs: - - "standalone" - - "crdb" - - "duckdb" - - "base" - - "ydb" - - "tpcds" - - "tpch" + tests: + - { dirs: "query", runner: "4c16g" } + - { dirs: "duckdb", runner: "4c16g" } + - { dirs: "crdb", runner: "2c8g" } + - { dirs: "base", runner: "2c8g" } + - { dirs: "ydb", runner: "2c8g" } + - { dirs: "tpcds", runner: "2c8g" } + - { dirs: "tpch", runner: "2c8g" } + - { dirs: "standalone", runner: "2c8g" } handler: - "mysql" - "http" @@ -55,44 +61,17 @@ jobs: - uses: ./.github/actions/test_sqllogic_standalone_linux timeout-minutes: 15 with: - dirs: ${{ matrix.dirs }} + dirs: ${{ matrix.tests.dirs }} handlers: ${{ matrix.handler }} storage-format: all - name: Upload failure if: failure() uses: ./.github/actions/artifact_failure with: - name: test-sqllogic-standalone-${{ matrix.dirs }}-${{ matrix.handler }} - - standalone_query: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] - strategy: - fail-fast: false - matrix: - dirs: - - "query" - handler: - - "mysql" - - "http" - format: - - "native" - - "parquet" - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/test_sqllogic_standalone_linux - timeout-minutes: 15 - with: - dirs: ${{ matrix.dirs }} - handlers: ${{ matrix.handler }} - storage-format: ${{ matrix.format }} - - name: Upload failure - if: failure() - uses: ./.github/actions/artifact_failure - with: - name: test-sqllogic-standalone-query-${{ matrix.handler }}-${{ matrix.format }} + name: test-sqllogic-standalone-${{ matrix.tests.dirs }}-${{ matrix.handler }} standalone_udf_server: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - name: Start UDF Server @@ -113,7 +92,7 @@ jobs: name: test-sqllogic-standalone-udf-server standalone_cloud: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 4c16g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - name: Start Cloud Control Server @@ -134,7 +113,7 @@ jobs: name: test-sqllogic-standalone-cloud standalone_minio: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] strategy: fail-fast: false matrix: @@ -161,7 +140,7 @@ jobs: name: test-sqllogic-standalone-minio-${{ matrix.dirs }}-${{ matrix.handler }}-${{ matrix.format }} standalone_iceberg_tpch: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 4c16g, "${{ inputs.runner_provider }}"] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 @@ -180,19 +159,24 @@ jobs: name: test-sqllogic-standalone-iceberg-tpch cluster: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: + - self-hosted + - X64 + - Linux + - "${{ matrix.tests.runner }}" + - "${{ inputs.runner_provider }}" strategy: fail-fast: false matrix: - dirs: - - "query" - - "crdb" - - "duckdb" - - "base" - - "ydb" - - "tpcds" - - "tpch" - - "cluster" + tests: + - { dirs: "query", runner: "4c16g" } + - { dirs: "duckdb", runner: "4c16g" } + - { dirs: "crdb", runner: "2c8g" } + - { dirs: "base", runner: "2c8g" } + - { dirs: "ydb", runner: "2c8g" } + - { dirs: "tpcds", runner: "2c8g" } + - { dirs: "tpch", runner: "2c8g" } + - { dirs: "cluster", runner: "2c8g" } handler: - "mysql" - "http" @@ -205,16 +189,16 @@ jobs: - uses: ./.github/actions/test_sqllogic_cluster_linux timeout-minutes: 15 with: - dirs: ${{ matrix.dirs }} + dirs: ${{ matrix.tests.dirs }} handlers: ${{ matrix.handler }} - name: Upload failure if: failure() uses: ./.github/actions/artifact_failure with: - name: test-sqllogic-cluster-${{ matrix.dirs }}-${{ matrix.handler }} + name: test-sqllogic-cluster-${{ matrix.tests.dirs }}-${{ matrix.handler }} stage: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] strategy: fail-fast: false matrix: @@ -236,7 +220,7 @@ jobs: name: test-sqllogic-stage-${{ matrix.storage }} standalone_no_table_meta_cache: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] strategy: fail-fast: false matrix: @@ -260,7 +244,7 @@ jobs: name: test-sqllogic-standalone-no-table-meta-cache-${{ matrix.dirs }}-${{ matrix.handler }} ee: - runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] + runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"] strategy: fail-fast: false matrix: diff --git a/Cargo.toml b/Cargo.toml index af99aca4b21cd..bca41bfd82e77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -581,10 +581,6 @@ debug-assertions = true # databend-query = { codegen-units = 4 } # databend-binaries = { codegen-units = 4 } -[profile.bench] -debug = true -overflow-checks = false - [profile.dev] split-debuginfo = "unpacked" overflow-checks = false @@ -600,6 +596,10 @@ object = { opt-level = 3 } rustc-demangle = { opt-level = 3 } databend-common-exception = { opt-level = 3 } +[profile.bench] +debug = true +overflow-checks = false + [profile.test] opt-level = 0 debug = true diff --git a/tests/sqllogictests/suites/query/set.test b/tests/sqllogictests/suites/query/set.test index 1620721663772..540135f8795fb 100644 --- a/tests/sqllogictests/suites/query/set.test +++ b/tests/sqllogictests/suites/query/set.test @@ -1,14 +1,14 @@ statement ok -SET GLOBAL (max_threads, storage_io_min_bytes_for_seek) = (4, 56); +SET GLOBAL (max_threads, storage_io_min_bytes_for_seek) = (13, 56); query TT select value, default = value from system.settings where name in ('max_threads', 'storage_io_min_bytes_for_seek') order by value; ---- -4 0 +13 0 56 0 statement ok -set variable (a, b) = (select 3, 55) +set variable (a, b) = (select 12, 55) statement ok @@ -17,7 +17,7 @@ SET GLOBAL (max_threads, storage_io_min_bytes_for_seek) = select $a + 1, $b + 1; query TT select value, default = value from system.settings where name in ('max_threads', 'storage_io_min_bytes_for_seek') order by value; ---- -4 0 +13 0 56 0 statement ok @@ -36,7 +36,7 @@ statement ok set variable (b, c) = ('yy', 'zz'); query ITT -select $a + getvariable('a') + $a, getvariable('b'), getvariable('c'), getvariable('d') +select $a + getvariable('a') + $a, getvariable('b'), getvariable('c'), getvariable('d') ---- 3 yy zz NULL @@ -44,7 +44,7 @@ statement ok unset variable (a, b) query ITT -select getvariable('a'), getvariable('b'), 'xx' || 'yy' || getvariable('c') , getvariable('d') +select getvariable('a'), getvariable('b'), 'xx' || 'yy' || getvariable('c') , getvariable('d') ---- NULL NULL xxyyzz NULL diff --git a/tests/sqllogictests/suites/tpch_iceberg/prune.test b/tests/sqllogictests/suites/tpch_iceberg/prune.test index f79f367d71457..c32b0ae6101f3 100644 --- a/tests/sqllogictests/suites/tpch_iceberg/prune.test +++ b/tests/sqllogictests/suites/tpch_iceberg/prune.test @@ -134,8 +134,8 @@ EvalScalar ├── table: ctl.tpch.lineitem ├── output columns: [l_orderkey (#0), l_commitdate (#11)] ├── read rows: 600572 - ├── read size: 14.41 MiB - ├── partitions total: 6 - ├── partitions scanned: 6 + ├── read size: 14.27 MiB + ├── partitions total: 4 + ├── partitions scanned: 4 ├── push downs: [filters: [(NOT is_not_null(lineitem.l_orderkey (#0)) OR is_not_null(lineitem.l_commitdate (#11)))], limit: NONE] └── estimated rows: 0.00