diff --git a/.github/workflows/wasm-workflow.yml b/.github/workflows/wasm-workflow.yml index cc3f1617f..a94eae764 100644 --- a/.github/workflows/wasm-workflow.yml +++ b/.github/workflows/wasm-workflow.yml @@ -123,13 +123,13 @@ jobs: - name: Kernel test if: ${{ inputs.isNightly == true }} - run: ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 -E 'hash_leak\.LargeAggregateLeakTest|CopyTest\.GracefulBMExceptionHandlingManyThreads|lsqb_queries_parquet.LSQBTestParquet' + run: ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 -E 'hash_leak\.LargeAggregateLeakTest|CopyTest\.GracefulBMExceptionHandlingManyThreads|lsqb_queries_parquet\.LSQBTestParquet' - name: Kernel test (in memory) if: ${{ inputs.isNightly == true }} env: IN_MEM_MODE: true - run: ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 -E 'hash_leak\.LargeAggregateLeakTest|CopyTest\.GracefulBMExceptionHandlingManyThreads|lsqb_queries_parquet.LSQBTestParquet' + run: ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 -E 'hash_leak\.LargeAggregateLeakTest|CopyTest\.GracefulBMExceptionHandlingManyThreads|lsqb_queries_parquet\.LSQBTestParquet' - name: Clean up for single-threaded build if: ${{ inputs.isNightly == true && steps.check-sunday.outputs.is_sunday == 'true' }} @@ -158,7 +158,7 @@ jobs: CMAKE_C_COMPILER_LAUNCHER: ccache CMAKE_CXX_COMPILER_LAUNCHER: ccache SINGLE_THREADED: true - TEST_FILTER: "-e2e_test_agg~hash_leak.LargeAggregateLeakTest:CopyTest.GracefulBMExceptionHandlingManyThreads" + TEST_FILTER: 'hash_leak\.LargeAggregateLeakTest|CopyTest\.GracefulBMExceptionHandlingManyThreads|lsqb_queries_parquet\.LSQBTestParquet' run: | source /home/runner/emsdk/emsdk_env.sh make wasmtest diff --git a/Makefile b/Makefile index 2c5347a19..9a5be6d13 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ wasmtest-build: cmake --build . --config $(call get-build-type,Release) -j $(NUM_THREADS) wasmtest: wasmtest-build - ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 $(if $(TEST_FILTER),-E$(TEST_FILTER),) + ctest --test-dir build/wasm/test/ --output-on-failure -j ${TEST_JOBS} --timeout 600 $(if $(TEST_FILTER),-E $(TEST_FILTER),) rusttest: ifeq ($(OS),Windows_NT) diff --git a/src/include/storage/table/arrow_node_table.h b/src/include/storage/table/arrow_node_table.h index ab44102a7..07359fedc 100644 --- a/src/include/storage/table/arrow_node_table.h +++ b/src/include/storage/table/arrow_node_table.h @@ -14,7 +14,7 @@ namespace lbug { namespace storage { struct ArrowNodeTableScanState final : ColumnarNodeTableScanState { - size_t currentBatchIdx = common::INVALID_NODE_GROUP_IDX; + size_t currentBatchIdx = static_cast(common::INVALID_NODE_GROUP_IDX); size_t currentMorselStartOffset = 0; // Start of current morsel within batch size_t currentMorselEndOffset = 0; // End of current morsel within batch std::vector outputToArrowColumnIdx; diff --git a/src/storage/table/arrow_node_table.cpp b/src/storage/table/arrow_node_table.cpp index 1fe234538..b0a0b43b9 100644 --- a/src/storage/table/arrow_node_table.cpp +++ b/src/storage/table/arrow_node_table.cpp @@ -81,7 +81,7 @@ void ArrowNodeTable::initScanState([[maybe_unused]] transaction::Transaction* tr } if (arrowScanState.source == TableScanSource::COMMITTED && - arrowScanState.currentBatchIdx != common::INVALID_NODE_GROUP_IDX && + arrowScanState.currentBatchIdx != static_cast(common::INVALID_NODE_GROUP_IDX) && arrowScanState.currentBatchIdx < arrays.size()) { arrowScanState.scanCompleted = false; }