Changed CatalystSerialize implementations to store scheams as fields

rather than methods.

Author: metasim

core/src/main/scala/org/apache/spark/sql/rf/RasterSourceUDT.scala

@@ -73,7 +73,7 @@ object RasterSourceUDT {
 
   implicit val rasterSourceSerializer: CatalystSerializer[RasterSource] = new CatalystSerializer[RasterSource] {
 
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("raster_source_kryo", BinaryType, false)
     ))
 

core/src/main/scala/org/apache/spark/sql/rf/TileUDT.scala

@@ -74,7 +74,7 @@ case object TileUDT  {
 
   implicit def tileSerializer: CatalystSerializer[Tile] = new CatalystSerializer[Tile] {
 
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("cell_context", schemaOf[TileDataContext], false),
       StructField("cell_data", schemaOf[Cells], false)
     ))

core/src/main/scala/org/locationtech/rasterframes/encoders/StandardSerializers.scala

@@ -37,7 +37,7 @@ import org.locationtech.rasterframes.model.LazyCRS
 trait StandardSerializers {
 
   implicit val envelopeSerializer: CatalystSerializer[Envelope] = new CatalystSerializer[Envelope] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("minX", DoubleType, false),
       StructField("maxX", DoubleType, false),
       StructField("minY", DoubleType, false),
@@ -54,7 +54,7 @@ trait StandardSerializers {
   }
 
   implicit val extentSerializer: CatalystSerializer[Extent] = new CatalystSerializer[Extent] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("xmin", DoubleType, false),
       StructField("ymin", DoubleType, false),
       StructField("xmax", DoubleType, false),
@@ -72,7 +72,7 @@ trait StandardSerializers {
   }
 
   implicit val gridBoundsSerializer: CatalystSerializer[GridBounds] = new CatalystSerializer[GridBounds] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("colMin", IntegerType, false),
       StructField("rowMin", IntegerType, false),
       StructField("colMax", IntegerType, false),
@@ -92,7 +92,7 @@ trait StandardSerializers {
   }
 
   implicit val crsSerializer: CatalystSerializer[CRS] = new CatalystSerializer[CRS] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("crsProj4", StringType, false)
     ))
     override def to[R](t: CRS, io: CatalystIO[R]): R = io.create(
@@ -107,20 +107,19 @@ trait StandardSerializers {
   }
 
   implicit val cellTypeSerializer: CatalystSerializer[CellType] = new CatalystSerializer[CellType] {
-
-
-    override def schema: StructType = StructType(Seq(
+    import StandardSerializers._
+    override val schema: StructType = StructType(Seq(
       StructField("cellTypeName", StringType, false)
     ))
     override def to[R](t: CellType, io: CatalystIO[R]): R = io.create(
-      io.encode(StandardSerializers.ct2sCache.get(t))
+      io.encode(ct2sCache.get(t))
     )
     override def from[R](row: R, io: CatalystIO[R]): CellType =
-      StandardSerializers.s2ctCache.get(io.getString(row, 0))
+      s2ctCache.get(io.getString(row, 0))
   }
 
   implicit val projectedExtentSerializer: CatalystSerializer[ProjectedExtent] = new CatalystSerializer[ProjectedExtent] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("extent", schemaOf[Extent], false),
       StructField("crs", schemaOf[CRS], false)
     ))
@@ -137,7 +136,7 @@ trait StandardSerializers {
   }
 
   implicit val spatialKeySerializer: CatalystSerializer[SpatialKey] = new CatalystSerializer[SpatialKey] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("col", IntegerType, false),
       StructField("row", IntegerType, false)
     ))
@@ -154,7 +153,7 @@ trait StandardSerializers {
   }
 
   implicit val spacetimeKeySerializer: CatalystSerializer[SpaceTimeKey] = new CatalystSerializer[SpaceTimeKey] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("col", IntegerType, false),
       StructField("row", IntegerType, false),
       StructField("instant", LongType, false)
@@ -174,7 +173,7 @@ trait StandardSerializers {
   }
 
   implicit val cellSizeSerializer: CatalystSerializer[CellSize] = new CatalystSerializer[CellSize] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("width", DoubleType, false),
       StructField("height", DoubleType, false)
     ))
@@ -191,7 +190,7 @@ trait StandardSerializers {
   }
 
   implicit val tileLayoutSerializer: CatalystSerializer[TileLayout] = new CatalystSerializer[TileLayout] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("layoutCols", IntegerType, false),
       StructField("layoutRows", IntegerType, false),
       StructField("tileCols", IntegerType, false),
@@ -214,7 +213,7 @@ trait StandardSerializers {
   }
 
   implicit val layoutDefinitionSerializer = new CatalystSerializer[LayoutDefinition] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("extent", schemaOf[Extent], true),
       StructField("tileLayout", schemaOf[TileLayout], true)
     ))
@@ -231,7 +230,7 @@ trait StandardSerializers {
   }
 
   implicit def boundsSerializer[T >: Null: CatalystSerializer]: CatalystSerializer[KeyBounds[T]] = new CatalystSerializer[KeyBounds[T]] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("minKey", schemaOf[T], true),
       StructField("maxKey", schemaOf[T], true)
     ))
