Qbeast-io#207 Fixes for the QbeastSparkCorrectnessTest.

alexeiakimov · Aug 23, 2023 · 1960900 · 1960900
1 parent 0d39edb
commit 1960900
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/main/scala/io/qbeast/spark/delta/BlocksCodec.scala b/src/main/scala/io/qbeast/spark/delta/BlocksCodec.scala
@@ -38,7 +38,7 @@ private[delta] object BlocksCodec {
       generator.writeStringField("cubeId", block.cubeId.string)
       generator.writeStringField("state", block.state)
       generator.writeNumberField("minWeight", block.minWeight.value)
-      generator.writeNumberField("max", block.maxWeight.value)
+      generator.writeNumberField("maxWeight", block.maxWeight.value)
       generator.writeEndObject()
     }
     generator.writeEndArray()

diff --git a/src/main/scala/io/qbeast/spark/delta/DeltaQbeastSnapshot.scala b/src/main/scala/io/qbeast/spark/delta/DeltaQbeastSnapshot.scala
@@ -173,7 +173,7 @@ case class DeltaQbeastSnapshot(protected override val snapshot: Snapshot)
    */
   def loadRevisionBlocks(revisionID: RevisionID): Dataset[AddFile] = {
     if (isStaging(revisionID)) loadStagingBlocks()
-    else snapshot.allFiles.where(TagColumns.revision === lit(revisionID.toString))
+    else snapshot.allFiles.where(TagColumns.revisionId === lit(revisionID.toString))
   }
 
   /**

diff --git a/src/main/scala/io/qbeast/spark/utils/Params.scala b/src/main/scala/io/qbeast/spark/utils/Params.scala
@@ -23,6 +23,7 @@ object TagColumns {
   final val maxWeight = col("tags.maxWeight")
   final val state = col("tags.state")
   final val revision = col("tags.revision")
+  final val revisionId = col("tags.revisionId")
   final val elementCount = col("tags.elementCount")
 }