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

[close #419] upgrade kvproto to fix rawBatchPut compatibility #441

Merged
merged 5 commits into from
Dec 31, 2021
Merged

[close #419] upgrade kvproto to fix rawBatchPut compatibility #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ac488e
upgrade kvproto to fix batch put
iosmanthus Dec 24, 2021
0030aa8
use pingcap kvproto
iosmanthus Dec 24, 2021
428b5d9
Merge branch 'master' into fix-batch-put
zz-jason Dec 30, 2021
a0e6941
Merge branch 'master' into fix-batch-put
iosmanthus Dec 30, 2021
bad931f
Merge branch 'master' into fix-batch-put
zz-jason Dec 30, 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
2 changes: 1 addition & 1 deletion scripts/proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

kvproto_hash=d62ddcee4ccd95f19f3ffa89c2832f2fb81030ca
kvproto_hash=d1a140660c39b03e549e92933b6591a9aadc62aa
raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926
tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/tikv/common/region/RegionStoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@

/** Note that RegionStoreClient itself is not thread-safe */
public class RegionStoreClient extends AbstractRegionStoreClient {

private static final Logger logger = LoggerFactory.getLogger(RegionStoreClient.class);
@VisibleForTesting public final AbstractLockResolverClient lockResolverClient;
private final TiStoreType storeType;
Expand Down Expand Up @@ -1042,6 +1043,7 @@ public void rawBatchPut(
RawBatchPutRequest.newBuilder()
.setContext(makeContext(storeType))
.addAllPairs(kvPairs)
.setTtl(ttl)
.addTtls(ttl)
.setForCas(atomicForCAS)
.build();
Expand Down Expand Up @@ -1232,6 +1234,7 @@ public int getValue() {
}

public static class RegionStoreClientBuilder {

private final TiConfiguration conf;
private final ChannelFactory channelFactory;
private final RegionManager regionManager;
Expand Down