Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLIENT-3205] Multi record transactions: support correct server error codes for MRTs #701

Merged
merged 5 commits into from
Dec 9, 2024
Merged

[CLIENT-3205] Multi record transactions: support correct server error codes for MRTs #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
213731f
update c client again
juliannguyen4 Dec 4, 2024
5dd10ff
Update again
juliannguyen4 Dec 6, 2024
f096647
Merge remote-tracking branch 'origin/dev' into CLIENT-3205-mrt-update…
juliannguyen4 Dec 6, 2024
856506a
add client error
juliannguyen4 Dec 6, 2024
6e9d8f1
just fix in workflow
juliannguyen4 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ jobs:
ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }}

# Need to be able to save Docker Hub credentials to keychain
- if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }}
# Unable to do this via the ansible script for self hosted mac m1 runners
- if: ${{ inputs.platform-tag == 'macosx_arm64' }}
run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }}

- uses: ./.github/actions/run-ee-server
Expand Down
2 changes: 1 addition & 1 deletion aerospike-client-c
Open in desktop
Submodule aerospike-client-c updated 16 files
+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
2 changes: 2 additions & 0 deletions src/main/exception.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading