tikv
/
client-java
mirror of https://github.com/tikv/client-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* upgrade kvproto to fix batch put

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

* use pingcap kvproto

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>

Co-authored-by: Jian Zhang <zjsariel@gmail.com>
This commit is contained in:
iosmanthus 2021-12-31 16:49:04 +08:00 committed by GitHub
parent 19a9ab0ae3
commit 5dbfe03b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/proto.sh
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
kvproto_hash=d62ddcee4ccd95f19f3ffa89c2832f2fb81030ca kvproto_hash=d1a140660c39b03e549e92933b6591a9aadc62aa
raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926 raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926
tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac

3
src/main/java/org/tikv/common/region/RegionStoreClient.java
View File

@ -63,6 +63,7 @@ import org.tikv.txn.exception.LockException;
/** Note that RegionStoreClient itself is not thread-safe */ /** Note that RegionStoreClient itself is not thread-safe */
public class RegionStoreClient extends AbstractRegionStoreClient { public class RegionStoreClient extends AbstractRegionStoreClient {
private static final Logger logger = LoggerFactory.getLogger(RegionStoreClient.class); private static final Logger logger = LoggerFactory.getLogger(RegionStoreClient.class);
@VisibleForTesting public final AbstractLockResolverClient lockResolverClient; @VisibleForTesting public final AbstractLockResolverClient lockResolverClient;
private final TiStoreType storeType; private final TiStoreType storeType;
@ -1042,6 +1043,7 @@ public class RegionStoreClient extends AbstractRegionStoreClient {
RawBatchPutRequest.newBuilder() RawBatchPutRequest.newBuilder()
.setContext(makeContext(storeType)) .setContext(makeContext(storeType))
.addAllPairs(kvPairs) .addAllPairs(kvPairs)
.setTtl(ttl)
.addTtls(ttl) .addTtls(ttl)
.setForCas(atomicForCAS) .setForCas(atomicForCAS)
.build(); .build();
@ -1232,6 +1234,7 @@ public class RegionStoreClient extends AbstractRegionStoreClient {
} }
public static class RegionStoreClientBuilder { public static class RegionStoreClientBuilder {
private final TiConfiguration conf; private final TiConfiguration conf;
private final ChannelFactory channelFactory; private final ChannelFactory channelFactory;
private final RegionManager regionManager; private final RegionManager regionManager;