diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java index 033a03fa0b..6a34322f0e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java @@ -122,6 +122,12 @@ public class TableQueryPlanAction extends RestBaseController { } table.readLock(); try { + if (ConnectContext.get() != null + && ConnectContext.get().getSessionVariable() != null) { + // Disable some optimizations, since it's not fully supported + // TODO support it + ConnectContext.get().getSessionVariable().setEnableTwoPhaseReadOpt(false); + } // parse/analysis/plan the sql and acquire tablet distributions handleQuery(ConnectContext.get(), fullDbName, tblName, sql, resultMap); } finally { 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 b2b9e9a7a4..18e8333ea6 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 @@ -1241,6 +1241,10 @@ public class SessionVariable implements Serializable, Writable { return queryTimeoutS; } + public void setEnableTwoPhaseReadOpt(boolean enable) { + enableTwoPhaseReadOpt = enable; + } + public int getMaxExecutionTimeMS() { return maxExecutionTimeMS; }