Merge remote-tracking branch 'origin/dev' into macos-use-delvewheel

aerospike · Dec 9, 2024 · 30219ea · 30219ea
2 parents 3dd2754 + d5bc2d6
commit 30219ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-16.0.0rc3.dev1
+16.0.0rc3.dev2
diff --git a/aerospike-client-c b/aerospike-client-c
diff --git a/src/main/exception.c b/src/main/exception.c
@@ -111,6 +111,8 @@ struct exception_def exception_defs[] = {
                   AEROSPIKE_ERR_ASYNC_CONNECTION, NULL),
     EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_CLIENT_ABORT, NULL),
+    EXCEPTION_DEF("TranactionFailed", CLIENT_ERR_EXCEPTION_NAME,
+                  AEROSPIKE_TXN_FAILED, NULL),
     // Server errors
     EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_REQUEST_INVALID, NULL),
+38 −33		src/include/aerospike/as_status.h
+4 −4		src/include/aerospike/as_txn.h
+1 −1		src/include/aerospike/version.h
+0 −3		src/main/aerospike/aerospike_batch.c
+0 −3		src/main/aerospike/aerospike_key.c
+14 −3		src/main/aerospike/aerospike_txn.c
+7 −6		src/main/aerospike/as_error.c
+2 −1		src/main/aerospike/as_txn.c
+1 −10		src/main/aerospike/as_txn_monitor.c
+1 −1		src/main/aerospike/version.c
+28 −13		src/test/aerospike_test.c
+6 −0		src/test/transaction.c
+6 −0		src/test/transaction_async.c
+1 −1		vs/aerospike-client-c-libevent.nuspec
+1 −1		vs/aerospike-client-c-libuv.nuspec
+1 −1		vs/aerospike-client-c.nuspec