apache#36 optimize project codegen

hn5092 · Jul 18, 2019 · a272baa · a272baa
1 parent ceae443
commit a272baa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Projection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Projection.scala
@@ -126,7 +126,7 @@ object UnsafeProjection
 
   protected def toBoundExprs(
       exprs: Seq[Expression],
-      inputSchema: Seq[Attribute]): Seq[Expression] = {
+      inputSchema: AttributeSeq): Seq[Expression] = {
     exprs.map(BindReferences.bindReference(_, inputSchema))
   }
 

diff --git a/...n/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateMutableProjection.scala b/...n/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateMutableProjection.scala
@@ -34,8 +34,10 @@ object GenerateMutableProjection extends CodeGenerator[Seq[Expression], MutableP
   protected def canonicalize(in: Seq[Expression]): Seq[Expression] =
     in.map(ExpressionCanonicalizer.execute)
 
-  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] =
-    in.map(BindReferences.bindReference(_, inputSchema))
+  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] = {
+    val attSeq = AttributeSeq(inputSchema)
+    in.map(BindReferences.bindReference(_, attSeq))
+  }
 
   def generate(
       expressions: Seq[Expression],

diff --git a/...t/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/...t/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
@@ -45,8 +45,10 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
   protected def canonicalize(in: Seq[SortOrder]): Seq[SortOrder] =
     in.map(ExpressionCanonicalizer.execute(_).asInstanceOf[SortOrder])
 
-  protected def bind(in: Seq[SortOrder], inputSchema: Seq[Attribute]): Seq[SortOrder] =
-    in.map(BindReferences.bindReference(_, inputSchema))
+  protected def bind(in: Seq[SortOrder], inputSchema: Seq[Attribute]): Seq[SortOrder] = {
+    val attSeq = AttributeSeq(inputSchema)
+    in.map(BindReferences.bindReference(_, attSeq))
+  }
 
   /**
    * Creates a code gen ordering for sorting this schema, in ascending order.

diff --git a/...main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateSafeProjection.scala b/...main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateSafeProjection.scala
@@ -40,8 +40,10 @@ object GenerateSafeProjection extends CodeGenerator[Seq[Expression], Projection]
   protected def canonicalize(in: Seq[Expression]): Seq[Expression] =
     in.map(ExpressionCanonicalizer.execute)
 
-  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] =
-    in.map(BindReferences.bindReference(_, inputSchema))
+  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] = {
+    val attSeq = AttributeSeq(inputSchema)
+    in.map(BindReferences.bindReference(_, attSeq))
+  }
 
   private def createCodeForStruct(
       ctx: CodegenContext,

diff --git a/...in/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateUnsafeProjection.scala b/...in/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateUnsafeProjection.scala
@@ -316,8 +316,10 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
   protected def canonicalize(in: Seq[Expression]): Seq[Expression] =
     in.map(ExpressionCanonicalizer.execute)
 
-  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] =
-    in.map(BindReferences.bindReference(_, inputSchema))
+  protected def bind(in: Seq[Expression], inputSchema: Seq[Attribute]): Seq[Expression] = {
+    val attSeq = AttributeSeq(inputSchema)
+    in.map(BindReferences.bindReference(_, attSeq))
+  }
 
   def generate(
       expressions: Seq[Expression],