This is an automated email from the ASF dual-hosted git repository. brfrn169 pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push: new 72323d8 HBASE-24600 Empty RegionAction added to MultiRequest in case of RowMutations/CheckAndMutate batch 72323d8 is described below commit 72323d85927e1ec051667cdd37c52704b893aeaa 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 acf5a57..8055ed7 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 @@ -698,7 +698,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. @@ -821,7 +823,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.