Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
10 changes: 5 additions & 5 deletions .github/workflows/unit-test-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ jobs:
max-parallel: 15
matrix:
include:
# Linux all
- os: ubuntu-latest
# Pin the Linux image to keep the CI toolchain stable.
- os: ubuntu-24.04
build_type: Debug
enable_asan: Asan
- os: ubuntu-latest
- os: ubuntu-24.04
build_type: Debug
enable_asan: NoAsan
- os: ubuntu-latest
- os: ubuntu-24.04
build_type: Release
enable_asan: Asan
- os: ubuntu-latest
- os: ubuntu-24.04
build_type: Release
enable_asan: NoAsan

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/unit-test-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,9 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
# Keep Python 3.9 available on Linux as ubuntu-latest advances.
os: [ ubuntu-24.04, macos-latest, windows-latest ]
python-version: ["3.9", "3.11", "3.14"]
exclude:
- os: ubuntu-latest
python-version: "3.9"
include:
# Python 3.9 has no setup-python build for Ubuntu 26.04.
- os: ubuntu-22.04
python-version: "3.9"
runs-on: ${{ matrix.os }}

steps:
Expand Down
16 changes: 10 additions & 6 deletions cpp/src/file/tsfile_io_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ int TsFileIOReader::alloc_prepared_multi_ssi(
int TsFileIOReader::alloc_multi_ssi(
std::shared_ptr<IDeviceID> device_id,
const std::vector<std::string>& measurement_names,
TsFileSeriesScanIterator*& ssi, common::PageArena& pa,
Filter* time_filter) {
TsFileSeriesScanIterator*& ssi, common::PageArena& pa, Filter* time_filter,
AlignedFieldFilter* field_filter) {
int ret = E_OK;
if (RET_FAIL(load_tsfile_meta_if_necessary())) return ret;

Expand All @@ -307,7 +307,7 @@ int TsFileIOReader::alloc_multi_ssi(
if (IS_NULL(ssi_buf)) return E_OOM;
ssi = new (ssi_buf) TsFileSeriesScanIterator;
ssi->init(device_id, measurement_names.empty() ? "" : measurement_names[0],
read_file_, time_filter, pa);
read_file_, time_filter, pa, field_filter);

auto& ssi_pa = ssi->timeseries_index_pa_;

Expand All @@ -324,7 +324,10 @@ int TsFileIOReader::alloc_multi_ssi(
ssi->destroy();
mem_free(ssi);
ssi = nullptr;
return E_NOT_SUPPORT;
// An empty measurement list requests only the shared aligned clock.
// Independent series have no such clock and yield no candidate rows.
// Named requests still fall back to individual column contexts.
return measurement_names.empty() ? E_NO_MORE_DATA : E_NOT_SUPPORT;
}

// Get time column metadata
Expand All @@ -346,6 +349,9 @@ int TsFileIOReader::alloc_multi_ssi(
}
auto* multi_idx = new (multi_buf) MultiAlignedTimeseriesIndex;
multi_idx->time_ts_idx_ = time_ts_idx;
// Publish ownership before any later failure so destroy() releases the
// vector backing storage, including a partially resolved name list.
ssi->itimeseries_index_ = multi_idx;

// Batch-load all measurement TimeseriesIndex entries in a single pass over
// the index tree — cheaper than N separate binary searches + file reads.
Expand Down Expand Up @@ -382,8 +388,6 @@ int TsFileIOReader::alloc_multi_ssi(
multi_idx->value_ts_idxs_.push_back(it->second);
}

ssi->itimeseries_index_ = multi_idx;

// Skip global statistic filter for multi — per-chunk filtering still works.

if (RET_FAIL(ssi->init_chunk_reader())) {
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/file/tsfile_io_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ class TsFileIOReader {
int alloc_multi_ssi(std::shared_ptr<IDeviceID> device_id,
const std::vector<std::string>& measurement_names,
TsFileSeriesScanIterator*& ssi, common::PageArena& pa,
Filter* time_filter = nullptr);
Filter* time_filter = nullptr,
AlignedFieldFilter* field_filter = nullptr);

int prepare_series(const FileGeneration& generation,
const PreparedLocator& locator,
Expand Down
Loading
Loading