Remove the need of a second recyclableByteArray

marykdb · Sep 20, 2024 · 3134aef · 3134aef
1 parent bb85157
commit 3134aef
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 13 deletions.
diff --git a/.../kotlin/maryk/lib/RecyclableByteArrays.kt → ...n/kotlin/maryk/lib/RecyclableByteArray.kt b/.../kotlin/maryk/lib/RecyclableByteArrays.kt → ...n/kotlin/maryk/lib/RecyclableByteArray.kt
@@ -4,6 +4,3 @@ import kotlin.native.concurrent.ThreadLocal
 
 @ThreadLocal
 actual val recyclableByteArray = ByteArray(10000)
-
-@ThreadLocal
-actual val recyclableByteArray2 = ByteArray(10000)
diff --git a/lib/src/commonMain/kotlin/maryk/lib/RecyclableByteArrays.kt b/lib/src/commonMain/kotlin/maryk/lib/RecyclableByteArrays.kt
@@ -2,6 +2,3 @@ package maryk.lib
 
 /** Short term recyclable byte array which is thread local */
 expect val recyclableByteArray: ByteArray
-
-/** Secondary short term recyclable byte array which is thread local */
-expect val recyclableByteArray2: ByteArray
diff --git a/lib/src/jsMain/kotlin/maryk/lib/RecyclableByteArrays.kt b/lib/src/jsMain/kotlin/maryk/lib/RecyclableByteArrays.kt
@@ -1,5 +1,3 @@
 package maryk.lib
 
 actual val recyclableByteArray = ByteArray(10000)
-
-actual val recyclableByteArray2 = ByteArray(10000)
diff --git a/lib/src/jvmMain/kotlin/maryk/lib/RecyclableByteArray.kt b/lib/src/jvmMain/kotlin/maryk/lib/RecyclableByteArray.kt
@@ -1,7 +1,5 @@
 package maryk.lib
 
 val localB1 = ThreadLocal.withInitial { ByteArray(10000) }!!
-val localB2 = ThreadLocal.withInitial { ByteArray(10000) }!!
 
 actual val recyclableByteArray get() = localB1.get()!!
-actual val recyclableByteArray2 get() = localB2.get()!!
diff --git a/...ocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/processors/helpers/getLastVersion.kt b/...ocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/processors/helpers/getLastVersion.kt
@@ -7,7 +7,6 @@ import maryk.datastore.rocksdb.DBAccessor
 import maryk.datastore.rocksdb.TableColumnFamilies
 import maryk.datastore.rocksdb.processors.LAST_VERSION_INDICATOR
 import maryk.lib.recyclableByteArray
-import maryk.lib.recyclableByteArray2
 import org.rocksdb.ReadOptions
 import org.rocksdb.RocksDB
 
@@ -18,11 +17,11 @@ internal fun <DM: IsRootDataModel> getLastVersion(dbAccessor: DBAccessor, column
     key.bytes.copyInto(recyclableByteArray)
     recyclableByteArray[key.bytes.size] = LAST_VERSION_INDICATOR
 
-    val valueLength = dbAccessor.get(columnFamilies.table, readOptions, recyclableByteArray, 0, key.size + 1, recyclableByteArray2)
+    val valueLength = dbAccessor.get(columnFamilies.table, readOptions, recyclableByteArray, 0, key.size + 1, recyclableByteArray, key.size + 2, recyclableByteArray.size - (key.size + 2))
 
     if (valueLength == RocksDB.NOT_FOUND) {
         throw StorageException("Can only retrieve last versions of existing objects")
     }
 
-    return recyclableByteArray2.readVersionBytes()
+    return recyclableByteArray.readVersionBytes(key.size + 2)
 }