Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
[PDS-510479] Table names must go through LoggingArgs (#7077)
Browse files Browse the repository at this point in the history
`SnapshotTransaction`'s filtering limit now respects table logging safety correctly.
  • Loading branch information
jeremyk-91 authored Apr 3, 2024
1 parent 68f135a commit d409b3f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ private <T> ListenableFuture<Collection<Map.Entry<Cell, T>>> getWithPostFilterin
+ " or in the very rare case, could be due to transactions which constantly "
+ "conflict but never commit. These values will be cleaned up eventually, but"
+ " if the issue persists, ensure that sweep is caught up.",
SafeArg.of("table", tableReference),
LoggingArgs.tableRef(tableReference),
SafeArg.of("maxIterations", MAX_POST_FILTERING_ITERATIONS));
}
snapshotEventRecorder.recordCellsReturned(tableReference, resultsAccumulator.size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2998,7 +2998,7 @@ public void exceptionThrownWhenTooManyPostFilterIterationsOccur() {
.isInstanceOf(SafeIllegalStateException.class)
.hasMessageStartingWith("Unable to filter cells")
.hasExactlyArgs(
SafeArg.of("table", TABLE_NO_SWEEP),
UnsafeArg.of("tableRef", TABLE_NO_SWEEP.toString()),
SafeArg.of("maxIterations", SnapshotTransaction.MAX_POST_FILTERING_ITERATIONS));
}

Expand Down
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-7077.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: '`SnapshotTransaction`''s filtering limit now respects table logging
safety correctly.'
links:
- https://github.com/palantir/atlasdb/pull/7077

0 comments on commit d409b3f

Please sign in to comment.