@@ -248,7 +247,7 @@ trait StandardSerializers {
   }
 
   def tileLayerMetadataSerializer[T >: Null: CatalystSerializer]: CatalystSerializer[TileLayerMetadata[T]] = new CatalystSerializer[TileLayerMetadata[T]] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("cellType", schemaOf[CellType], false),
       StructField("layout", schemaOf[LayoutDefinition], false),
       StructField("extent", schemaOf[Extent], false),
@@ -276,7 +275,7 @@ trait StandardSerializers {
   implicit def rasterSerializer: CatalystSerializer[Raster[Tile]] = new CatalystSerializer[Raster[Tile]] {
     import org.apache.spark.sql.rf.TileUDT.tileSerializer
 
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("tile", TileType, false),
       StructField("extent", schemaOf[Extent], false)
     ))

core/src/main/scala/org/locationtech/rasterframes/expressions/aggregates/ProjectedLayerMetadataAggregate.scala

@@ -118,7 +118,7 @@ object ProjectedLayerMetadataAggregate {
   private[expressions]
   object InputRecord {
     implicit val serializer: CatalystSerializer[InputRecord] = new CatalystSerializer[InputRecord]{
-      override def schema: StructType = StructType(Seq(
+      override val schema: StructType = StructType(Seq(
         StructField("extent", CatalystSerializer[Extent].schema, false),
         StructField("crs", CatalystSerializer[CRS].schema, false),
         StructField("cellType", CatalystSerializer[CellType].schema, false),
@@ -147,7 +147,7 @@ object ProjectedLayerMetadataAggregate {
     }
 
     def write(buffer: MutableAggregationBuffer): Unit = {
-      val encoded = (this).toRow
+      val encoded = this.toRow
       for(i <- 0 until encoded.size) {
         buffer(i) = encoded(i)
       }
@@ -157,7 +157,7 @@ object ProjectedLayerMetadataAggregate {
   private[expressions]
   object BufferRecord {
     implicit val serializer: CatalystSerializer[BufferRecord] = new CatalystSerializer[BufferRecord] {
-      override def schema: StructType = StructType(Seq(
+      override val schema: StructType = StructType(Seq(
         StructField("extent", CatalystSerializer[Extent].schema, true),
         StructField("cellType", CatalystSerializer[CellType].schema, true),
         StructField("cellSize", CatalystSerializer[CellSize].schema, true)

core/src/main/scala/org/locationtech/rasterframes/model/CellContext.scala

@@ -29,7 +29,7 @@ import CatalystSerializer._
 case class CellContext(tileContext: TileContext, tileDataContext: TileDataContext, colIndex: Short, rowIndex: Short)
 object CellContext {
   implicit val serializer: CatalystSerializer[CellContext] = new CatalystSerializer[CellContext] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("tileContext", schemaOf[TileContext], false),
       StructField("tileDataContext", schemaOf[TileDataContext], false),
       StructField("colIndex", ShortType, false),

core/src/main/scala/org/locationtech/rasterframes/model/Cells.scala

@@ -68,7 +68,7 @@ object Cells {
   }
 
   implicit def cellsSerializer: CatalystSerializer[Cells] = new CatalystSerializer[Cells] {
-    override def schema: StructType =
+    override val schema: StructType =
       StructType(
         Seq(
           StructField("cells", BinaryType, true),

core/src/main/scala/org/locationtech/rasterframes/model/TileContext.scala

@@ -41,7 +41,7 @@ object TileContext {
     case _ => None
   }
   implicit val serializer: CatalystSerializer[TileContext] = new CatalystSerializer[TileContext] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("extent", schemaOf[Extent], false),
       StructField("crs", schemaOf[CRS], false)
     ))

core/src/main/scala/org/locationtech/rasterframes/model/TileDataContext.scala

@@ -41,7 +41,7 @@ object TileDataContext {
   }
 
   implicit val serializer: CatalystSerializer[TileDataContext] = new CatalystSerializer[TileDataContext] {
-    override def schema: StructType =  StructType(Seq(
+    override val schema: StructType =  StructType(Seq(
       StructField("cellType", schemaOf[CellType], false),
       StructField("dimensions", schemaOf[TileDimensions], false)
     ))

core/src/main/scala/org/locationtech/rasterframes/model/TileDimensions.scala

@@ -38,7 +38,7 @@ object TileDimensions {
   def apply(colsRows: (Int, Int)): TileDimensions = new TileDimensions(colsRows._1, colsRows._2)
 
   implicit val serializer: CatalystSerializer[TileDimensions] = new CatalystSerializer[TileDimensions] {
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("cols", ShortType, false),
       StructField("rows", ShortType, false)
     ))

core/src/main/scala/org/locationtech/rasterframes/ref/RasterRef.scala

@@ -76,7 +76,7 @@ object RasterRef extends LazyLogging {
 
   implicit val rasterRefSerializer: CatalystSerializer[RasterRef] = new CatalystSerializer[RasterRef] {
     val rsType = new RasterSourceUDT()
-    override def schema: StructType = StructType(Seq(
+    override val schema: StructType = StructType(Seq(
       StructField("source", rsType.sqlType, false),
       StructField("bandIndex", IntegerType, false),
       StructField("subextent", schemaOf[Extent], true),