improvements in ExposedReadKeyValuesRepo

0.20.5

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.20.6
+
+* `Repos`:
+    * `Exposed`
+        * Fixes in exposed key-values repos
+
+## 0.20.5
+
+* `Coroutines`:
+    * Fixes in `SmartRWLocker`
+
 ## 0.20.4
 
 * `Versions`:

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartRWLocker.kt

@@ -37,8 +37,8 @@ class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked:
      * Locking [writeMutex] and wait while all [readSemaphore] permits will be freed
      */
     suspend fun lockWrite() {
-        _readSemaphore.acquire(readPermits)
         _writeMutex.lock()
+        _readSemaphore.acquire(readPermits)
     }
 
     /**

gradle.properties

@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.20.4
-android_code_version=210
+version=0.20.6
+android_code_version=212

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractExposedReadKeyValuesRepo.kt

@@ -1,12 +1,10 @@
 package dev.inmo.micro_utils.repos.exposed.onetomany
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
 import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
 import dev.inmo.micro_utils.repos.exposed.*
 import dev.inmo.micro_utils.repos.exposed.utils.selectPaginated
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
 
 abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
@@ -73,4 +71,26 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
     override suspend fun contains(k: Key, v: Value): Boolean = transaction(database) {
         select { selectById(k).and(selectByValue(v)) }.limit(1).any()
     }
+
+    override suspend fun getAll(reverseLists: Boolean): Map<Key, List<Value>> = transaction(database) {
+        val query = if (reverseLists) {
+            selectAll().orderBy(keyColumn, SortOrder.DESC)
+        } else {
+            selectAll()
+        }
+        query.asSequence().map { it.asKey to it.asObject }.groupBy { it.first }.mapValues {
+            it.value.map { it.second }
+        }
+    }
+
+    override suspend fun getAll(k: Key, reverseLists: Boolean): List<Value> = transaction(database) {
+        val query = if (reverseLists) {
+            select { selectById(k) }.orderBy(keyColumn, SortOrder.DESC)
+        } else {
+            select { selectById(k) }
+        }
+        query.map {
+            it.asObject
+        }
+    }
 }