(iotdb) branch master updated: fix the error usage of HierarchyFieldIndex

[jackietien]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new eb6a5d37af2 fix the error usage of HierarchyFieldIndex
eb6a5d37af2 is described below

commit eb6a5d37af245e3fcb4fcffe7b8697cbdc77c445
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Wed Sep 4 17:22:21 2024 +0800

    fix the error usage of HierarchyFieldIndex
---
 .../db/queryengine/plan/relational/planner/RelationPlanner.java  | 9 ---------
 .../db/queryengine/plan/relational/planner/TranslationMap.java   | 6 +-----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
index d04e1bd7533..5704c9a15f3 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -60,7 +60,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 
@@ -139,20 +138,12 @@ public class RelationPlanner extends 
AstVisitor<RelationPlan, Void> {
             
qualifiedName.getPrefix().map(QualifiedName::toString).orElse(null),
             qualifiedName.getSuffix());
 
-    Set<String> usedColumns = analysis.getUsedColumns(qualifiedObjectName);
-
     // on the basis of that the order of fields is same with the column 
category order of segments
     // in DeviceEntry
     Map<Symbol, Integer> idAndAttributeIndexMap = new HashMap<>();
     int idIndex = 0;
     for (Field field : fields) {
       TsTableColumnCategory category = field.getColumnCategory();
-      // only keep used columns and all ID columns
-      if (category != TsTableColumnCategory.ID
-          && field.getOriginColumnName().isPresent()
-          && !usedColumns.contains(field.getOriginColumnName().get())) {
-        continue;
-      }
       Symbol symbol = symbolAllocator.newSymbol(field);
       outputSymbolsBuilder.add(symbol);
       symbolToColumnSchema.put(
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java
index 715111907f6..6a01f59e2b7 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java
@@ -382,11 +382,7 @@ public class TranslationMap {
     ResolvedField field = 
analysis.getColumnReferenceFields().get(NodeRef.of(expression));
 
     if (scope.isLocalScope(field.getScope())) {
-      if (field.getField().getOriginColumnName().isPresent()) {
-        return 
Optional.of(Symbol.of(field.getField().getOriginColumnName().get()));
-      } else {
-        return Optional.of(fieldSymbols[field.getHierarchyFieldIndex()]);
-      }
+      return Optional.of(fieldSymbols[field.getHierarchyFieldIndex()]);
     }
 
     if (outerContext.isPresent()) {