From f329b9069643d0d19e2436dfbef47934c9bfd6e2 Mon Sep 17 00:00:00 2001 From: Yulei-Yang Date: Tue, 28 Nov 2023 11:35:46 +0800 Subject: [PATCH] [fix](show_variables) fix default value for special variables (#27651) --- .../java/org/apache/doris/qe/VariableMgr.java | 16 +++--- .../variable_p0/set_and_unset_variable.out | 52 +++++++++---------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java index 58e3646937..c1052fe99a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java @@ -709,14 +709,18 @@ public class VariableMgr { } } - VarContext varContext = ctxByVarName.get(entry.getKey()); - if (varContext != null) { - row.add(varContext.defaultValue); - row.add(row.get(1).equals(row.get(2)) ? "0" : "1"); + VarContext varContext = ctxByDisplayVarName.get(entry.getKey()); + if (VariableVarConverters.hasConverter(row.get(0))) { + try { + row.add(VariableVarConverters.decode(row.get(0), Long.valueOf(varContext.defaultValue))); + } catch (DdlException e) { + row.add(varContext.defaultValue); + LOG.warn(String.format("encode session variable %s failed", row.get(0))); + } } else { - row.add("-"); - row.add("-"); + row.add(varContext.defaultValue); } + row.add(row.get(1).equals(row.get(2)) ? "0" : "1"); rows.add(row); } diff --git a/regression-test/data/variable_p0/set_and_unset_variable.out b/regression-test/data/variable_p0/set_and_unset_variable.out index 6069e583a0..89689297e6 100644 --- a/regression-test/data/variable_p0/set_and_unset_variable.out +++ b/regression-test/data/variable_p0/set_and_unset_variable.out @@ -15,91 +15,91 @@ wait_timeout 28800 28800 0 0 -- !cmd -- -runtime_filter_type BLOOM_FILTER 8 1 +runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER 1 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- 0 -- !cmd -- -runtime_filter_type BLOOM_FILTER 8 1 +runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER 1 -- !cmd -- -runtime_filter_type BLOOM_FILTER 8 1 +runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER 1 -- !cmd -- 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- 0 -- !cmd -- -experimental_enable_agg_state true - - +experimental_enable_agg_state true false 1 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- 0 -- !cmd -- -experimental_enable_agg_state true - - +experimental_enable_agg_state true false 1 -- !cmd -- -experimental_enable_agg_state true - - +experimental_enable_agg_state true false 1 -- !cmd -- 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- 0 -- !cmd -- -deprecated_enable_local_exchange false - - +deprecated_enable_local_exchange false true 1 -- !cmd -- -deprecated_enable_local_exchange true - - +deprecated_enable_local_exchange true true 0 -- !cmd -- 0 -- !cmd -- -deprecated_enable_local_exchange true - - +deprecated_enable_local_exchange true true 0 -- !cmd -- -deprecated_enable_local_exchange true - - +deprecated_enable_local_exchange true true 0 -- !cmd -- 0 @@ -117,13 +117,13 @@ deprecated_enable_local_exchange true - - 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- -deprecated_enable_local_exchange true - - +deprecated_enable_local_exchange true true 0 -- !cmd -- show_hidden_columns false false 0 @@ -144,13 +144,13 @@ show_hidden_columns false false 0 0 -- !cmd -- -runtime_filter_type IN_OR_BLOOM_FILTER 8 1 +runtime_filter_type IN_OR_BLOOM_FILTER IN_OR_BLOOM_FILTER 0 -- !cmd -- -experimental_enable_agg_state false - - +experimental_enable_agg_state false false 0 -- !cmd -- -deprecated_enable_local_exchange true - - +deprecated_enable_local_exchange true true 0 -- !cmd -- show_hidden_columns false false 0