Merge pull request #7 from reugn/develop

v0.6.0

Author: reugn

.github/workflows/build.yml

@@ -1,6 +1,8 @@
 name: Build
 on:
   push:
+    branches:
+      - '**'
   pull_request:
     branches:
       - main
@@ -11,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 8
@@ -23,7 +25,7 @@ jobs:
         uses: reugn/github-action-aerospike@v1
 
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

build.gradle.kts

@@ -1,7 +1,8 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    kotlin("jvm") version "2.1.0"
     `maven-publish`
     signing
 }
@@ -17,12 +18,12 @@ java {
     withSourcesJar()
 }
 
-extra["aerospikeClientVersion"] = "7.1.0"
-extra["kotlinxCoroutinesVersion"] = "1.7.3"
-extra["nettyVersion"] = "4.1.97.Final"
+extra["aerospikeClientVersion"] = "9.0.2"
+extra["kotlinxCoroutinesVersion"] = "1.10.1"
+extra["nettyVersion"] = "4.1.116.Final"
 
 dependencies {
-    implementation("com.aerospike:aerospike-client:${project.extra["aerospikeClientVersion"]}")
+    implementation("com.aerospike:aerospike-client-jdk8:${project.extra["aerospikeClientVersion"]}")
     implementation("io.netty:netty-transport:${project.extra["nettyVersion"]}")
     implementation("io.netty:netty-transport-native-epoll:${project.extra["nettyVersion"]}")
     implementation("io.netty:netty-transport-native-kqueue:${project.extra["nettyVersion"]}")
@@ -36,8 +37,10 @@ tasks.test {
     useJUnitPlatform()
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+tasks.withType<KotlinJvmCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
 }
 
 tasks.withType<JavaCompile> {

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style=official
-version=0.5.0
+version=0.6.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew.bat

@@ -1,12 +1,6 @@
 package io.github.reugn.aerospike.kotlin
 
-import com.aerospike.client.BatchRecord
-import com.aerospike.client.BatchResults
-import com.aerospike.client.Bin
-import com.aerospike.client.IAerospikeClient
-import com.aerospike.client.Key
-import com.aerospike.client.Operation
-import com.aerospike.client.Record
+import com.aerospike.client.*
 import com.aerospike.client.cluster.Node
 import com.aerospike.client.policy.*
 import com.aerospike.client.query.KeyRecord
@@ -96,6 +90,7 @@ class AerospikeAsyncClient(
         return listener.await()!!
     }
 
+    @Suppress("kotlin:S6518")
     override suspend fun get(policy: Policy?, key: Key, vararg binNames: String): Record? {
         val listener = KotlinRecordListener()
         if (binNames.isNotEmpty()) {
@@ -169,6 +164,18 @@ class AerospikeAsyncClient(
         return listener.await()!!
     }
 
+    override suspend fun commit(txn: Txn): CommitStatus {
+        val listener = KotlinCommitListener()
+        client.commit(null, listener, txn)
+        return listener.await()!!
+    }
+
+    override suspend fun abort(txn: Txn): AbortStatus {
+        val listener = KotlinAbortListener()
+        client.abort(null, listener, txn)
+        return listener.await()!!
+    }
+
     override suspend fun scanNodeName(
         policy: ScanPolicy?,
         nodeName: String,

src/main/kotlin/io/github/reugn/aerospike/kotlin/AerospikeAsyncClient.kt

@@ -1,12 +1,6 @@
 package io.github.reugn.aerospike.kotlin
 
-import com.aerospike.client.BatchRecord
-import com.aerospike.client.BatchResults
-import com.aerospike.client.Bin
-import com.aerospike.client.IAerospikeClient
-import com.aerospike.client.Key
-import com.aerospike.client.Operation
-import com.aerospike.client.Record
+import com.aerospike.client.*
 import com.aerospike.client.cluster.Node
 import com.aerospike.client.policy.*
 import com.aerospike.client.query.KeyRecord
@@ -99,6 +93,14 @@ interface IAerospikeAsyncClient : Closeable {
 
     suspend fun operateBatchRecord(policy: BatchPolicy?, records: Collection<BatchRecord>): Boolean
 
+    //-------------------------------------------------------
+    // Multi-Record Transactions
+    //-------------------------------------------------------
+
+    suspend fun commit(txn: Txn): CommitStatus
+
+    suspend fun abort(txn: Txn): AbortStatus
+
     //-------------------------------------------------------
     // Scan/Query Operations
     //-------------------------------------------------------

src/main/kotlin/io/github/reugn/aerospike/kotlin/IAerospikeAsyncClient.kt

@@ -0,0 +1,10 @@
+package io.github.reugn.aerospike.kotlin.listener
+
+import com.aerospike.client.AbortStatus
+import com.aerospike.client.listener.AbortListener
+
+class KotlinAbortListener : BaseListener<AbortStatus>(), AbortListener {
+    override fun onSuccess(status: AbortStatus?) {
+        success(status)
+    }
+}

src/main/kotlin/io/github/reugn/aerospike/kotlin/listener/KotlinAbortListener.kt

@@ -0,0 +1,15 @@
+package io.github.reugn.aerospike.kotlin.listener
+
+import com.aerospike.client.AerospikeException
+import com.aerospike.client.CommitStatus
+import com.aerospike.client.listener.CommitListener
+
+class KotlinCommitListener : BaseListener<CommitStatus>(), CommitListener {
+    override fun onSuccess(status: CommitStatus?) {
+        success(status)
+    }
+
+    override fun onFailure(exception: AerospikeException.Commit?) {
+        failure(exception)
+    }
+}