This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit c41618a0b61f8a8226ccb5dd18b7a5ce45941c4f
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Mon May 16 22:34:02 2022 +0800
[fix](planner)VecNotImplException thrown when query need rewrite and some
slot cannot changed to nullable (#9589)
---
.../java/org/apache/doris/analysis/Analyzer.java | 35 ----------------------
.../apache/doris/common/util/VectorizedUtil.java | 29 +++++++++---------
2 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
index 0cf48b6afb..4fceedf384 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
@@ -298,17 +298,6 @@ public class Analyzer {
private final long autoBroadcastJoinThreshold;
- /**
- * This property is mainly used to store the vectorized switch of the
current query.
- * true: the vectorization of the current query is turned on
- * false: the vectorization of the current query is turned off.
- * It is different from the vectorized switch`enableVectorizedEngine`
of the session.
- * It is only valid for a single query, while the session switch is
valid for all queries in the session.
- * It cannot be set directly by the user, only by inheritance from
session`enableVectorizedEngine`
- * or internal adjustment of the system.
- */
- private boolean enableQueryVec;
-
public GlobalState(Catalog catalog, ConnectContext context) {
this.catalog = catalog;
this.context = context;
@@ -359,9 +348,6 @@ public class Analyzer {
// autoBroadcastJoinThreshold is a "final" field, must set an
initial value for it
autoBroadcastJoinThreshold = 0;
}
- if (context != null) {
- enableQueryVec =
context.getSessionVariable().enableVectorizedEngine();
- }
}
}
@@ -666,27 +652,6 @@ public class Analyzer {
return globalState.mvExprRewriter;
}
- /**
- * Only the top-level `query vec` value of the query analyzer represents
the value of the entire query.
- * Other sub-analyzers cannot represent the value of `query vec`.
- * @return
- */
- public boolean enableQueryVec() {
- if (ancestors.isEmpty()) {
- return globalState.enableQueryVec;
- } else {
- return ancestors.get(ancestors.size() - 1).enableQueryVec();
- }
- }
-
- /**
- * Since analyzer cannot get sub-analyzers from top to bottom.
- * So I can only set the `query vec` variable of the top level analyzer of
query to true.
- */
- public void disableQueryVec() {
- globalState.enableQueryVec = false;
- }
-
/**
* Return descriptor of registered table/alias.
*
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java
index 4b793a0e9b..d8fc1f55f3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java
@@ -17,9 +17,12 @@
package org.apache.doris.common.util;
-import org.apache.doris.analysis.Analyzer;
+import org.apache.doris.analysis.SetVar;
+import org.apache.doris.analysis.StringLiteral;
+import org.apache.doris.common.DdlException;
import org.apache.doris.qe.ConnectContext;
-import org.apache.doris.qe.StmtExecutor;
+import org.apache.doris.qe.SessionVariable;
+import org.apache.doris.qe.VariableMgr;
public class VectorizedUtil {
/**
@@ -33,15 +36,7 @@ public class VectorizedUtil {
if (connectContext == null) {
return false;
}
- StmtExecutor stmtExecutor = connectContext.getExecutor();
- if (stmtExecutor == null) {
- return
connectContext.getSessionVariable().enableVectorizedEngine();
- }
- Analyzer analyzer = stmtExecutor.getAnalyzer();
- if (analyzer == null) {
- return
connectContext.getSessionVariable().enableVectorizedEngine();
- }
- return analyzer.enableQueryVec();
+ return connectContext.getSessionVariable().enableVectorizedEngine();
}
/**
@@ -63,11 +58,15 @@ public class VectorizedUtil {
if (connectContext == null) {
return;
}
- Analyzer analyzer = connectContext.getExecutor().getAnalyzer();
- if (analyzer == null) {
- return;
+ SessionVariable sessionVariable = connectContext.getSessionVariable();
+ sessionVariable.setIsSingleSetVar(true);
+ try {
+ VariableMgr.setVar(sessionVariable, new SetVar(
+ "enable_vectorized_engine",
+ new StringLiteral("false")));
+ } catch (DdlException e) {
+ // do nothing
}
- analyzer.disableQueryVec();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
