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 8b0672b812f branch-4.2: [test](fe) Enable debug points for NestedGroup 
session default test (#70756)
8b0672b812f is described below

commit 8b0672b812fe0af5eabe7e7b2f61cdf759cbd858
Author: lihangyu <[email protected]>
AuthorDate: Sat Nov 21 04:52:14 2026 +0800

    branch-4.2: [test](fe) Enable debug points for NestedGroup session default 
test (#70756)
    
    cherry-pick #70639
    
    Conflicts in VariantEscapeTableTest.java were resolved by keeping the
    Config import needed for enable_debug_points.
---
 .../java/org/apache/doris/catalog/VariantEscapeTableTest.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/catalog/VariantEscapeTableTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/catalog/VariantEscapeTableTest.java
index 413758b665e..6e45d60cd71 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/catalog/VariantEscapeTableTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/catalog/VariantEscapeTableTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.doris.catalog;
 
+import org.apache.doris.common.Config;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.util.PropertyAnalyzer;
 import org.apache.doris.nereids.parser.NereidsParser;
@@ -233,8 +234,12 @@ public class VariantEscapeTableTest extends 
TestWithFeService {
                 + "DUPLICATE KEY(k) DISTRIBUTED BY HASH(k) BUCKETS 1 "
                 + 
"PROPERTIES('replication_num'='1','variant_escape_dots_in_keys'='true')"));
         Assertions.assertTrue(explicit.getMessage().contains("Escaped tables 
do not support NestedGroup"));
-        connectContext.getSessionVariable().defaultVariantEnableNestedGroup = 
true;
+        boolean originalEnableDebugPoints = Config.enable_debug_points;
+        boolean originalNestedGroup = 
connectContext.getSessionVariable().defaultVariantEnableNestedGroup;
         try {
+            // Session defaults are only applied when debug points are enabled.
+            Config.enable_debug_points = true;
+            
connectContext.getSessionVariable().defaultVariantEnableNestedGroup = true;
             Exception error = Assertions.assertThrows(Exception.class, () -> 
createTable(
                     "CREATE TABLE nested_default(k INT, v 
VARIANT<PROPERTIES('variant_max_subcolumns_count'='1')>) "
                     + "DUPLICATE KEY(k) DISTRIBUTED BY HASH(k) BUCKETS 1 "
@@ -242,7 +247,8 @@ public class VariantEscapeTableTest extends 
TestWithFeService {
             Assertions.assertTrue(error.getMessage().contains("Escaped tables 
do not support NestedGroup"),
                     error.getMessage());
         } finally {
-            
connectContext.getSessionVariable().defaultVariantEnableNestedGroup = false;
+            Config.enable_debug_points = originalEnableDebugPoints;
+            
connectContext.getSessionVariable().defaultVariantEnableNestedGroup = 
originalNestedGroup;
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to