From 187ba365e58a5d9da103e1e36f1569723347c6d7 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Thu, 21 Mar 2024 13:49:31 -0700
Subject: [PATCH] Remove duplicate code

---
 core/src/execution/operators/scan.rs          |  2 +-
 .../comet/CometSparkSessionExtensions.scala   | 21 -----------
 .../apache/spark/sql/comet/operators.scala    | 37 -------------------
 3 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/core/src/execution/operators/scan.rs b/core/src/execution/operators/scan.rs
index 9581ac405..e31230c58 100644
--- a/core/src/execution/operators/scan.rs
+++ b/core/src/execution/operators/scan.rs
@@ -26,7 +26,7 @@ use futures::Stream;
 use itertools::Itertools;
 
 use arrow::compute::{cast_with_options, CastOptions};
-use arrow_array::{make_array, Array, ArrayRef, RecordBatch, RecordBatchOptions};
+use arrow_array::{make_array, ArrayRef, RecordBatch, RecordBatchOptions};
 use arrow_data::ArrayData;
 use arrow_schema::{DataType, Field, Schema, SchemaRef};
 
diff --git a/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala b/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala
index 366f4d759..37ff8f7cd 100644
--- a/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala
+++ b/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala
@@ -335,27 +335,6 @@ class CometSparkSessionExtensions
               op
           }
 
-        case op: ShuffledHashJoinExec
-            if isCometOperatorEnabled(conf, "hash_join") &&
-              op.children.forall(isCometNative(_)) =>
-          val newOp = transform1(op)
-          newOp match {
-            case Some(nativeOp) =>
-              CometHashJoinExec(
-                nativeOp,
-                op,
-                op.leftKeys,
-                op.rightKeys,
-                op.joinType,
-                op.condition,
-                op.buildSide,
-                op.left,
-                op.right,
-                SerializedPlan(None))
-            case None =>
-              op
-          }
-
         case op: SortMergeJoinExec
             if isCometOperatorEnabled(conf, "sort_merge_join") &&
               op.children.forall(isCometNative(_)) =>
diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala b/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala
index 8d228bbbb..4f9addf21 100644
--- a/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala
+++ b/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala
@@ -589,43 +589,6 @@ case class CometHashAggregateExec(
     Objects.hashCode(groupingExpressions, aggregateExpressions, input, mode, child)
 }
 
-case class CometHashJoinExec(
-    override val nativeOp: Operator,
-    override val originalPlan: SparkPlan,
-    leftKeys: Seq[Expression],
-    rightKeys: Seq[Expression],
-    joinType: JoinType,
-    condition: Option[Expression],
-    buildSide: BuildSide,
-    override val left: SparkPlan,
-    override val right: SparkPlan,
-    override val serializedPlanOpt: SerializedPlan)
-    extends CometBinaryExec {
-  override def withNewChildrenInternal(newLeft: SparkPlan, newRight: SparkPlan): SparkPlan =
-    this.copy(left = newLeft, right = newRight)
-
-  override def stringArgs: Iterator[Any] =
-    Iterator(leftKeys, rightKeys, joinType, condition, left, right)
-
-  override def equals(obj: Any): Boolean = {
-    obj match {
-      case other: CometHashJoinExec =>
-        this.leftKeys == other.leftKeys &&
-        this.rightKeys == other.rightKeys &&
-        this.condition == other.condition &&
-        this.buildSide == other.buildSide &&
-        this.left == other.left &&
-        this.right == other.right &&
-        this.serializedPlanOpt == other.serializedPlanOpt
-      case _ =>
-        false
-    }
-  }
-
-  override def hashCode(): Int =
-    Objects.hashCode(leftKeys, rightKeys, condition, left, right)
-}
-
 case class CometSortMergeJoinExec(
     override val nativeOp: Operator,
     override val originalPlan: SparkPlan,