You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/06/08 01:19:37 UTC

[iotdb] branch removeTokenType updated: Fix query index plan bug

This is an automated email from the ASF dual-hosted git repository.

xiangweiwei pushed a commit to branch removeTokenType
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/removeTokenType by this push:
     new 82f8984  Fix query index plan bug
82f8984 is described below

commit 82f89845dc615d2cc6e35309d351d205aeeebd05
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue Jun 8 09:18:53 2021 +0800

    Fix query index plan bug
---
 .../org/apache/iotdb/db/qp/logical/crud/QueryOperator.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
index f358efd..f2668d3 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
@@ -195,6 +195,12 @@ public class QueryOperator extends Operator {
       }
     }
 
+    if (queryPlan instanceof QueryIndexPlan) {
+      ((QueryIndexPlan) queryPlan).setIndexType(indexType);
+      ((QueryIndexPlan) queryPlan).setProps(props);
+      return queryPlan;
+    }
+
     try {
       rawDataQueryPlan.setDataTypes(generator.getSeriesTypes(selectComponent.getPaths()));
       queryPlan.deduplicate(generator);
@@ -204,10 +210,6 @@ public class QueryOperator extends Operator {
 
     convertSpecialClauseValues(rawDataQueryPlan);
 
-    if (queryPlan instanceof QueryIndexPlan) {
-      ((QueryIndexPlan) queryPlan).setIndexType(indexType);
-      ((QueryIndexPlan) queryPlan).setProps(props);
-    }
     return rawDataQueryPlan;
   }