100100
101101namespace doris ::variant_util {
102102
103- void inherit_variant_path_encoding (const TabletSchema& schema, TabletColumn& column) {
104- if (column.is_variant_type () || column.is_extracted_column ()) {
105- column.set_variant_escape_dots_in_keys (schema.variant_escape_dots_in_keys ());
106- }
107- }
108-
109103namespace {
110104
111105PathInData make_full_subcolumn_path (const TabletColumnPtr& parent_column, std::string_view path) {
@@ -138,7 +132,6 @@ void append_empty_key_subcolumn_from_stats(VariantCompactionPaths& paths_set_inf
138132 subcolumn.set_aggregation_method (parent_column->aggregation ());
139133 subcolumn.set_variant_max_subcolumns_count (parent_column->variant_max_subcolumns_count ());
140134 subcolumn.set_variant_enable_doc_mode (parent_column->variant_enable_doc_mode ());
141- subcolumn.set_variant_escape_dots_in_keys (parent_column->variant_escape_dots_in_keys ());
142135 subcolumn.set_is_nullable (true );
143136 output_schema->append_column (subcolumn);
144137}
@@ -546,7 +539,6 @@ void inherit_column_attributes(const TabletColumn& source, TabletColumn& target,
546539 return ;
547540 }
548541 target.set_aggregation_method (source.aggregation ());
549- target.set_variant_escape_dots_in_keys (source.variant_escape_dots_in_keys ());
550542
551543 // 1. bloom filter
552544 if (is_bf_supported_by_fe_for_variant_subcolumn (target.type ())) {
@@ -565,12 +557,14 @@ void inherit_column_attributes(const TabletColumn& source, TabletColumn& target,
565557 if (target.is_variant_type ()) {
566558 for (auto & index : source_indexes) {
567559 auto index_info = std::make_shared<TabletIndex>(*index);
568- index_info->set_escaped_escaped_index_suffix_path (target.path_info_ptr ()->get_path (),
569- source.variant_escape_dots_in_keys ());
560+ index_info->set_escaped_escaped_index_suffix_path (
561+ target.path_info_ptr ()->get_path (),
562+ (*target_schema)->variant_escape_dots_in_keys ());
570563 indexes_to_add.emplace_back (std::move (index_info));
571564 }
572565 } else {
573- inherit_index (source_indexes, indexes_to_add, target);
566+ inherit_index (source_indexes, indexes_to_add, target,
567+ (*target_schema)->variant_escape_dots_in_keys ());
574568 }
575569 auto target_indexes = (*target_schema)
576570 ->inverted_indexs (target.parent_unique_id (),
@@ -679,15 +673,13 @@ MutableColumnPtr create_variant_binary_column() {
679673 ColumnArray::ColumnOffsets::create ());
680674}
681675
682- // Sparse/doc compaction read columns use the same path codec as their owning root.
683676TabletColumn create_sparse_column (const TabletColumn& variant) {
684677 TabletColumn res;
685678 res.set_name (variant.name_lower_case () + " ." + SPARSE_COLUMN_PATH );
686679 res.set_type (FieldType::OLAP_FIELD_TYPE_MAP );
687680 res.set_aggregation_method (variant.aggregation ());
688681 res.set_path_info (PathInData {variant.name_lower_case () + " ." + SPARSE_COLUMN_PATH });
689682 res.set_parent_unique_id (variant.unique_id ());
690- res.set_variant_escape_dots_in_keys (variant.variant_escape_dots_in_keys ());
691683 res.set_default_value (" {}" );
692684 TabletColumn child_tcolumn;
693685 child_tcolumn.set_type (FieldType::OLAP_FIELD_TYPE_STRING );
@@ -704,7 +696,6 @@ TabletColumn create_sparse_shard_column(const TabletColumn& variant, int bucket_
704696 res.set_type (FieldType::OLAP_FIELD_TYPE_MAP );
705697 res.set_aggregation_method (variant.aggregation ());
706698 res.set_parent_unique_id (variant.unique_id ());
707- res.set_variant_escape_dots_in_keys (variant.variant_escape_dots_in_keys ());
708699 res.set_default_value (" {}" );
709700 PathInData path (name);
710701 res.set_path_info (path);
@@ -723,7 +714,6 @@ TabletColumn create_doc_value_column(const TabletColumn& variant, int bucket_ind
723714 res.set_type (FieldType::OLAP_FIELD_TYPE_MAP );
724715 res.set_aggregation_method (variant.aggregation ());
725716 res.set_parent_unique_id (variant.unique_id ());
726- res.set_variant_escape_dots_in_keys (variant.variant_escape_dots_in_keys ());
727717 res.set_default_value (" {}" );
728718 res.set_path_info (PathInData {name});
729719
@@ -742,7 +732,6 @@ TabletColumn create_doc_value_compaction_column(const TabletColumn& variant, int
742732 res.set_type (FieldType::OLAP_FIELD_TYPE_VARIANT );
743733 res.set_aggregation_method (variant.aggregation ());
744734 res.set_parent_unique_id (variant.unique_id ());
745- res.set_variant_escape_dots_in_keys (variant.variant_escape_dots_in_keys ());
746735 res.set_path_info (PathInData {name});
747736 res.set_is_nullable (true );
748737 res.set_variant_enable_doc_mode (true );
@@ -1058,7 +1047,8 @@ Status VariantCompactionUtil::get_compaction_nested_columns(
10581047 .path_info = full_path});
10591048 inherit_column_attributes (*parent_column, nested_column);
10601049 TabletIndexes sub_column_indexes;
1061- inherit_index (parent_indexes, sub_column_indexes, nested_column);
1050+ inherit_index (parent_indexes, sub_column_indexes, nested_column,
1051+ output_schema->variant_escape_dots_in_keys ());
10621052 paths_set_info.subcolumn_indexes .emplace (path.get_path (), std::move (sub_column_indexes));
10631053 output_schema->append_column (nested_column);
10641054 VLOG_DEBUG << " append nested column " << path.get_path ();
@@ -1107,7 +1097,6 @@ void VariantCompactionUtil::get_compaction_subcolumns_from_subpaths(
11071097 subcolumn.set_variant_max_subcolumns_count (
11081098 parent_column->variant_max_subcolumns_count ());
11091099 subcolumn.set_variant_enable_doc_mode (parent_column->variant_enable_doc_mode ());
1110- subcolumn.set_variant_escape_dots_in_keys (parent_column->variant_escape_dots_in_keys ());
11111100 subcolumn.set_is_nullable (true );
11121101 output_schema->append_column (subcolumn);
11131102 VLOG_DEBUG << " append sub column " << subpath << " data type "
@@ -1124,7 +1113,8 @@ void VariantCompactionUtil::get_compaction_subcolumns_from_subpaths(
11241113 .path_info = column_path});
11251114 inherit_column_attributes (*parent_column, sub_column);
11261115 TabletIndexes sub_column_indexes;
1127- inherit_index (parent_indexes, sub_column_indexes, sub_column);
1116+ inherit_index (parent_indexes, sub_column_indexes, sub_column,
1117+ target->variant_escape_dots_in_keys ());
11281118 paths_set_info.subcolumn_indexes .emplace (subpath, std::move (sub_column_indexes));
11291119 output_schema->append_column (sub_column);
11301120 VLOG_DEBUG << " append sub column " << subpath << " data type " << data_type->get_name ();
@@ -1154,7 +1144,8 @@ void VariantCompactionUtil::get_compaction_subcolumns_from_data_types(
11541144 .path_info = column_path});
11551145 inherit_column_attributes (*parent_column, sub_column);
11561146 TabletIndexes sub_column_indexes;
1157- inherit_index (parent_indexes, sub_column_indexes, sub_column);
1147+ inherit_index (parent_indexes, sub_column_indexes, sub_column,
1148+ target->variant_escape_dots_in_keys ());
11581149 paths_set_info.sub_path_set .emplace (path.get_path ());
11591150 paths_set_info.subcolumn_indexes .emplace (path.get_path (), std::move (sub_column_indexes));
11601151 output_schema->append_column (sub_column);
@@ -1450,8 +1441,6 @@ bool generate_sub_column_info(const TabletSchema& schema, int32_t col_unique_id,
14501441 to_column->set_path_info (
14511442 PathInData (parent_column.name_lower_case () + " ." + path, is_typed));
14521443 to_column->set_aggregation_method (parent_column.aggregation ());
1453- to_column->set_variant_escape_dots_in_keys (
1454- parent_column.variant_escape_dots_in_keys ());
14551444 to_column->set_is_nullable (true );
14561445 to_column->set_parent_unique_id (parent_column.unique_id ());
14571446 if (from_column.is_decimal ()) {
@@ -1474,14 +1463,15 @@ bool generate_sub_column_info(const TabletSchema& schema, int32_t col_unique_id,
14741463 auto index_ptr = std::make_shared<TabletIndex>(*index);
14751464 index_ptr->set_escaped_escaped_index_suffix_path (
14761465 sub_column_info->column .path_info_ptr ()->get_path (),
1477- parent_column .variant_escape_dots_in_keys ());
1466+ schema .variant_escape_dots_in_keys ());
14781467 sub_column_info->indexes .emplace_back (std::move (index_ptr));
14791468 }
14801469 }
14811470 // 2. find parent column's index
14821471 else if (const auto parent_index = schema.inverted_indexs (col_unique_id);
14831472 !parent_index.empty ()) {
1484- inherit_index (parent_index, sub_column_info->indexes , sub_column_info->column );
1473+ inherit_index (parent_index, sub_column_info->indexes , sub_column_info->column ,
1474+ schema.variant_escape_dots_in_keys ());
14851475 } else {
14861476 sub_column_info->indexes .clear ();
14871477 }
@@ -1626,7 +1616,8 @@ bool inherit_index(const std::vector<const TabletIndex*>& parent_indexes,
16261616}
16271617
16281618bool inherit_index (const std::vector<const TabletIndex*>& parent_indexes,
1629- TabletIndexes& subcolumns_indexes, const TabletColumn& column) {
1619+ TabletIndexes& subcolumns_indexes, const TabletColumn& column,
1620+ bool escape_dots) {
16301621 if (!column.is_extracted_column ()) {
16311622 return false ;
16321623 }
@@ -1645,12 +1636,10 @@ bool inherit_index(const std::vector<const TabletIndex*>& parent_indexes,
16451636 return false ;
16461637 }
16471638 return inherit_index (parent_indexes, subcolumns_indexes, nested->type (),
1648- column.path_info_ptr ()->get_path (), true ,
1649- column.variant_escape_dots_in_keys ());
1639+ column.path_info_ptr ()->get_path (), true , escape_dots);
16501640 }
16511641 return inherit_index (parent_indexes, subcolumns_indexes, column.type (),
1652- column.path_info_ptr ()->get_path (), false ,
1653- column.variant_escape_dots_in_keys ());
1642+ column.path_info_ptr ()->get_path (), false , escape_dots);
16541643}
16551644
16561645bool inherit_index (const std::vector<const TabletIndex*>& parent_indexes,
0 commit comments