diff --git a/scripts/proto.sh b/scripts/proto.sh index 5cb6893561..fedb3b81e1 100755 --- a/scripts/proto.sh +++ b/scripts/proto.sh @@ -18,7 +18,7 @@ CURRENT_DIR=`pwd` TIKV_CLIENT_HOME="$(cd "`dirname "$0"`"/..; pwd)" cd $TIKV_CLIENT_HOME -kvproto_hash=70a5912413a95aa47c069044dd531efa69ad7549 +kvproto_hash=6ed99a08e262d8a32d6355dcba91cf99cb92074a raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926 diff --git a/src/main/java/org/tikv/common/region/RegionStoreClient.java b/src/main/java/org/tikv/common/region/RegionStoreClient.java index ebcbdca071..a67575b9cb 100644 --- a/src/main/java/org/tikv/common/region/RegionStoreClient.java +++ b/src/main/java/org/tikv/common/region/RegionStoreClient.java @@ -951,7 +951,7 @@ public class RegionStoreClient extends AbstractRegionStoreClient { new KVErrorHandler<>( regionManager, this, resp -> resp.hasRegionError() ? resp.getRegionError() : null); RawCASResponse resp = - callWithRetry(backOffer, TikvGrpc.getRawCompareAndSetMethod(), factory, handler); + callWithRetry(backOffer, TikvGrpc.getRawCompareAndSwapMethod(), factory, handler); return rawPutIfAbsentHelper(resp); } finally { requestTimer.observeDuration(); @@ -970,10 +970,10 @@ public class RegionStoreClient extends AbstractRegionStoreClient { if (resp.hasRegionError()) { throw new RegionException(resp.getRegionError()); } - if (!resp.getNotEqual()) { + if (resp.getSucceed()) { return ByteString.EMPTY; } - return resp.getValue(); + return resp.getPreviousValue(); } public List rawBatchGet(BackOffer backoffer, List keys) {