copilot comments

Author: shizy818

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTExplainAnalyzeIT.java

@@ -240,7 +240,11 @@ private static ToLongFunction<String> extractNumber(String regex) {
       Pattern pattern = Pattern.compile(regex);
       Matcher matcher = pattern.matcher(line);
       if (matcher.find()) {
-        return Long.parseLong(matcher.group(1));
+        try {
+          return Long.parseLong(matcher.group(1));
+        } catch (NumberFormatException e) {
+          return 0;
+        }
       }
       return 0;
     };

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java

@@ -40,6 +40,7 @@
 import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics;
 import org.apache.iotdb.db.utils.cte.CteDataStore;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.tsfile.read.filter.basic.Filter;
 import org.apache.tsfile.utils.Pair;
 
@@ -127,7 +128,7 @@ public class MPPQueryContext implements IAuditEntity {
   private boolean subquery = false;
 
   // Tables in the subquery
-  private final Map<Query, List<Identifier>> subQueryTables = new HashMap<>();
+  private final Map<NodeRef<Query>, List<Identifier>> subQueryTables = new HashMap<>();
 
   public MPPQueryContext(QueryId queryId) {
     this.queryId = queryId;
@@ -513,8 +514,12 @@ public void setCteQueries(Map<NodeRef<Table>, Query> cteQueries) {
     this.cteQueries = cteQueries;
   }
 
-  public Map<Query, List<Identifier>> getSubQueryTables() {
-    return subQueryTables;
+  public void addSubQueryTables(Query query, List<Identifier> tables) {
+    subQueryTables.put(NodeRef.of(query), tables);
+  }
+
+  public List<Identifier> getTables(Query query) {
+    return subQueryTables.getOrDefault(NodeRef.of(query), ImmutableList.of());
   }
 
   public void addCteExplainResult(Table table, Pair<Integer, List<String>> cteExplainResult) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java

@@ -1722,7 +1722,7 @@ private Type analyzeSubquery(SubqueryExpression node, StackableAstVisitorContext
           statementAnalyzerFactory.apply(node, ctx.getContext().getCorrelationSupport());
       Scope subqueryScope = Scope.builder().withParent(ctx.getContext().getScope()).build();
       Scope queryScope = analyzer.analyze(node.getQuery(), subqueryScope);
-      context.getSubQueryTables().put(node.getQuery(), queryScope.getTables());
+      context.addSubQueryTables(node.getQuery(), queryScope.getTables());
 
       ImmutableList.Builder<RowType.Field> fields = ImmutableList.builder();
       for (int i = 0; i < queryScope.getRelationType().getAllFieldCount(); i++) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java

@@ -32,6 +32,7 @@
 import com.google.common.collect.ImmutableMap;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,12 +83,16 @@ public void addTable(Table table) {
     tables.add(new Identifier(table.getName().getSuffix()));
   }
 
+  public void addTables(List<Identifier> tables) {
+    this.tables.addAll(tables);
+  }
+
   public Scope copy() {
     return builder().like(this).build();
   }
 
   public List<Identifier> getTables() {
-    return tables;
+    return Collections.unmodifiableList(tables);
   }
 
   public Scope withRelationType(RelationType relationType) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java

@@ -947,7 +947,7 @@ private Scope analyzeWith(Query node, Optional<Scope> scope) {
           }
 
           withScopeBuilder.withNamedQuery(name, withQuery);
-          queryContext.getSubQueryTables().put(withQuery.getQuery(), queryScope.getTables());
+          queryContext.addSubQueryTables(withQuery.getQuery(), queryScope.getTables());
         }
       }
       Scope withScope = withScopeBuilder.build();
@@ -3635,8 +3635,8 @@ protected Scope visitJoin(Join node, Optional<Scope> scope) {
       Scope right = process(node.getRight(), rightScope);
 
       if (scope.isPresent()) {
-        leftScope.ifPresent(l -> scope.get().getTables().addAll(l.getTables()));
-        rightScope.ifPresent(l -> scope.get().getTables().addAll(l.getTables()));
+        leftScope.ifPresent(l -> scope.get().addTables(l.getTables()));
+        rightScope.ifPresent(l -> scope.get().addTables(l.getTables()));
       }
 
       if (criteria instanceof JoinUsing) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java

@@ -107,8 +107,7 @@ public CteDataStore fetchCteQueryResult(
     try {
       Query q = query;
       if (with != null) {
-        List<Identifier> tables =
-            context.getSubQueryTables().getOrDefault(query, ImmutableList.of());
+        List<Identifier> tables = context.getTables(query);
         List<WithQuery> withQueries =
             with.getQueries().stream()
                 .filter(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java

@@ -48,7 +48,6 @@
 import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
 import org.apache.iotdb.rpc.TSStatusCode;
 
-import com.google.common.collect.ImmutableList;
 import org.apache.tsfile.block.column.Column;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.read.common.block.TsBlock;
@@ -113,8 +112,7 @@ public Optional<Literal> fetchUncorrelatedSubqueryResultForPredicate(
       Query query = subqueryExpression.getQuery();
       Query q = query;
       if (with != null) {
-        List<Identifier> tables =
-            context.getSubQueryTables().getOrDefault(query, ImmutableList.of());
+        List<Identifier> tables = context.getTables(query);
         List<WithQuery> withQueries =
             with.getQueries().stream()
                 .filter(