[hbase] branch branch-2 updated: HBASE-24600 Empty RegionAction added to MultiRequest in case of RowMutations/CheckAndMutate batch

[brfrn169]

This is an automated email from the ASF dual-hosted git repository.

brfrn169 pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new a701f0e  HBASE-24600 Empty RegionAction added to MultiRequest in case 
of RowMutations/CheckAndMutate batch
a701f0e is described below

commit a701f0ef32acb8095b26d190f4547e0af96b5245
Author: Toshihiro Suzuki <brfrn...@gmail.com>
AuthorDate: Thu Jun 25 09:52:44 2020 +0900

    HBASE-24600 Empty RegionAction added to MultiRequest in case of 
RowMutations/CheckAndMutate batch
    
    Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
 .../org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 f41af09..1218aac 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
@@ -641,7 +641,9 @@ public final class RequestConverter {
     if (!multiRequestBuilder.hasNonceGroup() && hasNonce) {
       multiRequestBuilder.setNonceGroup(nonceGroup);
     }
-    multiRequestBuilder.addRegionAction(builder.build());
+    if (builder.getActionCount() > 0) {
+      multiRequestBuilder.addRegionAction(builder.build());
+    }
 
     // Process RowMutations here. We can not process it in the big loop above 
because
     // it will corrupt the sequence order maintained in cells.
@@ -810,7 +812,9 @@ public final class RequestConverter {
     if (!multiRequestBuilder.hasNonceGroup() && hasNonce) {
       multiRequestBuilder.setNonceGroup(nonceGroup);
     }
-    multiRequestBuilder.addRegionAction(builder.build());
+    if (builder.getActionCount() > 0) {
+      multiRequestBuilder.addRegionAction(builder.build());
+    }
 
     // Process RowMutations here. We can not process it in the big loop above 
because
     // it will corrupt the sequence order maintained in cells.