Skip to content

Commit e8a9097

Browse files
committed
[#29312] YSQL: Fix test ConflictResolveKeysVerificationITest.TruncateColocatedTable
Summary: After 1e1e6d5, ConflictResolveKeysVerificationITest.TruncateColocatedTable started failing due to a change in the default isolation level in release builds. This revision fixes it. Test Plan: Jenkins: test regex: .*TruncateColocatedTable*. Reviewers: huapeng.yuan, #db-approvers, jason Reviewed By: huapeng.yuan Subscribers: svc_phabricator, yql Differential Revision: https://phorge.dev.yugabyte.com/D48178
1 parent 506e44e commit e8a9097

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.arclint

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
"(^yb_release_manifest.json$)",
5252
"(^managed/client/java/.*/pom.xml)",
5353
"(^src/yb/tools/.*pl$)",
54-
"(^yugabyted-ui/ui/package-lock.json)"
54+
"(^yugabyted-ui/ui/package-lock.json)",
55+
"(^src/yb/integration-tests/conflict_resolve_keys_verification/sql/expected/)"
5556
],
5657
"linters": {
5758
"go-files": {

src/yb/integration-tests/conflict_resolve_keys_verification/sql/expected/skip_prefix_locks_disabled/others/truncate_colocated_table.sql.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SubDocKey(DocKey(ColocationId=20000, [], []), [])
1111

1212
intent_write:
1313
Wrote 3 key/value pairs to kIntents RocksDB:
14-
1. PutCF: TXN META ********-****-****-****-************ => { transaction_id: ********-****-****-****-************ isolation: SNAPSHOT_ISOLATION status_tablet: 0 priority: 0 start_time: { physical: 0 } locality: GLOBAL old_status_tablet: skip_prefix_locks: 0 }
14+
1. PutCF: TXN META ********-****-****-****-************ => { transaction_id: ********-****-****-****-************ isolation: READ_COMMITTED status_tablet: 0 priority: 0 start_time: { physical: 0 } locality: GLOBAL old_status_tablet: skip_prefix_locks: 0 }
1515
2. PutCF: SubDocKey(DocKey(ColocationId=20000, [], []), []) [kStrongRead, kStrongWrite] HT{ days: 0 time: 0 } => TransactionId(********-****-****-****-************) WriteId(0) DEL
1616

1717

src/yb/integration-tests/conflict_resolve_keys_verification/sql/expected/skip_prefix_locks_enabled/others/truncate_colocated_table.sql.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SubDocKey(DocKey(ColocationId=20000, [], []), [])
1111

1212
intent_write:
1313
Wrote 3 key/value pairs to kIntents RocksDB:
14-
1. PutCF: TXN META ********-****-****-****-************ => { transaction_id: ********-****-****-****-************ isolation: SNAPSHOT_ISOLATION status_tablet: 0 priority: 0 start_time: { physical: 0 } locality: GLOBAL old_status_tablet: skip_prefix_locks: 1 }
14+
1. PutCF: TXN META ********-****-****-****-************ => { transaction_id: ********-****-****-****-************ isolation: READ_COMMITTED status_tablet: 0 priority: 0 start_time: { physical: 0 } locality: GLOBAL old_status_tablet: skip_prefix_locks: 1 }
1515
2. PutCF: SubDocKey(DocKey(ColocationId=20000, [], []), []) [kStrongRead, kStrongWrite] HT{ days: 0 time: 0 } => TransactionId(********-****-****-****-************) WriteId(0) DEL
1616

1717

0 commit comments

Comments
 (0)