This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 93a1647c1b3 [chore](SessionVariable) set rename
`global_variant_max_subcolumns_count` to `default_variant_max_subcolumns_count`
and set default value to 0 (#54675)
93a1647c1b3 is described below
commit 93a1647c1b385de02c2c2ceaa227eebd5f738a1a
Author: lihangyu <[email protected]>
AuthorDate: Thu Aug 14 13:47:00 2025 +0800
[chore](SessionVariable) set rename `global_variant_max_subcolumns_count`
to `default_variant_max_subcolumns_count` and set default value to 0 (#54675)
---
.../java/org/apache/doris/analysis/TypeDef.java | 4 +--
.../doris/nereids/parser/LogicalPlanBuilder.java | 4 +--
.../java/org/apache/doris/qe/SessionVariable.java | 38 +++++++++++-----------
.../suites/function_p0/test_array_agg.groovy | 2 +-
...sted_index_file_http_action_with_variant.groovy | 2 +-
regression-test/suites/variant_p0/desc.groovy | 4 +--
.../variant_p0/predefine/insert_into_select.groovy | 2 +-
.../suites/variant_p0/predefine/load.groovy | 2 +-
.../suites/variant_p0/predefine/multi_var.groovy | 2 +-
.../predefine/test_custom_analyzer.groovy | 4 +--
.../predefine/test_multi_index_file.groovy | 2 +-
.../predefine/test_multi_index_nonCurrent.groovy | 4 +--
.../test_prdefine_insert_into_select.groovy | 2 +-
...test_prdefine_typed_column_sparse_column.groovy | 2 +-
.../variant_p0/predefine/test_predefine_ddl.groovy | 4 +--
.../predefine/test_predefine_pattern.groovy | 2 +-
.../predefine/test_predefine_schema_change.groovy | 2 +-
.../predefine/test_predefine_type_index.groovy | 2 +-
.../test_predefine_type_multi_index.groovy | 2 +-
.../test_types_with_indexes_profile.groovy | 2 +-
.../predefine/test_variant_is_null_expr.groovy | 4 +--
.../test_add_multi_var_mulit_indexes.groovy | 4 +--
.../suites/variant_p0/test_sub_path_pruning.groovy | 4 +--
.../test_variant_float_double_index.groovy | 2 +-
.../suites/variant_p0/with_index/var_index.groovy | 2 +-
.../suites/variant_p1/predefine/load.groovy | 2 +-
26 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TypeDef.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/TypeDef.java
index f77fc72f44e..0fe0e0d38ca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TypeDef.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TypeDef.java
@@ -341,9 +341,9 @@ public class TypeDef implements ParseNode {
// Supported properties: variant_max_subcolumns_count,
variant_enable_typed_paths_to_sparse
VariantType variantType = (VariantType) scalarType;
int variantMaxSubcolumnsCount = ConnectContext.get() == null ?
0 :
-
ConnectContext.get().getSessionVariable().getGlobalVariantMaxSubcolumnsCount();
+
ConnectContext.get().getSessionVariable().getDefaultVariantMaxSubcolumnsCount();
boolean enableTypedPathsToSparse = ConnectContext.get() ==
null ? false :
-
ConnectContext.get().getSessionVariable().getGlobalEnableTypedPathsToSparse();
+
ConnectContext.get().getSessionVariable().getDefaultEnableTypedPathsToSparse();
try {
variantMaxSubcolumnsCount = PropertyAnalyzer
.analyzeVariantMaxSubcolumnsCount(variantType.getProperties(),
variantMaxSubcolumnsCount);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index c5761497b65..8347c1f5368 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -3591,9 +3591,9 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
}
int variantMaxSubcolumnsCount = ConnectContext.get() == null ? 0 :
-
ConnectContext.get().getSessionVariable().getGlobalVariantMaxSubcolumnsCount();
+
ConnectContext.get().getSessionVariable().getDefaultVariantMaxSubcolumnsCount();
boolean enableTypedPathsToSparse = ConnectContext.get() == null ?
false :
-
ConnectContext.get().getSessionVariable().getGlobalEnableTypedPathsToSparse();
+
ConnectContext.get().getSessionVariable().getDefaultEnableTypedPathsToSparse();
try {
variantMaxSubcolumnsCount = PropertyAnalyzer
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 340faed0e7c..89ec74518f6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -729,10 +729,10 @@ public class SessionVariable implements Serializable,
Writable {
public static final String ADAPTIVE_PIPELINE_TASK_SERIAL_READ_ON_LIMIT =
"adaptive_pipeline_task_serial_read_on_limit";
- public static final String GLOBAL_VARIANT_SUBCOLUMNS_COUNT =
"global_variant_max_subcolumns_count";
+ public static final String DEFAULT_VARIANT_MAX_SUBCOLUMNS_COUNT =
"default_variant_max_subcolumns_count";
- public static final String GLOBAL_VARIANT_ENABLE_TYPED_PATHS_TO_SPARSE =
-
"global_variant_enable_typed_paths_to_sparse";
+ public static final String DEFAULT_VARIANT_ENABLE_TYPED_PATHS_TO_SPARSE =
+
"default_variant_enable_typed_paths_to_sparse";
public static final String ENABLE_TEXT_VALIDATE_UTF8 =
"enable_text_validate_utf8";
@@ -1683,7 +1683,7 @@ public class SessionVariable implements Serializable,
Writable {
needForward = true,
fuzzy = true,
description = {
- "允许使用一阶段聚合来执行带有order的group_concat函数",
+ "允许使用一阶段聚合来执行带有 order 的 group_concat 函数",
"Enable to use one stage aggregation to execute the
group_concat function with order"
}
)
@@ -1917,7 +1917,7 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(
name = CHECK_ORC_INIT_SARGS_SUCCESS,
- description = {"是否检查orc init sargs是否成功。默认为 false。",
+ description = {"是否检查 orc init sargs 是否成功。默认为 false。",
"Whether to check whether orc init sargs is successful. "
+ "The default value is false."},
needForward = true)
@@ -2142,7 +2142,7 @@ public class SessionVariable implements Serializable,
Writable {
public long partitionSampleRowCount = 3_000_000_000L;
@VariableMgr.VarAttr(name = FETCH_HIVE_ROW_COUNT_SYNC,
- description = {"同步获取Hive外表行数", "Fetch Hive external table row
count synchronously"})
+ description = {"同步获取 Hive 外表行数", "Fetch Hive external table row
count synchronously"})
public boolean fetchHiveRowCountSync = true;
@VariableMgr.VarAttr(name = ENABLE_MATERIALIZED_VIEW_REWRITE, needForward
= true,
@@ -2308,7 +2308,7 @@ public class SessionVariable implements Serializable,
Writable {
public String detailShapePlanNodes = "";
@VariableMgr.VarAttr(name = ENABLE_EXPLAIN_NONE, needForward = true,
description = {
- "执行explain命令，但不打印explain结果",
+ "执行 explain 命令，但不打印 explain 结果",
"execute explain command and return nothing"
})
public boolean enableExplainNone = false;
@@ -2535,12 +2535,12 @@ public class SessionVariable implements Serializable,
Writable {
public boolean newIsIpAddressInRange = true;
@VariableMgr.VarAttr(
- name = GLOBAL_VARIANT_SUBCOLUMNS_COUNT,
+ name = DEFAULT_VARIANT_MAX_SUBCOLUMNS_COUNT,
needForward = true,
- checker = "checkGlobalVariantMaxSubcolumnsCount",
+ checker = "checkDefaultVariantMaxSubcolumnsCount",
fuzzy = true
)
- public int globalVariantMaxSubcolumnsCount = 2048;
+ public int defaultVariantMaxSubcolumnsCount = 0;
@VariableMgr.VarAttr(name = ENABLE_SQL_CONVERTOR_FEATURES, needForward =
true,
checker = "checkSqlConvertorFeatures",
@@ -2583,11 +2583,11 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(
- name = GLOBAL_VARIANT_ENABLE_TYPED_PATHS_TO_SPARSE,
+ name = DEFAULT_VARIANT_ENABLE_TYPED_PATHS_TO_SPARSE,
needForward = true,
fuzzy = true
)
- public boolean globalEnableTypedPathsToSparse = false;
+ public boolean defaultEnableTypedPathsToSparse = false;
public void setEnableEsParallelScroll(boolean enableESParallelScroll) {
this.enableESParallelScroll = enableESParallelScroll;
@@ -2636,8 +2636,8 @@ public class SessionVariable implements Serializable,
Writable {
this.partitionedHashJoinRowsThreshold = random.nextBoolean() ? 8 :
1048576;
this.partitionedHashAggRowsThreshold = random.nextBoolean() ? 8 :
1048576;
this.enableShareHashTableForBroadcastJoin = random.nextBoolean();
- this.globalVariantMaxSubcolumnsCount = random.nextInt(10);
- this.globalEnableTypedPathsToSparse = random.nextBoolean();
+ this.defaultVariantMaxSubcolumnsCount = random.nextInt(10);
+ this.defaultEnableTypedPathsToSparse = random.nextBoolean();
int randomInt = random.nextInt(4);
if (randomInt % 2 == 0) {
this.rewriteOrToInPredicateThreshold = 100000;
@@ -3993,7 +3993,7 @@ public class SessionVariable implements Serializable,
Writable {
}
}
- public void checkGlobalVariantMaxSubcolumnsCount(String
variantMaxSubcolumnsCount) {
+ public void checkDefaultVariantMaxSubcolumnsCount(String
variantMaxSubcolumnsCount) {
int value = Integer.valueOf(variantMaxSubcolumnsCount);
if (value < 0 || value > 10000) {
throw new UnsupportedOperationException(
@@ -4971,8 +4971,8 @@ public class SessionVariable implements Serializable,
Writable {
return enableExternalTableBatchMode;
}
- public int getGlobalVariantMaxSubcolumnsCount() {
- return globalVariantMaxSubcolumnsCount;
+ public int getDefaultVariantMaxSubcolumnsCount() {
+ return defaultVariantMaxSubcolumnsCount;
}
public boolean isEnableAddIndexForNewData() {
@@ -4983,8 +4983,8 @@ public class SessionVariable implements Serializable,
Writable {
this.enableAddIndexForNewData = enableAddIndexForNewData;
}
- public boolean getGlobalEnableTypedPathsToSparse() {
- return globalEnableTypedPathsToSparse;
+ public boolean getDefaultEnableTypedPathsToSparse() {
+ return defaultEnableTypedPathsToSparse;
}
}
diff --git a/regression-test/suites/function_p0/test_array_agg.groovy
b/regression-test/suites/function_p0/test_array_agg.groovy
index 43241084f3c..314743c715a 100644
--- a/regression-test/suites/function_p0/test_array_agg.groovy
+++ b/regression-test/suites/function_p0/test_array_agg.groovy
@@ -22,7 +22,7 @@ suite("test_array_agg", "p0") {
def count = new Random().nextInt(1) + 1
- sql """ set global_variant_max_subcolumns_count=${count};"""
+ sql """ set default_variant_max_subcolumns_count=${count};"""
sql """
drop table if exists ${tableName};
diff --git
a/regression-test/suites/inverted_index_p0/test_show_nested_index_file_http_action_with_variant.groovy
b/regression-test/suites/inverted_index_p0/test_show_nested_index_file_http_action_with_variant.groovy
index 8874297a956..5b3a89b7306 100644
---
a/regression-test/suites/inverted_index_p0/test_show_nested_index_file_http_action_with_variant.groovy
+++
b/regression-test/suites/inverted_index_p0/test_show_nested_index_file_http_action_with_variant.groovy
@@ -61,7 +61,7 @@ suite("test_show_nested_index_file_http_action_with_variant",
"nonConcurrent,p0"
set_be_config.call("memory_limitation_per_thread_for_schema_change_bytes",
"6294967296")
def run_test = { format ->
def tableName =
"test_show_nested_index_file_http_action_with_variant_" + format
- sql "set global_variant_max_subcolumns_count = 0"
+ sql "set default_variant_max_subcolumns_count = 0"
sql "DROP TABLE IF EXISTS ${tableName}"
setFeConfigTemporary([enable_inverted_index_v1_for_variant: true]) {
sql """
diff --git a/regression-test/suites/variant_p0/desc.groovy
b/regression-test/suites/variant_p0/desc.groovy
index dad5d3a192d..1b4ea4a944b 100644
--- a/regression-test/suites/variant_p0/desc.groovy
+++ b/regression-test/suites/variant_p0/desc.groovy
@@ -19,8 +19,8 @@ suite("regression_test_variant_desc", "p0"){
// if (isCloudMode()) {
// return
// }
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
- sql """ set global_variant_max_subcolumns_count = 0 """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_max_subcolumns_count = 0 """
def load_json_data = {table_name, file_name ->
// load the json data
diff --git
a/regression-test/suites/variant_p0/predefine/insert_into_select.groovy
b/regression-test/suites/variant_p0/predefine/insert_into_select.groovy
index 5e7ecd68abb..c8c86949dea 100644
--- a/regression-test/suites/variant_p0/predefine/insert_into_select.groovy
+++ b/regression-test/suites/variant_p0/predefine/insert_into_select.groovy
@@ -18,7 +18,7 @@
suite("regression_test_variant_predefine_insert_into_select", "variant_type"){
def table_name = "insert_into_select"
def max_subcolumns_count = new Random().nextInt(5) + 1
- sql "set global_variant_max_subcolumns_count = ${max_subcolumns_count}"
+ sql "set default_variant_max_subcolumns_count = ${max_subcolumns_count}"
sql "DROP TABLE IF EXISTS ${table_name}_var"
sql "DROP TABLE IF EXISTS ${table_name}_str"
sql """
diff --git a/regression-test/suites/variant_p0/predefine/load.groovy
b/regression-test/suites/variant_p0/predefine/load.groovy
index 696cf68b597..d9e379ec1ef 100644
--- a/regression-test/suites/variant_p0/predefine/load.groovy
+++ b/regression-test/suites/variant_p0/predefine/load.groovy
@@ -21,7 +21,7 @@ suite("regression_test_variant_predefine_schema", "p0"){
if (new Random().nextInt(100) < 50) {
count = "1000"
}
- sql """ set global_variant_max_subcolumns_count = ${count} """
+ sql """ set default_variant_max_subcolumns_count = ${count} """
sql """
CREATE TABLE `test_predefine` (
`id` bigint NOT NULL,
diff --git a/regression-test/suites/variant_p0/predefine/multi_var.groovy
b/regression-test/suites/variant_p0/predefine/multi_var.groovy
index 18396158b76..35af1df23e8 100644
--- a/regression-test/suites/variant_p0/predefine/multi_var.groovy
+++ b/regression-test/suites/variant_p0/predefine/multi_var.groovy
@@ -19,7 +19,7 @@ suite("regression_test_variant_predefine_multi_var",
"variant_type"){
int max_subcolumns_count = Math.floor(Math.random() * 7) + 1
def table_name = "multi_variants"
boolean enable_typed_paths_to_sparse = new Random().nextBoolean()
- sql "set global_variant_enable_typed_paths_to_sparse =
${enable_typed_paths_to_sparse}"
+ sql "set default_variant_enable_typed_paths_to_sparse =
${enable_typed_paths_to_sparse}"
sql "DROP TABLE IF EXISTS ${table_name}"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
diff --git
a/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
b/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
index 242936d02bd..3acff0a7541 100644
--- a/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
@@ -21,9 +21,9 @@ suite("test_variant_custom_analyzer", "p0") {
def indexTbName1 = "test_custom_analyzer_1"
def indexTbName2 = "test_custom_analyzer_2"
def indexTbName3 = "test_custom_analyzer_3"
- sql "set global_variant_max_subcolumns_count = 100"
+ sql "set default_variant_max_subcolumns_count = 100"
sql """ set enable_match_without_inverted_index = false """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql """
CREATE INVERTED INDEX TOKENIZER IF NOT EXISTS
edge_ngram_phone_number_tokenizer
diff --git
a/regression-test/suites/variant_p0/predefine/test_multi_index_file.groovy
b/regression-test/suites/variant_p0/predefine/test_multi_index_file.groovy
index acdee10585d..9e1b7344202 100644
--- a/regression-test/suites/variant_p0/predefine/test_multi_index_file.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_multi_index_file.groovy
@@ -19,7 +19,7 @@ suite("test_variant_multi_index_file", "p0, nonConcurrent"){
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql "set global_variant_max_subcolumns_count = 100"
+ sql "set default_variant_max_subcolumns_count = 100"
def tableName = "test_variant_multi_index_nonCurrent"
sql "DROP TABLE IF EXISTS ${tableName}"
diff --git
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
index 17308368e32..8b59f3dc0e5 100644
---
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
@@ -19,7 +19,7 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def queryAndCheck = { String sqlQuery, int expectedFilteredRows = -1,
boolean checkFilterUsed = true ->
def checkpoints_name = "segment_iterator.inverted_index.filtered_rows"
@@ -217,7 +217,7 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
tableName = "test_variant_predefine_types_with_multi_indexes"
sql "DROP TABLE IF EXISTS ${tableName}"
def max_subcolumns_count = new Random().nextInt(10) + 1
- sql "set global_variant_max_subcolumns_count = ${max_subcolumns_count}"
+ sql "set default_variant_max_subcolumns_count = ${max_subcolumns_count}"
sql """
CREATE TABLE ${tableName} (
`id` bigint NOT NULL AUTO_INCREMENT,
diff --git
a/regression-test/suites/variant_p0/predefine/test_prdefine_insert_into_select.groovy
b/regression-test/suites/variant_p0/predefine/test_prdefine_insert_into_select.groovy
index 68a44a9034e..4ed176a7916 100644
---
a/regression-test/suites/variant_p0/predefine/test_prdefine_insert_into_select.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_prdefine_insert_into_select.groovy
@@ -17,7 +17,7 @@
suite("test_predefine_insert_into_select", "p0"){
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql "DROP TABLE IF EXISTS fromTable"
sql """CREATE TABLE fromTable (
diff --git
a/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
b/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
index 211e4c759b3..e1d70d86a75 100644
---
a/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
@@ -18,7 +18,7 @@
suite("test_predefine_typed_sparse", "p0"){
def tableName = "test_predefine_typed_sparse"
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql "DROP TABLE IF EXISTS ${tableName}"
sql """CREATE TABLE ${tableName} (
`id` bigint NULL,
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_ddl.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_ddl.groovy
index bc78ce7fb76..a88091dff70 100644
--- a/regression-test/suites/variant_p0/predefine/test_predefine_ddl.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_predefine_ddl.groovy
@@ -328,8 +328,8 @@ suite("test_predefine_ddl", "p0"){
}
sql "DROP TABLE IF EXISTS test_ddl_table"
- sql "set global_variant_max_subcolumns_count = 10"
- sql "set global_variant_enable_typed_paths_to_sparse = false"
+ sql "set default_variant_max_subcolumns_count = 10"
+ sql "set default_variant_enable_typed_paths_to_sparse = false"
sql """CREATE TABLE test_ddl_table (
`id` bigint NULL,
`var` variant NULL
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
index bf2edc359ea..b39fa53bf2c 100644
--- a/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
@@ -19,7 +19,7 @@ suite("test_variant_predefine_base", "p0"){
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def count = new Random().nextInt(5) + 1
def tableName = "base_match_name_variant_test"
sql "DROP TABLE IF EXISTS ${tableName}"
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_schema_change.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_schema_change.groovy
index 8b93f12ab71..88bc33e7000 100644
---
a/regression-test/suites/variant_p0/predefine/test_predefine_schema_change.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_predefine_schema_change.groovy
@@ -17,7 +17,7 @@
suite("test_predefine_schema_change", "p0"){
def tableName = "test_predefine_schema_change"
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql "DROP TABLE IF EXISTS ${tableName}"
sql """CREATE TABLE ${tableName} (
`id` bigint NULL,
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
index d9ab4a89468..67944ba1d27 100644
---
a/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
@@ -19,7 +19,7 @@ suite("test_variant_predefine_index_type", "p0"){
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def tableName = "test_variant_predefine_index_type"
sql "DROP TABLE IF EXISTS ${tableName}"
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
index 525951b6e5c..cf066d5a8ef 100644
---
a/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
@@ -19,7 +19,7 @@ suite("test_variant_predefine_type_multi_index", "p0"){
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def tableName = "test_variant_predefine_type_multi_index"
sql "DROP TABLE IF EXISTS ${tableName}"
diff --git
a/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
b/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
index 31e9d2acc71..2ecca0dcb9a 100644
---
a/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
@@ -18,7 +18,7 @@ suite("test_variant_predefine_types_with_indexes_profile",
"p0,nonConcurrent"){
sql """ set describe_extend_variant_column = true """
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def load_json_data = {table_name, file_name ->
// load the json data
diff --git
a/regression-test/suites/variant_p0/predefine/test_variant_is_null_expr.groovy
b/regression-test/suites/variant_p0/predefine/test_variant_is_null_expr.groovy
index d60d71c1662..1450b489c19 100644
---
a/regression-test/suites/variant_p0/predefine/test_variant_is_null_expr.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_variant_is_null_expr.groovy
@@ -20,10 +20,10 @@ suite("test_variant_is_null_expr", "p0, nonConcurrent") {
// define a sql table
def testTable = "test_variant_is_null_expr"
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql """ DROP TABLE IF EXISTS ${testTable} """
- sql "set global_variant_max_subcolumns_count = 100"
+ sql "set default_variant_max_subcolumns_count = 100"
sql """
CREATE TABLE ${testTable} (
`k` int(11) NULL COMMENT "",
diff --git
a/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
b/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
index 3d01fb5f914..dc452e67bc5 100644
---
a/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
@@ -39,8 +39,8 @@ suite("regression_test_variant_add_multi_var_mulit_indexes",
"variant_type"){
}
def table_name = "variant_add_multi_var_mulit_indexes"
int count = new Random().nextInt(10) + 3
- sql "set global_variant_max_subcolumns_count = ${count}"
- sql "set global_variant_enable_typed_paths_to_sparse = false"
+ sql "set default_variant_max_subcolumns_count = ${count}"
+ sql "set default_variant_enable_typed_paths_to_sparse = false"
sql "DROP TABLE IF EXISTS ${table_name}"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
diff --git a/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
b/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
index 57f778e9603..d1d4f09d04b 100644
--- a/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
+++ b/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
@@ -17,8 +17,8 @@
suite("variant_sub_path_pruning", "variant_type"){
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
- sql """ set global_variant_max_subcolumns_count = 0 """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_max_subcolumns_count = 0 """
sql "DROP TABLE IF EXISTS pruning_test"
diff --git
a/regression-test/suites/variant_p0/test_variant_float_double_index.groovy
b/regression-test/suites/variant_p0/test_variant_float_double_index.groovy
index 070af69cb79..22e943f463d 100644
--- a/regression-test/suites/variant_p0/test_variant_float_double_index.groovy
+++ b/regression-test/suites/variant_p0/test_variant_float_double_index.groovy
@@ -23,7 +23,7 @@ suite("test_variant_float_double_index", "p0, nonConcurrent"){
sql """ set enable_match_without_inverted_index = false """
sql """ set enable_common_expr_pushdown = true """
sql """ set inverted_index_skip_threshold = 0 """
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def queryAndCheck = { String sqlQuery, int expectedFilteredRows = -1,
boolean checkFilterUsed = true ->
def checkpoints_name = "segment_iterator.inverted_index.filtered_rows"
diff --git a/regression-test/suites/variant_p0/with_index/var_index.groovy
b/regression-test/suites/variant_p0/with_index/var_index.groovy
index 9beff3132b4..f57bd6915be 100644
--- a/regression-test/suites/variant_p0/with_index/var_index.groovy
+++ b/regression-test/suites/variant_p0/with_index/var_index.groovy
@@ -17,7 +17,7 @@
suite("regression_test_variant_var_index", "p0, nonConcurrent"){
def table_name = "var_index"
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
sql "DROP TABLE IF EXISTS var_index"
sql """
CREATE TABLE IF NOT EXISTS var_index (
diff --git a/regression-test/suites/variant_p1/predefine/load.groovy
b/regression-test/suites/variant_p1/predefine/load.groovy
index 56e25bac9cc..99b0f8bfdb4 100644
--- a/regression-test/suites/variant_p1/predefine/load.groovy
+++ b/regression-test/suites/variant_p1/predefine/load.groovy
@@ -19,7 +19,7 @@ import org.codehaus.groovy.runtime.IOGroovyMethods
suite("test_predefine_type_multi_index", "p1"){
- sql """ set global_variant_enable_typed_paths_to_sparse = false """
+ sql """ set default_variant_enable_typed_paths_to_sparse = false """
def load_json_data = {table_name, file_name ->
// load the json data
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
