Merge branch 'dev-CICD' into 2025-Pipeline-Improvement

Author: DomPeliniAerospike

.github/workflows/npm-install-script-test.yml

@@ -107,6 +107,7 @@ jobs:
       - name: Publish NPM package
         run: jf npm publish --build-name nodejs-client --build-number 6.0.2
 
+
       #- name: npm publish
       #  run: |
       #    npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/
@@ -115,6 +116,7 @@ jobs:
         run: |
           jf npm install --build-name nodejs-client --build-number 6.0.2
 
+
       - name: Simple require test
         run: |
           node -e "console.log(require('aerospike').batchType)"

.github/workflows/tests.yml

@@ -396,8 +396,20 @@ jobs:
       # Should be ready after 3 seconds
       run: sleep 3
 
+    - name: install pre-req
+      run: npm run test-prereq
+
+    - name: install mocha
+      run: |
+        npm install mocha
+        npm install typescript --save-dev;
+        npx tsc;
+        cp tests/udf.lua dist/udf.lua;
+      working-directory: ts-test
+
     - name: Run tests
-      run: npm run valgrind -- --t 40000
+      run: 
+        npm run valgrind -- --t 40000
 
 
 #  test-typescript:

.github/workflows/upload-to-jfrog.yml

@@ -70,9 +70,10 @@ jobs:
       run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/
       env:
         NEW_VERSION: 6.0.2
-        PACKAGE_MANAGER: npm
+
 
     - name: Publish build info
       if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
       run: jf rt build-publish nodejs-client 6.0.2
 
+

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.0.2]
+* **New Features**
+  * [CLIENT-3243] - Added TXN_ALREADY_COMMITTED and TXN_ALREADY_ABORTED error codes.
+  * [CLIENT-3267] - Added MRT_ALREADY_LOCKED and MRT_MONITOR_EXISTS error codes.
+
+* **Bug Fixes**
+  * [CLIENT-3306] - Added the following missing error codes:
+    * ERR_MAX_RETRIES_EXCEEDED
+    * MRT_TOO_MANY_WRITES
+    * NOT_WHITELISTED
+    * QUOTA_EXCEEDED
+
+* **Improvements**
+  * [CLIENT-3244] - Removed commitStatus.ALREADY_ABORTED and abortStatus.ALREADY_COMMITTED
+  * [CLIENT-3277] - Exception is now thrown when aborting a committed transaction.
+  * [CLIENT-3277] - Exception is now thrown when committing an aborted transaciton.
+  * [CLIENT-3291] - Default client MRT timeout to zero.
+
+## [6.0.1]
+* **Bug Fixes**
+  * [CLIENT-3235] - Fixed version mismatch with the windows C++ add-on which caused the client to fail on windows.
+
+## [6.0.0]
+* **Description**
+  * The new features in this release require server version 8.0.0 or above.
+
+* **New Features**
+  * [CLIENT-3181] - Added support for multi-record transactions (MRTs). Requires server version 8.0.0 or above.
+
 ## [5.13.2]
 * **Bug Fixes**
   * [CLIENT-3155] - Fixed typescript compilation by removing the protected modifier from the ExpOperation class.

aerospike-client-c

@@ -21,7 +21,6 @@ const abortStatus = as.abortStatus
 
 module.exports = {
   OK: abortStatus.OK,
-  ALREADY_COMMITTED: abortStatus.ALREADY_COMMITTED,
   ALREADY_ABORTED: abortStatus.ALREADY_ABORTED,
   ROLL_BACK_ABANDONED: abortStatus.ROLL_BACK_ABANDONED,
   CLOSE_ABANDONED: abortStatus.CLOSE_ABANDONED

lib/abort_status.js

@@ -22,9 +22,10 @@ const EventEmitter = require('events')
 
 const as = require('bindings')('aerospike.node')
 const AerospikeError = require('./error')
+const status = require('./status')
+const txnState = require('./txn_state')
 const abortStatus = require('./abort_status')
 const commitStatus = require('./commit_status')
-const txnState = require('./txn_state')
 const Transaction = require('./transaction')
 const Context = require('./cdt_context')
 const Commands = require('./commands')
@@ -220,7 +221,9 @@ Client.prototype.abort = function (transaction, callback) {
   _transactionPool.tendTransactions()
   if (transaction instanceof Transaction) {
     if (transaction.getState() === txnState.COMMITTED) {
-      return abortStatus.ALREADY_COMMITTED
+      const err = new AerospikeError('The transaction has already been committed.')
+      err.code = status.TXN_ALREADY_COMMITTED
+      throw err
     } else if (transaction.getState() === txnState.ABORTED) {
       return abortStatus.ALREADY_ABORTED
     } else if (transaction.getDestroyed() === true) {
@@ -239,7 +242,9 @@ Client.prototype.commit = function (transaction, callback) {
     if (transaction.getState() === txnState.COMMITTED) {
       return commitStatus.ALREADY_COMMITTED
     } else if (transaction.getState() === txnState.ABORTED) {
-      return commitStatus.ALREADY_ABORTED
+      const err = new AerospikeError('The transaction has already been aborted.')
+      err.code = status.TXN_ALREADY_ABORTED
+      throw err
     } else if (transaction.getDestroyed() === true) {
       throw new AerospikeError('The object has been destroyed, please create a new transaction.')
     }

lib/client.js

@@ -22,7 +22,6 @@ const commitStatus = as.commitStatus
 module.exports = {
   OK: commitStatus.OK,
   ALREADY_COMMITTED: commitStatus.ALREADY_COMMITTED,
-  ALREADY_ABORTED: commitStatus.ALREADY_ABORTED,
   VERIFY_FAILED: commitStatus.VERIFY_FAILED,
   MARK_ROLL_FORWARD_ABANDONED: commitStatus.MARK_ROLL_FORWARD_ABANDONED,
   ROLL_FORWARD_ABANDONED: commitStatus.ROLL_FORWARD_ABANDONED,