database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](index) fix that the last element of each batch will be read repeatedly for binary prefix page (#15481)

Browse Source
This commit is contained in:
Xin Liao
2022-12-30 15:36:55 +08:00
committed by GitHub
parent 9246e03932
commit 2f572ccc43
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
be/src/olap/rowset/segment_v2/binary_prefix_page.cpp
View File

@ -257,21 +257,23 @@ Status BinaryPrefixPageDecoder::next_batch(size_t* n, ColumnBlockView* dst) {
RETURN_IF_ERROR(_copy_current_to_output(dst->pool(), out));
i++;
out++;
_cur_pos++;
// read and copy remaining values
for (; i < max_fetch; ++i) {
_cur_pos++;
RETURN_IF_ERROR(_read_next_value_to_output(prev[i - 1], dst->pool(), out));
out++;
_cur_pos++;
}
//must update _current_value
_current_value.clear();
_current_value.assign_copy((uint8_t*)prev[i - 1].data, prev[i - 1].size);
_read_next_value();
*n = max_fetch;
return Status::OK();
}
} // namespace segment_v2
} // namespace doris
} // namespace doris

24
be/test/olap/rowset/segment_v2/binary_prefix_page_test.cpp
View File

@ -90,6 +90,30 @@ public:
EXPECT_EQ(std::to_string(i), values[i - 1000].to_string());
}
ret = page_decoder->seek_to_position_in_page(0);
EXPECT_TRUE(ret.ok());
int n = 0;
while (true) {
//check values
MemPool pool;
auto type_info = get_scalar_type_info(OLAP_FIELD_TYPE_VARCHAR);
std::unique_ptr<ColumnVectorBatch> cvb;
size_t size = 6;
ColumnVectorBatch::create(size, false, type_info, nullptr, &cvb);
ColumnBlock column_block(cvb.get(), &pool);
ColumnBlockView block_view(&column_block);
ret = page_decoder->next_batch(&size, &block_view);
EXPECT_TRUE(ret.ok());
if (size == 0) {
break;
}
Slice* values = reinterpret_cast<Slice*>(column_block.data());
for (int i = 0; i < size; ++i) {
EXPECT_EQ(std::to_string(1000 + 6 * n + i), values[i].to_string());
}
n++;
}
std::unique_ptr<ColumnVectorBatch> cvb2;
ColumnVectorBatch::create(size, false, type_info, nullptr, &cvb2);
ColumnBlock column_block2(cvb2.get(), &pool);