Implement withNewChildrenInternal directly

avoid reflection which is done at runtime by structural types

Author: echeipesh

core/src/main/scala/org/locationtech/rasterframes/expressions/BinaryRasterFunction.scala

@@ -25,14 +25,13 @@ import com.typesafe.scalalogging.Logger
 import geotrellis.raster.Tile
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
-import org.apache.spark.sql.catalyst.expressions.{BinaryExpression, Expression}
+import org.apache.spark.sql.catalyst.expressions.BinaryExpression
 import org.apache.spark.sql.types.DataType
 import org.locationtech.rasterframes.expressions.DynamicExtractors._
 import org.slf4j.LoggerFactory
 
 /** Operation combining two tiles or a tile and a scalar into a new tile. */
-trait BinaryRasterFunction extends BinaryExpression with RasterResult { self: HasBinaryExpressionCopy =>
-  override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
+trait BinaryRasterFunction extends BinaryExpression with RasterResult {
 
   @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 

core/src/main/scala/org/locationtech/rasterframes/expressions/OnCellGridExpression.scala

@@ -26,17 +26,15 @@ import geotrellis.raster.CellGrid
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
-import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
+import org.apache.spark.sql.catalyst.expressions.UnaryExpression
 
 /**
  * Implements boilerplate for subtype expressions processing TileUDT, RasterSourceUDT, and RasterRefs
  * as Grid types.
  *
  * @since 11/4/18
  */
-trait OnCellGridExpression extends UnaryExpression { self: HasUnaryExpressionCopy =>
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
-
+trait OnCellGridExpression extends UnaryExpression {
   private lazy val fromRow: InternalRow => CellGrid[Int] = {
     if (child.resolved) gridExtractor(child.dataType)
     else throw new IllegalStateException(s"Child expression unbound: ${child}")

core/src/main/scala/org/locationtech/rasterframes/expressions/OnTileContextExpression.scala

@@ -25,7 +25,7 @@ import org.locationtech.rasterframes.expressions.DynamicExtractors._
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
-import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
+import org.apache.spark.sql.catalyst.expressions.UnaryExpression
 import org.locationtech.rasterframes.model.TileContext
 
 /**
@@ -34,9 +34,7 @@ import org.locationtech.rasterframes.model.TileContext
  *
  * @since 11/3/18
  */
-trait OnTileContextExpression extends UnaryExpression { self: HasUnaryExpressionCopy =>
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
-
+trait OnTileContextExpression extends UnaryExpression {
   override def checkInputDataTypes(): TypeCheckResult = {
     if (!projectedRasterLikeExtractor.isDefinedAt(child.dataType)) {
       TypeCheckFailure(s"Input type '${child.dataType}' does not conform to `ProjectedRasterLike`.")

core/src/main/scala/org/locationtech/rasterframes/expressions/SpatialRelation.scala

@@ -39,10 +39,7 @@ import org.locationtech.geomesa.spark.jts.udf.SpatialRelationFunctions._
  *
  * @since 12/28/17
  */
-abstract class SpatialRelation extends BinaryExpression with CodegenFallback { this: HasBinaryExpressionCopy =>
-
-  override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
-    copy(left = newLeft, right = newRight)
+abstract class SpatialRelation extends BinaryExpression with CodegenFallback {
 
   def extractGeometry(expr: Expression, input: Any): Geometry = {
     input match {
@@ -78,36 +75,42 @@ object SpatialRelation {
     override def nodeName: String = "intersects"
     val relation = ST_Intersects
 
-    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
-      copy(left = newLeft, right = newRight)
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Contains(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "contains"
     val relation = ST_Contains
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Covers(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "covers"
     val relation = ST_Covers
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Crosses(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "crosses"
     val relation = ST_Crosses
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Disjoint(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "disjoint"
     val relation = ST_Disjoint
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Overlaps(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "overlaps"
     val relation = ST_Overlaps
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Touches(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "touches"
     val relation = ST_Touches
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
   case class Within(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "within"
     val relation = ST_Within
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
   }
 
   private val predicateMap = Map(

core/src/main/scala/org/locationtech/rasterframes/expressions/UnaryRasterAggregate.scala

@@ -33,7 +33,7 @@ import org.locationtech.rasterframes.encoders.syntax._
 import scala.reflect.runtime.universe._
 
 /** Mixin providing boilerplate for DeclarativeAggrates over tile-conforming columns. */
-trait UnaryRasterAggregate extends DeclarativeAggregate { self: HasUnaryExpressionCopy =>
+trait UnaryRasterAggregate extends DeclarativeAggregate {
   def child: Expression
 
   def nullable: Boolean = child.nullable
@@ -42,8 +42,6 @@ trait UnaryRasterAggregate extends DeclarativeAggregate { self: HasUnaryExpressi
 
   protected def tileOpAsExpression[R: TypeTag](name: String, op: Tile => R): Expression => ScalaUDF =
     udfiexpr[R, Any](name, (dataType: DataType) => (a: Any) => if(a == null) null.asInstanceOf[R] else op(UnaryRasterAggregate.extractTileFromAny(dataType, a)))
-
-  override protected def withNewChildrenInternal(newChildren: IndexedSeq[Expression]): Expression = copy(newChildren(0))
 }
 
 object UnaryRasterAggregate {

core/src/main/scala/org/locationtech/rasterframes/expressions/UnaryRasterFunction.scala

@@ -25,13 +25,11 @@ import org.locationtech.rasterframes.expressions.DynamicExtractors._
 import geotrellis.raster.Tile
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
-import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
+import org.apache.spark.sql.catalyst.expressions.UnaryExpression
 import org.locationtech.rasterframes.model.TileContext
 
 /** Boilerplate for expressions operating on a single Tile-like . */
-trait UnaryRasterFunction extends UnaryExpression { self: HasUnaryExpressionCopy =>
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
-
+trait UnaryRasterFunction extends UnaryExpression {
   override def checkInputDataTypes(): TypeCheckResult = {
     if (!tileExtractor.isDefinedAt(child.dataType)) {
       TypeCheckFailure(s"Input type '${child.dataType}' does not conform to a raster type.")

core/src/main/scala/org/locationtech/rasterframes/expressions/UnaryRasterOp.scala

@@ -23,13 +23,12 @@ package org.locationtech.rasterframes.expressions
 
 import com.typesafe.scalalogging.Logger
 import geotrellis.raster.Tile
-import org.apache.spark.sql.catalyst.expressions.Expression
 import org.apache.spark.sql.types.DataType
 import org.locationtech.rasterframes.model.TileContext
 import org.slf4j.LoggerFactory
 
 /** Operation on a tile returning a tile. */
-trait UnaryRasterOp extends UnaryRasterFunction with RasterResult { this: HasUnaryExpressionCopy =>
+trait UnaryRasterOp extends UnaryRasterFunction with RasterResult {
   @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 
   def dataType: DataType = child.dataType
@@ -38,7 +37,5 @@ trait UnaryRasterOp extends UnaryRasterFunction with RasterResult { this: HasUna
     toInternalRow(op(tile), ctx)
 
   protected def op(child: Tile): Tile
-
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 }
 

core/src/main/scala/org/locationtech/rasterframes/expressions/accessors/ExtractTile.scala

@@ -43,6 +43,8 @@ case class ExtractTile(child: Expression) extends UnaryRasterFunction with Codeg
     case prt: ProjectedRasterTile => tileUDT.serialize(prt.tile)
     case tile: Tile => tileSer(tile)
   }
+
+  def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 }
 
 object ExtractTile {

core/src/main/scala/org/locationtech/rasterframes/expressions/accessors/GetCRS.scala

@@ -97,7 +97,7 @@ case class GetCRS(child: Expression) extends UnaryExpression with CodegenFallbac
     }
   }
 
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
+  def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 }
 
 object GetCRS {

core/src/main/scala/org/locationtech/rasterframes/expressions/accessors/GetCellType.scala

@@ -56,7 +56,7 @@ case class GetCellType(child: Expression) extends OnCellGridExpression with Code
   /** Implemented by subtypes to process incoming ProjectedRasterLike entity. */
   def eval(cg: CellGrid[Int]): Any = resultConverter(cg.cellType)
 
-  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
+  def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 }
 
 object GetCellType {