From 1e600a9e498fdf2dc58452cc52807303775c020d Mon Sep 17 00:00:00 2001 From: Mergen Imeev Date: Fri, 14 Aug 2026 11:00:08 +0300 Subject: [PATCH 1/2] tpch: fix problems with tarantool 3.8 This patch fixes an issue with missing `SEQSCAN` keyword in queries; disabling of arithmetic operations on NUMBERS and case-sensitive identifier lookups. --- execute_query.lua | 1 + queries/14.sql | 2 +- queries/15.sql | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/execute_query.lua b/execute_query.lua index 3c69763..e98c7c9 100644 --- a/execute_query.lua +++ b/execute_query.lua @@ -20,6 +20,7 @@ io.stdout:setvbuf 'no' local function config(portN, memSz) if not dryrun then box.cfg{ listen = tonumber(portN), memtx_memory = tonumber(memSz) } + box.execute('set session "sql_seq_scan" = true') end end diff --git a/queries/14.sql b/queries/14.sql index 58a075c..86b4a61 100644 --- a/queries/14.sql +++ b/queries/14.sql @@ -6,7 +6,7 @@ select when p_type like 'PROMO%' then l_extendedprice * (1 - l_discount) else 0 - end as number)) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue + end as double)) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue from lineitem, part diff --git a/queries/15.sql b/queries/15.sql index 4c414db..b37d081 100644 --- a/queries/15.sql +++ b/queries/15.sql @@ -5,7 +5,7 @@ create view revenue0 (supplier_no, total_revenue) as l_suppkey, sum(l_extendedprice * (1 - l_discount)) from - lineitem + LINEITEM where l_shipdate >= cast('1993-01-01' as datetime) and l_shipdate < cast('1993-01-01' as datetime) + cast({'month': 3} as interval) From f1554e5a005a8ed1a30c7806e35303ceedc7fb17 Mon Sep 17 00:00:00 2001 From: Mergen Imeev Date: Fri, 14 Aug 2026 14:08:37 +0300 Subject: [PATCH 2/2] CI: update quick-check workflow This patch updates script for quick-check workflow. Old script already too old and do not work. --- .github/workflows/quick-check.yml | 70 +++++++++++-------------------- 1 file changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index 5b76edf..35ea7d7 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -2,14 +2,18 @@ name: quick_check on: push: - repository_dispatch: + branches: + - master + tags: + - '**' + pull_request: workflow_dispatch: env: BUILD_TYPE: RelWithDebInfo MEM_SIZE: 1073741824 SCALE_FACTOR: 0.2 - TARANTOOL_SRC: tarantool-src + TNT_RELEASE_PATH: /home/runner/tnt-release BRANCH: master jobs: @@ -19,65 +23,41 @@ jobs: fail-fast: false steps: - - name: checkout tpch - uses: actions/checkout@v2 + - name: Prepare checkout + uses: tarantool/actions/prepare-checkout@master + + - name: Checkout + uses: actions/checkout@v7 with: - clean: true fetch-depth: 0 submodules: recursive + ref: ${{ github.ref }} - - name: checkout tarantool sources - uses: actions/checkout@v2 + - name: Clone tarantool + uses: actions/checkout@v7 with: repository: tarantool/tarantool - ref: ${{ env.BRANCH }} - path: ${{ env.TARANTOOL_SRC }} + path: tarantool fetch-depth: 0 submodules: recursive - - name: Install tarantool build prerequisites - run: | - sudo apt-get install -y patch ccache luarocks libmsgpuck-dev libluajit-5.1-dev + - name: Setup tarantool dependencies + run: sudo apt install -y libreadline-dev - # by some odd reason we can't use - # working-directory: $GITHUB_WORKSPACE/tarantool/build - # syntax - directory is not yet existing before actions - # run. So use workaround with cd - - name: Configure CMake for Tarantool sources - shell: bash + - name: Build tarantool ${{ matrix.tarantool }} run: | - cd $GITHUB_WORKSPACE/$TARANTOOL_SRC/ - cmake -S . -B build \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + cd ${GITHUB_WORKSPACE}/tarantool + cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_DIST=ON -DCMAKE_INSTALL_PREFIX="${TNT_RELEASE_PATH}" + cmake --build build -j + cmake --install build - - name: Build Tarantool - shell: bash - run: | - cd $GITHUB_WORKSPACE/$TARANTOOL_SRC/ - cmake --build build - - name: Clean bench data - shell: bash - run: | - make clean-tnt - - name: Run micro bench (SF=0.2) shell: bash run: | make create_TNT_db \ - TARANTOOL=$TARANTOOL_SRC/build/src/tarantool \ + TARANTOOL="${TNT_RELEASE_PATH}/bin/tarantool" \ SCALE_FACTOR=$SCALE_FACTOR \ MEM_SIZE=$MEM_SIZE - make TARANTOOL=$TARANTOOL_SRC/build/src/tarantool \ + make TARANTOOL="${TNT_RELEASE_PATH}/bin/tarantool" \ MEM_SIZE=$MEM_SIZE bench-tnt - - - name: artifacts - uses: actions/upload-artifact@v2 - with: - name: perf_tpch - retention-days: 7 - path: | - *_result.txt - *_t_version.txt - bench-*.csv