fix: handle null values in opData (#43)

* fix: handle null values in opData

* chore: pr feedback

---------

Co-authored-by: DominicGBauer <[email protected]>

Author: DominicGBauer

core/src/commonMain/kotlin/com/powersync/bucket/BucketStorage.kt

@@ -7,18 +7,15 @@ import com.powersync.sync.SyncDataBatch
 import com.powersync.sync.SyncLocalDatabaseResult
 import co.touchlab.stately.concurrency.AtomicBoolean
 import kotlinx.serialization.encodeToString
-import com.benasher44.uuid.uuid4
 import com.powersync.db.internal.InternalTable
 import com.powersync.utils.JsonUtil
-import kotlinx.coroutines.runBlocking
 
 internal class BucketStorage(
     private val db: PsInternalDatabase,
     private val logger: Logger
 ) {
     private val tableNames: MutableSet<String> = mutableSetOf()
     private var hasCompletedSync = AtomicBoolean(false)
-    private var checksumCache: ChecksumCache? = null
     private var pendingBucketDeletes = AtomicBoolean(false)
 
     /**
@@ -200,7 +197,7 @@ internal class BucketStorage(
         )
     }
 
-    suspend fun validateChecksums(checkpoint: Checkpoint): SyncLocalDatabaseResult {
+    private suspend fun validateChecksums(checkpoint: Checkpoint): SyncLocalDatabaseResult {
         val res = db.getOptional(
             "SELECT powersync_validate_checkpoint(?) as result",
             parameters = listOf(JsonUtil.json.encodeToString(checkpoint)),
@@ -232,7 +229,7 @@ internal class BucketStorage(
         }
     }
 
-    suspend fun forceCompact() {
+    private suspend fun forceCompact() {
         // Reset counter
         this.compactCounter = COMPACT_OPERATION_INTERVAL
         this.pendingBucketDeletes.value = true
@@ -241,7 +238,7 @@ internal class BucketStorage(
     }
 
 
-    suspend fun autoCompact() {
+    private suspend fun autoCompact() {
         // 1. Delete buckets
         deletePendingBuckets()
 

core/src/commonMain/kotlin/com/powersync/db/crud/CrudEntry.kt

@@ -1,6 +1,7 @@
 package com.powersync.db.crud
 
 import com.powersync.utils.JsonUtil
+import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 
@@ -51,7 +52,7 @@ public data class CrudEntry(
      *
      * For DELETE, this is null.
      */
-    val opData: Map<String, String>?
+    val opData: Map<String, String?>?
 ) {
     public companion object {
         public fun fromRow(row: CrudRow): CrudEntry {
@@ -60,7 +61,9 @@ public data class CrudEntry(
                 id = data["id"]!!.jsonPrimitive.content,
                 clientId = row.id.toInt(),
                 op = UpdateType.fromJsonChecked(data["op"]!!.jsonPrimitive.content),
-                opData = data["data"]?.jsonObject?.mapValues { it.value.jsonPrimitive.content },
+                opData = data["data"]?.jsonObject?.mapValues { (_, value) ->
+                    value.jsonPrimitive.contentOrNull
+                },
                 table = data["type"]!!.jsonPrimitive.content,
                 transactionId = row.txId,
             )
@@ -71,4 +74,4 @@ public data class CrudEntry(
         return "CrudEntry<$transactionId/$clientId ${op.toJson()} $table/$id $opData>"
     }
 
-}
+}