This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new 6774f7a556d branch-4.2: [fix](cloud) Preserve VARIANT escape policy
presence in protobuf conversions (#70755)
6774f7a556d is described below
commit 6774f7a556da49e3debea8b33470a28dd496656f
Author: lihangyu <[email protected]>
AuthorDate: Fri Nov 20 11:27:22 2026 +0800
branch-4.2: [fix](cloud) Preserve VARIANT escape policy presence in
protobuf conversions (#70755)
cherry-pick #70622
Conflicts in be/src/cloud/pb_convert.cpp were resolved by guarding the
existing branch-4.2 setters with has_variant_escape_dots_in_keys() and
not bringing in unrelated master-only fields.
---
be/src/cloud/pb_convert.cpp | 20 ++++++++++++++++----
be/test/storage/pb_convert_test.cpp | 31 ++++++++++++++++++++++++++-----
2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/be/src/cloud/pb_convert.cpp b/be/src/cloud/pb_convert.cpp
index 6d601bc1a8d..a31fc85741e 100644
--- a/be/src/cloud/pb_convert.cpp
+++ b/be/src/cloud/pb_convert.cpp
@@ -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());
@@ -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());
@@ -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());
@@ -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());
diff --git a/be/test/storage/pb_convert_test.cpp
b/be/test/storage/pb_convert_test.cpp
index 72b09d98f7b..a2c8c4931e3 100644
--- a/be/test/storage/pb_convert_test.cpp
+++ b/be/test/storage/pb_convert_test.cpp
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]