diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
index d71089d990..3cf823d0e2 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
@@ -25,7 +25,7 @@
  * Group the all the input {@link BindingTuple} by {@link AggregationOperator#groupByExprList},
  * calculate the aggregation result by using {@link AggregationOperator#aggregatorList}.
  */
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 @ToString
 public class AggregationOperator extends PhysicalPlan {
   @Getter
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
index 648a920995..452fbd9707 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
@@ -26,7 +26,7 @@
  * DedupeOperator#dedupeList} The result order follow the input order.
  */
 @Getter
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class DedupeOperator extends PhysicalPlan {
   @Getter
   private final PhysicalPlan input;
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
index 7ccf2addfa..86cd411a2d 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
@@ -21,7 +21,7 @@
  * The Filter operator only return the results that evaluated to true.
  * The NULL and MISSING are handled by the logic defined in {@link BinaryPredicateOperator}.
  */
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 @ToString
 @RequiredArgsConstructor
 public class FilterOperator extends PhysicalPlan {
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
index 7a0e8c11ce..cd84234c4b 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
@@ -28,7 +28,7 @@
 @RequiredArgsConstructor
 @Getter
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class LimitOperator extends PhysicalPlan {
   private final PhysicalPlan input;
   private final Integer limit;
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
index 7c74f90ba0..ae7816003a 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
@@ -26,7 +26,7 @@
  * Project the fields specified in {@link ProjectOperator#projectList} from input.
  */
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
 public class ProjectOperator extends PhysicalPlan {
   @Getter
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
index a4b834009d..fb3a91e2e6 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
@@ -33,7 +33,7 @@
  * Calculate the rare result by using the {@link RareTopNOperator#fieldExprList}.
  */
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class RareTopNOperator extends PhysicalPlan {
 
   @Getter
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
index 62d0eef464..3fa3519d10 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
@@ -28,7 +28,7 @@
  * Remove the fields specified in {@link RemoveOperator#removeList} from input.
  */
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class RemoveOperator extends PhysicalPlan {
   @Getter
   private final PhysicalPlan input;
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
index f20a70eda4..f0b0d13c50 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
@@ -28,7 +28,7 @@
  * The mapping maintain the relation between source and target.
  * it means BindingTuple.resolve(target) = BindingTuple.resolve(source).
  */
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 @ToString
 public class RenameOperator extends PhysicalPlan {
   @Getter
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
index 1d528babf6..4463892ca5 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
@@ -32,7 +32,7 @@
  * The count indicate how many sorted result should been return.
  */
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class SortOperator extends PhysicalPlan {
   @Getter
   private final PhysicalPlan input;