Add type alias to map

apache · Oct 9, 2024 · 456e759 · 456e759
1 parent 0a8e039
commit 456e759
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 4 deletions.
diff --git a/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/benchmarks b/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/src b/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/target b/core/tasks/3221d272-3ff0-420e-a4bd-d91eb9b00a29/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/benchmarks b/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/src b/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/target b/core/tasks/3270e079-5639-4351-a967-3083f2a973fe/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/benchmarks b/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/src b/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/target b/core/tasks/3b2b9eee-4487-4964-b116-46a1cf04b6c9/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/benchmarks b/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/src b/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/target b/core/tasks/5123f8c2-1e56-4cb9-a3d7-1761fde853a8/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/benchmarks b/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/src b/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/target b/core/tasks/7b995caf-4467-48d7-8214-a2dfeaa2a8bb/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/benchmarks b/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/benchmarks
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./benchmarks
diff --git a/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/src b/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/src
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./src
diff --git a/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/target b/core/tasks/ded36344-5710-4c12-8b60-e188d9269fc7/target
@@ -0,0 +1 @@
+/Users/mihailo.timotic/spark/core/./target
diff --git a/...catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/DeduplicateRelations.scala b/...catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/DeduplicateRelations.scala
@@ -25,6 +25,9 @@ import org.apache.spark.sql.catalyst.rules.Rule
 import org.apache.spark.sql.catalyst.trees.TreePattern._
 
 object DeduplicateRelations extends Rule[LogicalPlan] {
+
+  type ExprIdMap = mutable.HashMap[Class[_], mutable.HashSet[Long]]
+
   override def apply(plan: LogicalPlan): LogicalPlan = {
     val newPlan = renewDuplicatedRelations(mutable.HashMap.empty, plan)._1
 
@@ -75,7 +78,7 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
   }
 
   private def existDuplicatedExprId(
-      existingRelations: mutable.HashMap[Class[_], mutable.HashSet[Long]],
+      existingRelations: ExprIdMap,
       planClass: Class[_], exprIds: Seq[Long]): Boolean = {
     val attrSet = existingRelations.getOrElse(planClass, mutable.HashSet.empty)
     exprIds.exists(attrSet.contains)
@@ -89,7 +92,7 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
    *          whether the plan is changed or not)
    */
   private def renewDuplicatedRelations(
-      existingRelations: mutable.HashMap[Class[_], mutable.HashSet[Long]],
+      existingRelations: ExprIdMap,
       plan: LogicalPlan): (LogicalPlan, Boolean) = plan match {
     case p: LogicalPlan if p.isStreaming => (plan, false)
 
@@ -192,7 +195,7 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
   }
 
   private def deduplicate(
-      existingRelations: mutable.HashMap[Class[_], mutable.HashSet[Long]],
+      existingRelations: ExprIdMap,
       plan: LogicalPlan): (LogicalPlan, Boolean) = {
     var planChanged = false
     val newPlan = if (plan.children.nonEmpty) {
@@ -276,7 +279,7 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
   }
 
   private def deduplicateAndRenew[T <: LogicalPlan](
-      existingRelations: mutable.HashMap[Class[_], mutable.HashSet[Long]], plan: T,
+      existingRelations: ExprIdMap, plan: T,
       getExprIds: T => Seq[Long],
       copyNewPlan: T => T): (LogicalPlan, Boolean) = {
     var (newPlan, planChanged) = deduplicate(existingRelations, plan)