Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/wasm-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/include/storage/table/arrow_node_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<size_t>(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<int64_t> outputToArrowColumnIdx;
Expand Down
2 changes: 1 addition & 1 deletion src/storage/table/arrow_node_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<size_t>(common::INVALID_NODE_GROUP_IDX) &&
arrowScanState.currentBatchIdx < arrays.size()) {
arrowScanState.scanCompleted = false;
}
Expand Down