Skip to content

refactor getRegionStoreClientBuilder to improve readability #349

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

Merged
ti-srebot merged 2 commits into from
Nov 29, 2021
Merged

refactor getRegionStoreClientBuilder to improve readability #349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36b5a7
refactor getRegionStoreClientBuilder to improve readability
zz-jason Nov 28, 2021
c430e0d
Merge branch 'master' into refactor/getRegionStoreClientBuilder
ti-srebot Nov 29, 2021
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
30 changes: 13 additions & 17 deletions src/main/java/org/tikv/common/TiSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.tikv.common.meta.TiTimestamp;
import org.tikv.common.region.RegionManager;
import org.tikv.common.region.RegionStoreClient;
import org.tikv.common.region.RegionStoreClient.RegionStoreClientBuilder;
import org.tikv.common.region.TiRegion;
import org.tikv.common.region.TiStore;
import org.tikv.common.util.*;
Expand Down Expand Up @@ -124,17 +123,13 @@ public static TiSession getInstance(TiConfiguration conf) {
public RawKVClient createRawClient() {
checkIsClosed();

RegionStoreClientBuilder builder =
new RegionStoreClientBuilder(conf, channelFactory, this.getRegionManager(), client);
return new RawKVClient(this, builder);
return new RawKVClient(this, this.getRegionStoreClientBuilder());
}

public KVClient createKVClient() {
checkIsClosed();

RegionStoreClientBuilder builder =
new RegionStoreClientBuilder(conf, channelFactory, this.getRegionManager(), client);
return new KVClient(conf, builder, this);
return new KVClient(this.conf, this.getRegionStoreClientBuilder(), this);
}

public TxnKVClient createTxnClient() {
Expand All @@ -146,18 +141,19 @@ public TxnKVClient createTxnClient() {
public RegionStoreClient.RegionStoreClientBuilder getRegionStoreClientBuilder() {
checkIsClosed();

RegionStoreClient.RegionStoreClientBuilder res = clientBuilder;
if (res == null) {
synchronized (this) {
if (clientBuilder == null) {
clientBuilder =
new RegionStoreClient.RegionStoreClientBuilder(
conf, this.channelFactory, this.getRegionManager(), this.getPDClient());
}
res = clientBuilder;
if (this.clientBuilder != null) {
return this.clientBuilder;
}

// lazily create the clientBuilder for the current TiSession
synchronized (this) {
if (this.clientBuilder == null) {
this.clientBuilder =
new RegionStoreClient.RegionStoreClientBuilder(
this.conf, this.channelFactory, this.getRegionManager(), this.getPDClient());
}
}
return res;
return this.clientBuilder;
}

public ImporterStoreClient.ImporterStoreClientBuilder getImporterRegionStoreClientBuilder() {
Expand Down