Skip to content
Open
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
20 changes: 16 additions & 4 deletions be/src/cloud/pb_convert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,10 @@ TabletSchemaCloudPB doris_tablet_schema_to_cloud(TabletSchemaPB&& in) {
void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out, const TabletSchemaPB& in) {
// ATTN: please keep the set order aligned with the definition of proto.
out->set_keys_type(in.keys_type());
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
// Older schemas omit this field; do not turn absence into an explicit false.
if (in.has_variant_escape_dots_in_keys()) {
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
}
out->mutable_column()->CopyFrom(in.column());
out->set_num_short_key_columns(in.num_short_key_columns());
out->set_num_rows_per_row_block(in.num_rows_per_row_block());
Expand Down Expand Up @@ -460,7 +463,10 @@ void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out, const TabletSchemaPB

void doris_tablet_schema_to_cloud(TabletSchemaCloudPB* out, TabletSchemaPB&& in) {
out->set_keys_type(in.keys_type());
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
// Older schemas omit this field; do not turn absence into an explicit false.
if (in.has_variant_escape_dots_in_keys()) {
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
}
out->mutable_column()->Swap(in.mutable_column());
out->set_num_short_key_columns(in.num_short_key_columns());
out->set_num_rows_per_row_block(in.num_rows_per_row_block());
Expand Down Expand Up @@ -520,7 +526,10 @@ TabletSchemaPB cloud_tablet_schema_to_doris(TabletSchemaCloudPB&& in) {
void cloud_tablet_schema_to_doris(TabletSchemaPB* out, const TabletSchemaCloudPB& in) {
// ATTN: please keep the set order aligned with the definition of proto.
out->set_keys_type(in.keys_type());
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
// Older schemas omit this field; do not turn absence into an explicit false.
if (in.has_variant_escape_dots_in_keys()) {
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
}
out->mutable_column()->CopyFrom(in.column());
out->set_num_short_key_columns(in.num_short_key_columns());
out->set_num_rows_per_row_block(in.num_rows_per_row_block());
Expand Down Expand Up @@ -568,7 +577,10 @@ void cloud_tablet_schema_to_doris(TabletSchemaPB* out, const TabletSchemaCloudPB
void cloud_tablet_schema_to_doris(TabletSchemaPB* out, TabletSchemaCloudPB&& in) {
// ATTN: please keep the set order aligned with the definition of proto.
out->set_keys_type(in.keys_type());
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
// Older schemas omit this field; do not turn absence into an explicit false.
if (in.has_variant_escape_dots_in_keys()) {
out->set_variant_escape_dots_in_keys(in.variant_escape_dots_in_keys());
}
out->mutable_column()->Swap(in.mutable_column());
out->set_num_short_key_columns(in.num_short_key_columns());
out->set_num_rows_per_row_block(in.num_rows_per_row_block());
Expand Down
31 changes: 26 additions & 5 deletions be/test/storage/pb_convert_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,16 +467,37 @@ TEST(PBConvertTest, VariantEscapeTablePolicyRoundTrip) {
TabletSchemaPB schema;
schema.set_variant_escape_dots_in_keys(escaped);
const auto cloud = doris_tablet_schema_to_cloud(schema);
EXPECT_TRUE(cloud.has_variant_escape_dots_in_keys());
EXPECT_EQ(cloud.variant_escape_dots_in_keys(), escaped);
EXPECT_EQ(cloud_tablet_schema_to_doris(cloud).variant_escape_dots_in_keys(), escaped);
const auto restored_schema = cloud_tablet_schema_to_doris(cloud);
EXPECT_TRUE(restored_schema.has_variant_escape_dots_in_keys());
EXPECT_EQ(restored_schema.variant_escape_dots_in_keys(), escaped);
auto moving_schema = schema;
auto moving_cloud = doris_tablet_schema_to_cloud(std::move(moving_schema));
EXPECT_TRUE(moving_cloud.has_variant_escape_dots_in_keys());
EXPECT_EQ(moving_cloud.variant_escape_dots_in_keys(), escaped);
EXPECT_EQ(
cloud_tablet_schema_to_doris(std::move(moving_cloud)).variant_escape_dots_in_keys(),
escaped);
const auto moved_schema = cloud_tablet_schema_to_doris(std::move(moving_cloud));
EXPECT_TRUE(moved_schema.has_variant_escape_dots_in_keys());
EXPECT_EQ(moved_schema.variant_escape_dots_in_keys(), escaped);
}
EXPECT_FALSE(cloud_tablet_schema_to_doris(TabletSchemaCloudPB()).variant_escape_dots_in_keys());
}

TEST(PBConvertTest, VariantEscapeTablePolicyAbsent) {
const TabletSchemaPB schema;
const auto cloud = doris_tablet_schema_to_cloud(schema);
EXPECT_FALSE(cloud.has_variant_escape_dots_in_keys());
EXPECT_FALSE(cloud.variant_escape_dots_in_keys());
const TabletSchemaCloudPB cloud_schema;
const auto restored_schema = cloud_tablet_schema_to_doris(cloud_schema);
EXPECT_FALSE(restored_schema.has_variant_escape_dots_in_keys());
EXPECT_FALSE(restored_schema.variant_escape_dots_in_keys());

const auto moving_cloud = doris_tablet_schema_to_cloud(TabletSchemaPB());
EXPECT_FALSE(moving_cloud.has_variant_escape_dots_in_keys());
EXPECT_FALSE(moving_cloud.variant_escape_dots_in_keys());
const auto moving_schema = cloud_tablet_schema_to_doris(TabletSchemaCloudPB());
EXPECT_FALSE(moving_schema.has_variant_escape_dots_in_keys());
EXPECT_FALSE(moving_schema.variant_escape_dots_in_keys());
}

} // namespace doris
Expand Down
Loading