Fix issues with descending scans. Set ScanRange properly.

marykdb · Feb 26, 2025 · bbe6886 · bbe6886
1 parent 6301cb4
commit bbe6886
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/core/src/commonMain/kotlin/maryk/core/processors/datastore/scanRange/ScanRange.kt b/core/src/commonMain/kotlin/maryk/core/processors/datastore/scanRange/ScanRange.kt
@@ -40,8 +40,8 @@ data class ScanRange internal constructor(
         when {
             startKey != null && (end == null || end.isEmpty() || startKey < end) ->
                 if (inclusiveStartKey) startKey else startKey.prevByteInSameLength()
-            endInclusive -> end
-            else -> end?.prevByteInSameLength()
+            endInclusive -> end?.nextByteInSameLength()
+            else -> end
         }
 
     /** Get the ascending start key for scans */

diff --git a/store/memory/src/commonMain/kotlin/maryk/datastore/memory/processors/scanIndex.kt b/store/memory/src/commonMain/kotlin/maryk/datastore/memory/processors/scanIndex.kt
@@ -93,7 +93,7 @@ internal fun <DM : IsRootDataModel> scanIndex(
 
             for (indexRange in indexScanRange.ranges.reversed()) {
                 val lastKey = indexRange.getDescendingStartKey(startKey, scanRequest.includeStart)?.let {
-                    if (indexRange.endInclusive && indexRange.end === it) byteArrayOf() else it
+                    if (indexRange.endInclusive && indexRange.end === it) null else it
                 }
 
                 val startIndex = lastKey?.let { endRange ->

diff --git a/store/rocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/processors/scanIndex.kt b/store/rocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/processors/scanIndex.kt
@@ -99,7 +99,7 @@ internal fun <DM : IsRootDataModel> scanIndex(
             for (indexRange in indexScanRange.ranges.reversed()) {
                 val indexStartKey = indexRange.getDescendingStartKey(startKey, keyScanRange.includeStart)?.let {
                     // If was not highered it was not possible so scan to lastIndex
-                    if (indexRange.endInclusive && indexRange.end === it) byteArrayOf() else it
+                    if (indexRange.endInclusive && indexRange.end === it) null else it
                 }
 
                 if (indexStartKey == null || indexStartKey.isEmpty()) {

diff --git a/store/shared/src/commonMain/kotlin/maryk/datastore/shared/optimizeTableScan.kt b/store/shared/src/commonMain/kotlin/maryk/datastore/shared/optimizeTableScan.kt
@@ -55,7 +55,7 @@ fun <DM: IsRootDataModel> DM.optimizeTableScan(
     val minimumKeyScanByteRange = this.Meta.minimumKeyScanByteRange ?: this.Meta.keyByteSize.toUInt()
 
     if (keyScanRanges.equalBytes < minimumKeyScanByteRange) {
-        throw StorageException("Key scan bytes (${keyScanRanges.equalBytes}) must be more or equal than minimum key scan bytes ($minimumKeyScanByteRange). Or set an order to guide scan to an index")
+        throw StorageException("${this.Meta.name}: Key scan bytes (${keyScanRanges.equalBytes}) must be more or equal than minimum key scan bytes ($minimumKeyScanByteRange). Or set an order to guide scan to an index")
     }
 
     return tableScan

diff --git a/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanMultiTypeTest.kt b/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanMultiTypeTest.kt
@@ -172,7 +172,7 @@ class DataStoreScanMultiTypeTest(
             index = byteArrayOf(17),
             direction = Direction.ASC,
             startKey = byteArrayOf(0, -36),
-            stopKey = byteArrayOf(0, -36),
+            stopKey = byteArrayOf(0, -35),
         )) { scanResponse.dataFetchType }
 
         // Mind that Measurement is sorted in reverse, so it goes back in time going forward
@@ -269,7 +269,7 @@ class DataStoreScanMultiTypeTest(
             index = byteArrayOf(26, 17, 21, 9),
             direction = Direction.ASC,
             startKey = byteArrayOf(0, -86),
-            stopKey = byteArrayOf(0, -76),
+            stopKey = byteArrayOf(0, -75),
         )) { scanResponse.dataFetchType }
 
         // Reverse order

diff --git a/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanOnIndexTest.kt b/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanOnIndexTest.kt
@@ -317,7 +317,7 @@ class DataStoreScanOnIndexTest(
             direction = Direction.ASC,
             index = byteArrayOf(10, 17),
             startKey = byteArrayOf(0, 2),
-            stopKey = byteArrayOf(0, 2),
+            stopKey = byteArrayOf(0, 3),
         )) { scanResponse.dataFetchType }
 
         scanResponse.values[0].let {
@@ -369,11 +369,10 @@ class DataStoreScanOnIndexTest(
         expect(FetchByIndexScan(
             direction = Direction.DESC,
             index = byteArrayOf(10, 17),
-            startKey = byteArrayOf(0, 2),
+            startKey = byteArrayOf(0, 3),
             stopKey = byteArrayOf(),
         )) { scanResponse.dataFetchType }
 
-
         scanResponse.values[0].let {
             expect(logs[1]) { it.values }
             expect(keys[1]) { it.key }

diff --git a/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanOnIndexWithPersonTest.kt b/store/test/src/commonMain/kotlin/maryk/datastore/test/DataStoreScanOnIndexWithPersonTest.kt
@@ -108,7 +108,7 @@ class DataStoreScanOnIndexWithPersonTest(
             direction = Direction.ASC,
             index = byteArrayOf(4, 2, 10, 17, 2, 10, 9),
             startKey = byteArrayOf(75, 97, 115, 116, 101, 110, 115),
-            stopKey = byteArrayOf(75, 97, 115, 116, 101, 110, 115),
+            stopKey = byteArrayOf(75, 97, 115, 116, 101, 110, 116),
         )) { scanResponse.dataFetchType }
 
         // Sorted on name
@@ -137,7 +137,7 @@ class DataStoreScanOnIndexWithPersonTest(
             direction = Direction.ASC,
             index = byteArrayOf(4, 2, 10, 17, 2, 10, 9),
             startKey = byteArrayOf(75, 97, 115, 116, 101, 110, 115, 75, 97, 114, 101, 108),
-            stopKey = byteArrayOf(75, 97, 115, 116, 101, 110, 115, 75, 97, 114, 101, 108),
+            stopKey = byteArrayOf(75, 97, 115, 116, 101, 110, 115, 75, 97, 114, 101, 109),
         )) { scanResponse.dataFetchType }
 
         // Sorted on name