This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6291f3fe057 [fix](variant) change session var for
disable_variant_flatten_nested to enable_variant_flatten_nested (#54413)
6291f3fe057 is described below
commit 6291f3fe057801db6b9ce21559a81bf3d28da73c
Author: amory <[email protected]>
AuthorDate: Thu Aug 7 15:22:11 2025 +0800
[fix](variant) change session var for disable_variant_flatten_nested to
enable_variant_flatten_nested (#54413)
---
.../org/apache/doris/datasource/InternalCatalog.java | 12 ++++++------
.../main/java/org/apache/doris/qe/SessionVariable.java | 18 +++++++++---------
regression-test/suites/variant_p0/delete_update.groovy | 4 ++--
regression-test/suites/variant_p0/nested.groovy | 2 +-
.../test_double_write_when_schema_change.groovy | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index c26932d9c58..82a1ca0c101 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -2597,15 +2597,15 @@ public class InternalCatalog implements
CatalogIf<Database> {
boolean variantEnableFlattenNested = false;
try {
variantEnableFlattenNested =
PropertyAnalyzer.analyzeVariantFlattenNested(properties);
- // only if session variable: disable_variant_flatten_nested =
false and
+ // only if session variable: enable_variant_flatten_nested = true
and
// table property: variant_enable_flatten_nested = true
// we can enable variant flatten nested otherwise throw error
- if (ctx != null &&
!ctx.getSessionVariable().getDisableVariantFlattenNested()
+ if (ctx != null &&
ctx.getSessionVariable().getEnableVariantFlattenNested()
&& variantEnableFlattenNested) {
olapTable.setVariantEnableFlattenNested(variantEnableFlattenNested);
} else if (variantEnableFlattenNested) {
throw new DdlException("If you want to enable variant flatten
nested, "
- + "please set session variable:
disable_variant_flatten_nested = false");
+ + "please set session variable:
enable_variant_flatten_nested = true");
} else {
// keep table property: variant_enable_flatten_nested = false
olapTable.setVariantEnableFlattenNested(false);
@@ -3485,15 +3485,15 @@ public class InternalCatalog implements
CatalogIf<Database> {
boolean variantEnableFlattenNested = false;
try {
variantEnableFlattenNested =
PropertyAnalyzer.analyzeVariantFlattenNested(properties);
- // only if session variable: disable_variant_flatten_nested =
false and
+ // only if session variable: enable_variant_flatten_nested = true
and
// table property: variant_enable_flatten_nested = true
// we can enable variant flatten nested otherwise throw error
- if (ctx != null &&
!ctx.getSessionVariable().getDisableVariantFlattenNested()
+ if (ctx != null &&
ctx.getSessionVariable().getEnableVariantFlattenNested()
&& variantEnableFlattenNested) {
olapTable.setVariantEnableFlattenNested(variantEnableFlattenNested);
} else if (variantEnableFlattenNested) {
throw new DdlException("If you want to enable variant flatten
nested, "
- + "please set session variable:
disable_variant_flatten_nested = false");
+ + "please set session variable:
enable_variant_flatten_nested = true");
} else {
// keep table property: variant_enable_flatten_nested = false
olapTable.setVariantEnableFlattenNested(false);
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 97d90c30774..3917f4751eb 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
@@ -703,9 +703,9 @@ public class SessionVariable implements Serializable,
Writable {
public static final String DISABLE_INVERTED_INDEX_V1_FOR_VARIANT =
"disable_inverted_index_v1_for_variant";
- // disable variant flatten nested as session variable, default is true,
- // which means disable variant flatten nested when create table
- public static final String DISABLE_VARIANT_FLATTEN_NESTED =
"disable_variant_flatten_nested";
+ // enable variant flatten nested as session variable, default is false,
+ // which means do not flatten nested when create table
+ public static final String ENABLE_VARIANT_FLATTEN_NESTED =
"enable_variant_flatten_nested";
// CLOUD_VARIABLES_BEGIN
public static final String CLOUD_CLUSTER = "cloud_cluster";
@@ -1392,8 +1392,8 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = DISABLE_INVERTED_INDEX_V1_FOR_VARIANT,
needForward = true)
private boolean disableInvertedIndexV1ForVaraint = true;
- @VariableMgr.VarAttr(name = DISABLE_VARIANT_FLATTEN_NESTED, needForward =
true)
- private boolean disableVariantFlattenNested = true;
+ @VariableMgr.VarAttr(name = ENABLE_VARIANT_FLATTEN_NESTED, needForward =
true)
+ private boolean enableVariantFlattenNested = false;
public int getBeNumberForTest() {
return beNumberForTest;
@@ -5056,12 +5056,12 @@ public class SessionVariable implements Serializable,
Writable {
return disableInvertedIndexV1ForVaraint;
}
- public void setDisableVariantFlattenNested(boolean
disableVariantFlattenNested) {
- this.disableVariantFlattenNested = disableVariantFlattenNested;
+ public void setEnableVariantFlattenNested(boolean
enableVariantFlattenNested) {
+ this.enableVariantFlattenNested = enableVariantFlattenNested;
}
- public boolean getDisableVariantFlattenNested() {
- return disableVariantFlattenNested;
+ public boolean getEnableVariantFlattenNested() {
+ return enableVariantFlattenNested;
}
public void setProfileLevel(String profileLevel) {
diff --git a/regression-test/suites/variant_p0/delete_update.groovy
b/regression-test/suites/variant_p0/delete_update.groovy
index dcae6c628bf..f7c27b55dc8 100644
--- a/regression-test/suites/variant_p0/delete_update.groovy
+++ b/regression-test/suites/variant_p0/delete_update.groovy
@@ -21,7 +21,7 @@ suite("regression_test_variant_delete_and_update",
"variant_type"){
// MOR
def table_name = "var_delete_update"
sql "DROP TABLE IF EXISTS ${table_name}"
- sql """ set disable_variant_flatten_nested = false """
+ sql """ set enable_variant_flatten_nested = true """
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
k bigint,
@@ -171,4 +171,4 @@ suite("regression_test_variant_delete_and_update",
"variant_type"){
sql "sync"
qt_sql """ select * from ${tableName} order by id;"""
-}
\ No newline at end of file
+}
diff --git a/regression-test/suites/variant_p0/nested.groovy
b/regression-test/suites/variant_p0/nested.groovy
index e26cf96d2b1..a0087e07374 100644
--- a/regression-test/suites/variant_p0/nested.groovy
+++ b/regression-test/suites/variant_p0/nested.groovy
@@ -24,7 +24,7 @@ suite("regression_test_variant_nested", "p0"){
def table_name = "var_nested"
sql "DROP TABLE IF EXISTS ${table_name}"
- sql "set disable_variant_flatten_nested = false"
+ sql "set enable_variant_flatten_nested = true"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
k bigint,
diff --git
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
index a8b78bdd258..3bad6181251 100644
---
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
@@ -57,7 +57,7 @@ suite("double_write_schema_change_with_variant",
"nonConcurrent") {
def table_name = "github_events"
sql """DROP TABLE IF EXISTS ${table_name}"""
- sql "set disable_variant_flatten_nested = false"
+ sql "set enable_variant_flatten_nested = true"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
k bigint,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
