fix the error usage of HierarchyFieldIndex

apache · Sep 4, 2024 · eb6a5d3 · eb6a5d3
1 parent b9cc8f9
commit eb6a5d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/...rc/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java b/...rc/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -60,7 +60,6 @@
 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 @@ protected RelationPlan visitTable(Table table, Void context) {
             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/...src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/...src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java
@@ -382,11 +382,7 @@ public Optional<Symbol> getSymbolForColumn(Expression expression) {
     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()) {