Merge pull request #109 from touchlab/MohamadJaara-feat/implement-com…

…puteIfAbsent Mohamad jaara feat/implement compute if absent
touchlab · Dec 3, 2023 · f77b367 · f77b367
2 parents 806daf6 + 6a3c7e8
commit f77b367
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,49 @@
+name: deploy
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: "adopt"
+          java-version: "17"
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Cache konan
+        uses: actions/cache@v2
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Publish Mac/Windows Artifacts
+        run: ./gradlew build --no-daemon --stacktrace --no-build-cache
+        env:
+          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+
+env:
+  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
diff --git a/stately-concurrent-collections/api/stately-concurrent-collections.api b/stately-concurrent-collections/api/stately-concurrent-collections.api
@@ -49,6 +49,7 @@ public final class co/touchlab/stately/collections/ConcurrentMutableMap : java/u
 	public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public fun putAll (Ljava/util/Map;)V
 	public fun remove (Ljava/lang/Object;)Ljava/lang/Object;
+	public final fun safeComputeIfAbsent (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public final fun size ()I
 	public final fun values ()Ljava/util/Collection;
 }

diff --git a/...collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt b/...collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt
@@ -2,11 +2,13 @@ package co.touchlab.stately.collections
 
 import co.touchlab.stately.concurrency.Synchronizable
 import co.touchlab.stately.concurrency.synchronize
+import kotlin.jvm.JvmName
 
 class ConcurrentMutableMap<K, V> internal constructor(
     rootArg: Synchronizable? = null,
     private val del: MutableMap<K, V>
 ) : Synchronizable(), MutableMap<K, V> {
+
     constructor() : this(null, mutableMapOf())
 
     private val syncTarget: Synchronizable = rootArg ?: this
@@ -28,6 +30,24 @@ class ConcurrentMutableMap<K, V> internal constructor(
         syncTarget.synchronize { del.clear() }
     }
 
+    /**
+     * If the specified key is not already associated with a value
+     * attempts to compute its value using the given mapping function and enters it into this map
+     */
+    @JvmName("safeComputeIfAbsent")
+    fun computeIfAbsent(key: K, defaultValue: (K) -> V): V {
+        return syncTarget.synchronize {
+            val value = del[key]
+            if (value == null) {
+                val newValue = defaultValue(key)
+                del[key] = newValue
+                newValue
+            } else {
+                value
+            }
+        }
+    }
+
     override fun put(key: K, value: V): V? = syncTarget.synchronize { del.put(key, value) }
     override fun putAll(from: Map<out K, V>) {
         syncTarget.synchronize { del.putAll(from) }

diff --git a/...ections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt b/...ections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt
@@ -1,5 +1,8 @@
 package co.touchlab.stately.collections
 
+import co.touchlab.stately.concurrency.AtomicInt
+import co.touchlab.testhelp.concurrency.sleep
+import kotlinx.coroutines.delay
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -68,4 +71,21 @@ class ConcurrentMutableMapTest {
 
         assertEquals(map.size, DEFAULT_RUNS * 2)
     }
+
+    @Test
+    @NoJsTest
+    fun computeIfAbsent() {
+        val map = ConcurrentMutableMap<String, SomeData>()
+        val count = AtomicInt(0)
+
+        runAlot(1) { run ->
+            map.computeIfAbsent("key") {
+                sleep(1000)
+                count.incrementAndGet()
+                SomeData("value $run")
+            }
+        }
+
+        assertEquals(count.get(), 1)
+    }
 }