Skip to content

Handle ix_addk rcode correctly during master swing #6132

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

Open
riverszhang89 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle ix_addk rcode correctly during master swing #6132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions db/indices.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,15 @@ int add_record_indices(struct ireq *iq, void *trans, blob_buffer_t *blobs,
goto done;
} else if (rc != 0) {
*ixfailnum = ixnum;
/* If following changes, update OSQL_INSREC in osqlcomm.c */
*opfailcode = OP_FAILED_UNIQ; /* really? */

// If this transaction has already added this key and adding this key again
// violates a duplicate key constraint, then this txn is uncommittable.
if (dup_txn_insert == 1) {
iq->dup_key_insert = 1;
if (rc == IX_DUP) {
*opfailcode = OP_FAILED_UNIQ;
// If this transaction has already added this key and adding this key again
// violates a duplicate key constraint, then this txn is uncommittable.
if (dup_txn_insert) {
iq->dup_key_insert = 1;
}
} else {
*opfailcode = OP_FAILED_INTERNAL;
}

ERR(rc, "add error", 0);
Expand Down
1 change: 1 addition & 0 deletions db/osqlblockproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,7 @@ static int apply_changes(struct ireq *iq, blocksql_tran_t *tran, void *iq_tran,

if (iq->vfy_idx_track) {
hash_clear(iq->vfy_idx_hash);
iq->dup_key_insert = 0;
}

/* create a cursor */
Expand Down
Loading