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

Jump to bottom

optimize ttl (#2669) #2672

Merged
merged 2 commits into from
Apr 18, 2023
Merged

optimize ttl (#2669) #2672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677ff9e
This is an automated cherry-pick of #2669
shiyuhang0 Apr 17, 2023
4e29e4c
resolve conflict
shiyuhang0 Apr 18, 2023
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
6 changes: 5 additions & 1 deletion tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,14 @@ public class TwoPhaseCommitter {
private final ExecutorService executorService;

public TwoPhaseCommitter(TiConfiguration conf, long startTime) {
this(conf, startTime, DEFAULT_BATCH_WRITE_LOCK_TTL);
}

public TwoPhaseCommitter(TiConfiguration conf, long startTime, long lockTTL) {
this.kvClient = TiSession.getInstance(conf).createTxnClient();
this.regionManager = kvClient.getRegionManager();
this.startTs = startTime;
this.lockTTL = DEFAULT_BATCH_WRITE_LOCK_TTL;
this.lockTTL = lockTTL;
this.retryCommitSecondaryKeys = true;
this.txnPrewriteBatchSize = TXN_COMMIT_BATCH_SIZE;
this.txnCommitBatchSize = TXN_COMMIT_BATCH_SIZE;
Expand Down
5 changes: 4 additions & 1 deletion tikv-client/src/main/java/com/pingcap/tikv/allocator/RowIDAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public final class RowIDAllocator implements Serializable {
private final long step;
private long end;
private TiTimestamp timestamp;
private final long RowIDAllocatorTTL = 10000;

private static final Logger LOG = LoggerFactory.getLogger(RowIDAllocator.class);

Expand Down Expand Up @@ -141,8 +142,10 @@ private void set(@Nonnull List<BytePairWrapper> pairs, @Nonnull TiTimestamp time
if (!iterator.hasNext()) {
return;
}

TiSession session = TiSession.getInstance(conf);
TwoPhaseCommitter twoPhaseCommitter = new TwoPhaseCommitter(conf, timestamp.getVersion());
TwoPhaseCommitter twoPhaseCommitter =
new TwoPhaseCommitter(conf, timestamp.getVersion(), RowIDAllocatorTTL);
BytePairWrapper primaryPair = iterator.next();
twoPhaseCommitter.prewritePrimaryKey(
ConcreteBackOffer.newCustomBackOff(BackOffer.PREWRITE_MAX_BACKOFF),
Expand Down