Skip to content

Commit ebb565f

Browse files
committed
fix
1 parent 1bf255c commit ebb565f

File tree

4 files changed

+5
-43
lines changed

4 files changed

+5
-43
lines changed

be/src/olap/rowset/segment_v2/segment_prefetcher.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ void SegmentPrefetcher::build_all_data_blocks() {
8989
const auto& pages = ordinal_index->_pages; // pages[i] = page pointer of page i
9090
const int num_pages = ordinal_index->_num_pages;
9191

92-
size_t last_block_id = static_cast<size_t>(-1);
93-
rowid_t current_block_first_rowid = 0;
92+
last_block_id = static_cast<size_t>(-1);
93+
current_block_first_rowid = 0;
9494

95-
for (int page_idx = 0; page_idx < num_pages; ++page_idx) {
95+
for (page_idx = 0; page_idx < num_pages; ++page_idx) {
9696
const auto& page = pages[page_idx];
9797

9898
if (_is_forward) {
@@ -108,7 +108,7 @@ void SegmentPrefetcher::build_all_data_blocks() {
108108
_block_sequence.emplace_back(last_block_id, current_block_first_rowid);
109109
}
110110
last_block_id = block_id;
111-
current_block_first_rowid = ordinals[page_idx];
111+
current_block_first_rowid = static_cast<rowid_t>(ordinals[page_idx]);
112112
}
113113
} else {
114114
// Backward: use the last ordinal in each block as first_rowid
@@ -119,7 +119,7 @@ void SegmentPrefetcher::build_all_data_blocks() {
119119
}
120120
last_block_id = block_id;
121121
}
122-
current_block_first_rowid = ordinals[page_idx];
122+
current_block_first_rowid = static_cast<rowid_t>(ordinals[page_idx]);
123123
}
124124
}
125125

be/src/olap/rowset/segment_v2/variant/sparse_column_extract_iterator.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,6 @@ class BaseSparseColumnProcessor : public ColumnIterator {
8585
throw doris::Exception(ErrorCode::NOT_IMPLEMENTED_ERROR, "not implement");
8686
}
8787

88-
Status init_prefetcher(const SegmentPrefetchParams& params) override {
89-
if (has_sparse_column_cache()) {
90-
return Status::OK();
91-
}
92-
return _sparse_column_reader->init_prefetcher(params);
93-
}
94-
95-
void collect_prefetchers(
96-
std::map<PrefetcherInitMethod, std::vector<SegmentPrefetcher*>>& prefetchers,
97-
PrefetcherInitMethod init_method) override {
98-
if (has_sparse_column_cache()) {
99-
return;
100-
}
101-
_sparse_column_reader->collect_prefetchers(prefetchers, init_method);
102-
}
103-
10488
// Template method pattern for batch processing
10589
template <typename ReadMethod>
10690
Status _process_batch(ReadMethod&& read_method, size_t nrows,

be/src/olap/rowset/segment_v2/variant/sparse_column_merge_iterator.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,6 @@ Status SparseColumnMergeIterator::seek_to_ordinal(ordinal_t ord) {
4444
return Status::OK();
4545
}
4646

47-
Status SparseColumnMergeIterator::init_prefetcher(const SegmentPrefetchParams& params) {
48-
RETURN_IF_ERROR(_sparse_column_reader->init_prefetcher(params));
49-
for (auto& entry : _src_subcolumns_for_sparse) {
50-
RETURN_IF_ERROR(entry->data.iterator->init_prefetcher(params));
51-
}
52-
return Status::OK();
53-
}
54-
55-
void SparseColumnMergeIterator::collect_prefetchers(
56-
std::map<PrefetcherInitMethod, std::vector<SegmentPrefetcher*>>& prefetchers,
57-
PrefetcherInitMethod init_method) {
58-
_sparse_column_reader->collect_prefetchers(prefetchers, init_method);
59-
for (auto& entry : _src_subcolumns_for_sparse) {
60-
entry->data.iterator->collect_prefetchers(prefetchers, init_method);
61-
}
62-
}
63-
6447
Status SparseColumnMergeIterator::init(const ColumnIteratorOptions& opts) {
6548
RETURN_IF_ERROR(_sparse_column_cache->init(opts));
6649
for (auto& entry : _src_subcolumns_for_sparse) {

be/src/olap/rowset/segment_v2/variant/sparse_column_merge_iterator.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ class SparseColumnMergeIterator : public BaseSparseColumnProcessor {
9292

9393
Status seek_to_ordinal(ordinal_t ord) override;
9494

95-
Status init_prefetcher(const SegmentPrefetchParams& params) override;
96-
void collect_prefetchers(
97-
std::map<PrefetcherInitMethod, std::vector<SegmentPrefetcher*>>& prefetchers,
98-
PrefetcherInitMethod init_method) override;
99-
10095
private:
10196
template <typename ReadFunction>
10297
Status _read_subcolumns(ReadFunction&& read_func) {

0 commit comments

Comments
 (0)