Merge pull request #624 from modelix/MODELIX-831

fix(model-datastructure): make `MapBasedStore` thread safe

Author: Oleksandr Dzhychko

kotlin-utils/src/commonMain/kotlin/org/modelix/kotlin/utils/DataStructures.kt

@@ -29,3 +29,5 @@ package org.modelix.kotlin.utils
  * Therefore, the memory efficient maps are used sparingly for only the very big maps.
  */
 expect fun <K, V> createMemoryEfficientMap(): MutableMap<K, V>
+
+expect fun <K, V> MutableMap<K, V>.toSynchronizedMap(): MutableMap<K, V>

kotlin-utils/src/jsMain/kotlin/org/modelix/kotlin/utils/DataStructures.js.kt

@@ -17,3 +17,8 @@
 package org.modelix.kotlin.utils
 
 actual fun <K, V> createMemoryEfficientMap(): MutableMap<K, V> = HashMap()
+
+actual fun <K, V> MutableMap<K, V>.toSynchronizedMap(): MutableMap<K, V> {
+    // Because JS is single-threaded, no extra measures are needed.
+    return this
+}

kotlin-utils/src/jvmMain/kotlin/org/modelix/kotlin/utils/DataStructures.jvm.kt

@@ -17,5 +17,10 @@
 package org.modelix.kotlin.utils
 
 import gnu.trove.map.hash.THashMap
+import java.util.Collections
 
 actual fun <K, V> createMemoryEfficientMap(): MutableMap<K, V> = THashMap()
+
+actual fun <K, V> MutableMap<K, V>.toSynchronizedMap(): MutableMap<K, V> {
+    return Collections.synchronizedMap(this)
+}

model-datastructure/src/commonMain/kotlin/org/modelix/model/persistent/MapBasedStore.kt

@@ -16,6 +16,7 @@
 package org.modelix.model.persistent
 
 import org.modelix.kotlin.utils.createMemoryEfficientMap
+import org.modelix.kotlin.utils.toSynchronizedMap
 import org.modelix.model.IKeyListener
 import org.modelix.model.IKeyValueStore
 import org.modelix.model.lazy.IBulkQuery
@@ -26,7 +27,7 @@ import org.modelix.model.lazy.NonBulkQuery
 open class MapBaseStore : MapBasedStore()
 
 open class MapBasedStore : IKeyValueStore {
-    private val map: MutableMap<String?, String?> = createMemoryEfficientMap()
+    private val map = createMemoryEfficientMap<String?, String?>().toSynchronizedMap()
     override fun get(key: String): String? {
         return map[key]
     }