From 5dbfe03b2cc02a187bf50c47792a7260d5f14631 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Fri, 31 Dec 2021 16:49:04 +0800 Subject: [PATCH] [close #419] upgrade kvproto to fix rawBatchPut compatibility (#441) * upgrade kvproto to fix batch put Signed-off-by: iosmanthus * use pingcap kvproto Signed-off-by: iosmanthus Co-authored-by: Jian Zhang --- scripts/proto.sh | 2 +- src/main/java/org/tikv/common/region/RegionStoreClient.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/proto.sh b/scripts/proto.sh index fcd851e2e3..c662b584b8 100755 --- a/scripts/proto.sh +++ b/scripts/proto.sh @@ -14,7 +14,7 @@ # limitations under the License. # -kvproto_hash=d62ddcee4ccd95f19f3ffa89c2832f2fb81030ca +kvproto_hash=d1a140660c39b03e549e92933b6591a9aadc62aa raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926 tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac diff --git a/src/main/java/org/tikv/common/region/RegionStoreClient.java b/src/main/java/org/tikv/common/region/RegionStoreClient.java index a41c1f5069..519ded56b1 100644 --- a/src/main/java/org/tikv/common/region/RegionStoreClient.java +++ b/src/main/java/org/tikv/common/region/RegionStoreClient.java @@ -63,6 +63,7 @@ import org.tikv.txn.exception.LockException; /** 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; @@ -1042,6 +1043,7 @@ public class RegionStoreClient extends AbstractRegionStoreClient { RawBatchPutRequest.newBuilder() .setContext(makeContext(storeType)) .addAllPairs(kvPairs) + .setTtl(ttl) .addTtls(ttl) .setForCas(atomicForCAS) .build(); @@ -1232,6 +1234,7 @@ public class RegionStoreClient extends AbstractRegionStoreClient { } public static class RegionStoreClientBuilder { + private final TiConfiguration conf; private final ChannelFactory channelFactory; private final RegionManager regionManager;