From 1960900c7b677e1ada61638a669822d6c2886b95 Mon Sep 17 00:00:00 2001 From: Alexey Akimov Date: Thu, 24 Aug 2023 01:58:47 +0200 Subject: [PATCH] #207 Fixes for the QbeastSparkCorrectnessTest. --- src/main/scala/io/qbeast/spark/delta/BlocksCodec.scala | 2 +- src/main/scala/io/qbeast/spark/delta/DeltaQbeastSnapshot.scala | 2 +- src/main/scala/io/qbeast/spark/utils/Params.scala | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/io/qbeast/spark/delta/BlocksCodec.scala b/src/main/scala/io/qbeast/spark/delta/BlocksCodec.scala index 735d0c625..ac10e5fd2 100644 --- 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 index 270db3217..ed7f79dbe 100644 --- 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 index c8feb4949..05e3bd68d 100644 --- 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") }