This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new ac4d676a951 branch-3.0 [cherry-pick](variant) Rename session-var for
flatten nested (#54599)
ac4d676a951 is described below
commit ac4d676a951867b3a74e017ce862fb829b20ecf1
Author: amory <[email protected]>
AuthorDate: Thu Aug 14 12:58:18 2025 +0800
branch-3.0 [cherry-pick](variant) Rename session-var for flatten nested
(#54599)
backport : https://github.com/apache/doris/pull/54413
---
.../org/apache/doris/datasource/InternalCatalog.java | 10 ++++++----
.../main/java/org/apache/doris/qe/SessionVariable.java | 16 ++++++++--------
.../variant_github_events_nonConcurrent_p2/load.groovy | 2 ++
.../load.groovy | 1 +
regression-test/suites/variant_p0/delete_update.groovy | 4 ++--
regression-test/suites/variant_p0/nested.groovy | 2 +-
regression-test/suites/variant_p0/nested2.groovy | 2 +-
.../test_double_write_when_schema_change.groovy | 2 +-
8 files changed, 22 insertions(+), 17 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 3be70a8c90b..83ef30b0d0e 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
@@ -2645,20 +2645,22 @@ 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);
}
} catch (AnalysisException e) {
throw new DdlException(e.getMessage());
}
- olapTable.setVariantEnableFlattenNested(variantEnableFlattenNested);
// get storage format
TStorageFormat storageFormat = TStorageFormat.V2; // default is
segment v2
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 50a70b67844..e05ca844f58 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
@@ -681,9 +681,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,
+ // enable variant flatten nested as session variable, default is false,
// which means disable variant flatten nested when create table
- public static final String DISABLE_VARIANT_FLATTEN_NESTED =
"disable_variant_flatten_nested";
+ public static final String ENABLE_VARIANT_FLATTEN_NESTED =
"enable_variant_flatten_nested";
// CLOUD_VARIABLES_BEGIN
public static final String CLOUD_CLUSTER = "cloud_cluster";
@@ -1284,8 +1284,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;
@@ -4794,12 +4794,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 checkSqlConvertorFeatures(String features) {
diff --git
a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
index 316ebabbb55..ba499801cd0 100644
--- a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
@@ -149,6 +149,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
def table_name = "github_events"
sql """DROP TABLE IF EXISTS ${table_name}"""
+ sql """ set enable_variant_flatten_nested = true """
table_name = "github_events"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
@@ -197,6 +198,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
qt_sql """select cast(v["payload"]["pull_request"]["additions"] as int)
from github_events where cast(v["repo"]["name"] as string) =
'xpressengine/xe-core' order by 1;"""
qt_sql """select * from github_events where cast(v["repo"]["name"] as
string) = 'xpressengine/xe-core' order by 1 limit 10"""
sql """select * from github_events order by k limit 10"""
+ sql """ set enable_variant_flatten_nested = true """
sql """
CREATE TABLE IF NOT EXISTS github_events2 (
k bigint,
diff --git
a/regression-test/suites/variant_github_events_nonConcurrent_upgrade_p2/load.groovy
b/regression-test/suites/variant_github_events_nonConcurrent_upgrade_p2/load.groovy
index d4843eee094..9db13756749 100644
---
a/regression-test/suites/variant_github_events_nonConcurrent_upgrade_p2/load.groovy
+++
b/regression-test/suites/variant_github_events_nonConcurrent_upgrade_p2/load.groovy
@@ -73,6 +73,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
def table_name = "github_events"
sql """DROP TABLE IF EXISTS ${table_name}"""
+ sql """ set enable_variant_flatten_nested = true """
table_name = "github_events"
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
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 30559859f6c..7453a4d8935 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/nested2.groovy
b/regression-test/suites/variant_p0/nested2.groovy
index 099b1c903f1..7ab313c8303 100644
--- a/regression-test/suites/variant_p0/nested2.groovy
+++ b/regression-test/suites/variant_p0/nested2.groovy
@@ -24,7 +24,7 @@ suite("variant_nested_type_conflict", "p0"){
sql "DROP TABLE IF EXISTS ${table_name}"
sql """set describe_extend_variant_column = true"""
- 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]
