Fixed type on passing a ReadCallback.

Author: metasim

core/src/main/scala/astraea/spark/rasterframes/expressions/URIToRasterSource.scala

@@ -24,8 +24,8 @@ package astraea.spark.rasterframes.expressions
 import java.net.URI
 
 import astraea.spark.rasterframes.encoders.CatalystSerializer._
+import astraea.spark.rasterframes.ref.RasterSource.ReadCallback
 import astraea.spark.rasterframes.ref.{RasterRef, RasterSource}
-import astraea.spark.rasterframes.util._
 import com.typesafe.scalalogging.LazyLogging
 import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback
 import org.apache.spark.sql.catalyst.expressions.{ExpectsInputTypes, Expression, UnaryExpression}
@@ -41,7 +41,7 @@ import org.apache.spark.unsafe.types.UTF8String
  *
  * @since 5/4/18
  */
-case class URIToRasterSource(override val child: Expression, accumulator: Option[ReadAccumulator])
+case class URIToRasterSource(override val child: Expression, accumulator: Option[ReadCallback])
   extends UnaryExpression with ExpectsInputTypes with CodegenFallback with LazyLogging {
 
   override def nodeName: String = "uri_to_raster_source"
@@ -61,8 +61,8 @@ case class URIToRasterSource(override val child: Expression, accumulator: Option
 object URIToRasterSource {
   def apply(rasterURI: Column): TypedColumn[Any, RasterRef] =
     new Column(new URIToRasterSource(rasterURI.expr, None)).as[RasterRef]
-  def apply(rasterURI: Column, accumulator: ReadAccumulator): TypedColumn[Any, RasterRef] =
+  def apply(rasterURI: Column, accumulator: ReadCallback): TypedColumn[Any, RasterRef] =
     new Column(new URIToRasterSource(rasterURI.expr, Option(accumulator))).as[RasterRef]
-  def apply(rasterURI: Column, accumulator: Option[ReadAccumulator]): TypedColumn[Any, RasterRef] =
+  def apply(rasterURI: Column, accumulator: Option[ReadCallback]): TypedColumn[Any, RasterRef] =
     new Column(new URIToRasterSource(rasterURI.expr, accumulator)).as[RasterRef]
 }

core/src/main/scala/astraea/spark/rasterframes/package.scala

@@ -47,6 +47,7 @@ package object rasterframes extends StandardColumns
   with LazyLogging {
 
   /** The generally expected tile size, as defined by configuration property `rasterframes.nominal-tile-size`.*/
+  @transient
   final val NOMINAL_TILE_SIZE: Int = ConfigFactory.load().getInt("rasterframes.nominal-tile-size")
 
   /**

experimental/src/main/scala/astraea/spark/rasterframes/experimental/datasource/awspds/L8Relation.scala

@@ -26,6 +26,7 @@ import astraea.spark.rasterframes.encoders.CatalystSerializer._
 import astraea.spark.rasterframes.experimental.datasource.awspds.L8Relation.Bands
 import astraea.spark.rasterframes.expressions.{RasterSourceToRasterRefs, URIToRasterSource}
 import astraea.spark.rasterframes.ref.RasterRef
+import astraea.spark.rasterframes.ref.RasterSource.ReadCallback
 import astraea.spark.rasterframes.rules.SpatialFilters.{Contains, Intersects}
 import astraea.spark.rasterframes.rules._
 import astraea.spark.rasterframes.util._
@@ -41,7 +42,7 @@ import org.apache.spark.sql.{Column, Row, SQLContext}
  *
  * @since 8/21/18
  */
-case class L8Relation(sqlContext: SQLContext, useTiling: Boolean, accumulator: Option[ReadAccumulator], filters: Seq[Filter] = Seq.empty)
+case class L8Relation(sqlContext: SQLContext, useTiling: Boolean, accumulator: Option[ReadCallback], filters: Seq[Filter] = Seq.empty)
   extends BaseRelation with PrunedFilteredScan with SpatialRelationReceiver[L8Relation] with LazyLogging {
   override def schema: StructType = L8Relation.schema