Skip to content

[Fix](Variant) fix variant schema change may cause invalid block schema and write missing blocks #36317 #36536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaokang merged 1 commit into from
Jun 19, 2024
Merged

[Fix](Variant) fix variant schema change may cause invalid block schema and write missing blocks #36317 #36536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions be/src/olap/rowset/segment_creator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,15 @@ Status SegmentCreator::add_block(const vectorized::Block* block) {
size_t block_row_num = block->rows();
size_t row_avg_size_in_bytes = std::max((size_t)1, block_size_in_bytes / block_row_num);
size_t row_offset = 0;

if (_segment_flusher.need_buffering()) {
RETURN_IF_ERROR(_buffer_block.merge(*block));
if (_buffer_block.allocated_bytes() > config::write_buffer_size) {
LOG(INFO) << "directly flush a single block " << _buffer_block.rows() << " rows"
<< ", block size " << _buffer_block.bytes() << " block allocated_size "
<< _buffer_block.allocated_bytes();
vectorized::Block block = _buffer_block.to_block();
RETURN_IF_ERROR(flush_single_block(&block));
_buffer_block.clear();
} else {
RETURN_IF_ERROR(_buffer_block.merge(*block));
}
return Status::OK();
}
Expand Down Expand Up @@ -426,6 +427,9 @@ Status SegmentCreator::add_block(const vectorized::Block* block) {
Status SegmentCreator::flush() {
if (_buffer_block.rows() > 0) {
vectorized::Block block = _buffer_block.to_block();
LOG(INFO) << "directly flush a single block " << block.rows() << " rows"
<< ", block size " << block.bytes() << " block allocated_size "
<< block.allocated_bytes();
RETURN_IF_ERROR(flush_single_block(&block));
_buffer_block.clear();
}
Expand Down
8 changes: 6 additions & 2 deletions be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,12 @@ class HierarchicalDataReader : public ColumnIterator {
type->to_string(container_variant, i, write_buffer);
write_buffer.commit();
}
CHECK(variant.empty());
variant.create_root(std::make_shared<vectorized::DataTypeString>(), std::move(col_to));
if (variant.empty()) {
variant.create_root(std::make_shared<vectorized::DataTypeString>(),
std::move(col_to));
} else {
variant.get_root()->insert_range_from(*col_to, 0, col_to->size());
}
} else {
// TODO select v:b -> v.b / v.b.c but v.d maybe in v
// copy container variant to dst variant, todo avoid copy
Expand Down
3 changes: 2 additions & 1 deletion be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,9 @@ Status VerticalSegmentWriter::batch_block(const vectorized::Block* block, size_t
} else if (block->columns() != _tablet_schema->num_columns()) {
return Status::InternalError(
"illegal block columns, block columns = {}, tablet_schema columns = {}",
block->columns(), _tablet_schema->num_columns());
block->dump_structure(), _tablet_schema->dump_structure());
}
LOG(INFO) << "add a single block " << block->rows();
_batched_blocks.emplace_back(block, row_pos, num_rows);
return Status::OK();
}
Expand Down
5 changes: 4 additions & 1 deletion regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

suite("double_write_schema_change_with_variant") {
suite("double_write_schema_change_with_variant", "nonConcurrent") {
def set_be_config = { key, value ->
String backend_id;
def backendId_to_backendIP = [:]
Expand Down Expand Up @@ -70,6 +70,7 @@ suite("double_write_schema_change_with_variant") {
"""

set_be_config.call("memory_limitation_per_thread_for_schema_change_bytes", "6294967296")
set_be_config.call("write_buffer_size", "10240")
load_json_data.call(table_name, """${getS3Url() + '/regression/gharchive.m/2015-01-01-0.json'}""")
load_json_data.call(table_name, """${getS3Url() + '/regression/gharchive.m/2015-01-01-1.json'}""")
load_json_data.call(table_name, """${getS3Url() + '/regression/gharchive.m/2015-01-01-2.json'}""")
Expand Down Expand Up @@ -112,5 +113,7 @@ suite("double_write_schema_change_with_variant") {

// createMV("create materialized view xxx as select k, sum(k) from ${table_name} group by k order by k;")
// qt_sql "select v['type'], v['id'], v['created_at'] from ${table_name} where cast(v['id'] as bigint) != 25061216922 order by k, cast(v['id'] as bigint) limit 10"
// restore configs
set_be_config.call("memory_limitation_per_thread_for_schema_change_bytes", "2147483648")
set_be_config.call("write_buffer_size", "209715200")
}