From d6e9c3164d8e271dcea292bb91230e544a4e6532 Mon Sep 17 00:00:00 2001
From: Toshihiro Suzuki <brfrn169@gmail.com>
Date: Sun, 14 Jun 2020 19:27:00 +0900
Subject: [PATCH] HBASE-8458 Support for batch version of checkAndMutate()
 (addendum) (#1899)

---
 .../hadoop/hbase/shaded/protobuf/RequestConverter.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
index a524ed32eea..46dc98443f4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
@@ -600,8 +600,6 @@ public final class RequestConverter {
     for (Action action : rowMutationsList) {
       builder.clear();
       getRegionActionBuilderWithRegion(builder, regionName);
-      actionBuilder.clear();
-      mutationBuilder.clear();
 
       buildNoDataRegionAction((RowMutations) action.getAction(), cells, builder, actionBuilder,
         mutationBuilder);
@@ -620,17 +618,19 @@ public final class RequestConverter {
     for (Action action : checkAndMutates) {
       builder.clear();
       getRegionActionBuilderWithRegion(builder, regionName);
-      actionBuilder.clear();
-      mutationBuilder.clear();
 
       CheckAndMutate cam = (CheckAndMutate) action.getAction();
       builder.setCondition(buildCondition(cam.getRow(), cam.getFamily(), cam.getQualifier(),
         cam.getCompareOp(), cam.getValue(), cam.getFilter(), cam.getTimeRange()));
 
       if (cam.getAction() instanceof Put) {
+        actionBuilder.clear();
+        mutationBuilder.clear();
         buildNoDataRegionAction((Put) cam.getAction(), cells, builder, actionBuilder,
           mutationBuilder);
       } else if (cam.getAction() instanceof Delete) {
+        actionBuilder.clear();
+        mutationBuilder.clear();
         buildNoDataRegionAction((Delete) cam.getAction(), cells, builder, actionBuilder,
           mutationBuilder);
       } else if (cam.getAction() instanceof RowMutations) {
@@ -693,8 +693,10 @@ public final class RequestConverter {
         throw new DoNotRetryIOException("RowMutations supports only put and delete, not " +
           mutation.getClass().getName());
       }
+      mutationBuilder.clear();
       MutationProto mp = ProtobufUtil.toMutationNoData(type, mutation, mutationBuilder);
       cells.add(mutation);
+      actionBuilder.clear();
       regionActionBuilder.addAction(actionBuilder.setMutation(mp).build());
     }
   }