withNewChildrenInternal

Author: echeipesh

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

@@ -25,13 +25,14 @@ 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
+import org.apache.spark.sql.catalyst.expressions.{BinaryExpression, Expression}
 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 {
+trait BinaryRasterFunction extends BinaryExpression with RasterResult { self: HasBinaryExpressionCopy =>
+  override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression = copy(newLeft, newRight)
 
   @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 

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

@@ -26,15 +26,16 @@ 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.UnaryExpression
+import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
 
 /**
  * Implements boilerplate for subtype expressions processing TileUDT, RasterSourceUDT, and RasterRefs
  * as Grid types.
  *
  * @since 11/4/18
  */
-trait OnCellGridExpression extends UnaryExpression {
+trait OnCellGridExpression extends UnaryExpression { self: HasUnaryExpressionCopy =>
+  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 
   private lazy val fromRow: InternalRow => CellGrid[Int] = {
     if (child.resolved) gridExtractor(child.dataType)

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.UnaryExpression
+import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
 import org.locationtech.rasterframes.model.TileContext
 
 /**
@@ -34,7 +34,8 @@ import org.locationtech.rasterframes.model.TileContext
  *
  * @since 11/3/18
  */
-trait OnTileContextExpression extends UnaryExpression {
+trait OnTileContextExpression extends UnaryExpression { self: HasUnaryExpressionCopy =>
+  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 
   override def checkInputDataTypes(): TypeCheckResult = {
     if (!projectedRasterLikeExtractor.isDefinedAt(child.dataType)) {

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

@@ -39,7 +39,10 @@ import org.locationtech.geomesa.spark.jts.udf.SpatialRelationFunctions._
  *
  * @since 12/28/17
  */
-abstract class SpatialRelation extends BinaryExpression with CodegenFallback {
+abstract class SpatialRelation extends BinaryExpression with CodegenFallback { this: HasBinaryExpressionCopy =>
+
+  override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
+    copy(left = newLeft, right = newRight)
 
   def extractGeometry(expr: Expression, input: Any): Geometry = {
     input match {
@@ -72,8 +75,11 @@ object SpatialRelation {
   type RelationPredicate = (Geometry, Geometry) => java.lang.Boolean
 
   case class Intersects(left: Expression, right: Expression) extends SpatialRelation {
-    override def nodeName = "intersects"
+    override def nodeName: String = "intersects"
     val relation = ST_Intersects
+
+    override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
+      copy(left = newLeft, right = newRight)
   }
   case class Contains(left: Expression, right: Expression) extends SpatialRelation {
     override def nodeName = "contains"

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

@@ -140,6 +140,14 @@ case class TileAssembler(
 
   def serialize(buffer: TileBuffer): Array[Byte] = buffer.serialize()
   def deserialize(storageFormat: Array[Byte]): TileBuffer = new TileBuffer(storageFormat)
+
+  override protected def withNewChildrenInternal(newChildren: IndexedSeq[Expression]): Expression = copy(
+    colIndex = newChildren(0),
+    rowIndex = newChildren(1),
+    cellValue = newChildren(2),
+    tileCols = newChildren(3),
+    tileRows = newChildren(4)
+  )
 }
 
 object TileAssembler {

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

@@ -25,11 +25,13 @@ 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.UnaryExpression
+import org.apache.spark.sql.catalyst.expressions.{Expression, UnaryExpression}
 import org.locationtech.rasterframes.model.TileContext
 
 /** Boilerplate for expressions operating on a single Tile-like . */
-trait UnaryRasterFunction extends UnaryExpression {
+trait UnaryRasterFunction extends UnaryExpression { self: HasUnaryExpressionCopy =>
+  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
+
   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,12 +23,13 @@ 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 {
+trait UnaryRasterOp extends UnaryRasterFunction with RasterResult { this: HasUnaryExpressionCopy =>
   @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 
   def dataType: DataType = child.dataType
@@ -37,5 +38,7 @@ trait UnaryRasterOp extends UnaryRasterFunction with RasterResult {
     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/GetCRS.scala

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

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

@@ -55,6 +55,8 @@ 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)
 }
 
 object GetCellType {

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

@@ -57,6 +57,8 @@ case class GetEnvelope(child: Expression) extends UnaryExpression with CodegenFa
   }
 
   def dataType: DataType = envelopeEncoder.schema
+
+  override protected def withNewChildInternal(newChild: Expression): Expression = copy(newChild)
 }
 
 object GetEnvelope {