(iotdb) 02/02: resolve conflicts

[jackietien]

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

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

commit 759ba5bdb066f144d3c66af54be1aec40ed49dde
Merge: 6fb4d2538e0 5c95c5843a3
Author: JackieTien97 <jackietie...@gmail.com>
AuthorDate: Tue Apr 16 15:23:16 2024 +0800

    resolve conflicts

 .../plan/relational/planner/QueryPlanner.java      |  8 +---
 .../relational/planner/node/TableScanNode.java     | 55 +++++++++++++++++++++-
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --cc 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
index d6aa012f57e,7af35991103..8849b3ddb18
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
@@@ -75,24 -95,31 +97,53 @@@ public class TableScanNode extends Plan
      return outputSymbols;
    }
  
 +  @Override
 +  public boolean equals(Object o) {
 +    if (this == o) {
 +      return true;
 +    }
 +    if (o == null || getClass() != o.getClass()) {
 +      return false;
 +    }
 +    if (!super.equals(o)) {
 +      return false;
 +    }
 +    TableScanNode that = (TableScanNode) o;
 +    return Objects.equals(qualifiedTableName, that.qualifiedTableName)
-         && Objects.equals(outputSymbols, that.outputSymbols);
++        && Objects.equals(outputSymbols, that.outputSymbols)
++        && Objects.equals(regionReplicaSet, that.regionReplicaSet);
 +  }
 +
 +  @Override
 +  public int hashCode() {
-     return Objects.hash(super.hashCode(), qualifiedTableName, outputSymbols);
++    return Objects.hash(super.hashCode(), qualifiedTableName, outputSymbols, 
regionReplicaSet);
++  }
++
+   public String getQualifiedTableName() {
+     return this.qualifiedTableName;
+   }
+ 
+   public Map<Symbol, ColumnSchema> getAssignments() {
+     return this.assignments;
+   }
+ 
+   public Ordering getScanOrder() {
+     return this.scanOrder;
+   }
+ 
+   public Expression getPushDownPredicate() {
+     return this.pushDownPredicate;
+   }
+ 
+   public long getPushDownLimit() {
+     return this.pushDownLimit;
+   }
+ 
+   public long getPushDownOffset() {
+     return this.pushDownOffset;
+   }
+ 
+   public TRegionReplicaSet getRegionReplicaSet() {
+     return this.regionReplicaSet;
    }
  }