HBASE-8458 Support for batch version of checkAndMutate() #1648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
joshelser
reviewed
May 21, 2020
| CompletableFuture<Boolean> checkAndMutate(CheckAndMutate checkAndMutate); | ||
|
|
||
| /** | ||
| * Batch version of checkAndMutate. |
There was a problem hiding this comment.
Probably necessary to mention the consistency/expectations on this method.
By that, I mean, each CheckAndMutate is still individually atomic. They are batched only in the sense that they are sent to a RS in one RPC, but each CheckAndMutate operation is still executed atomically (and thus, each may fail independently of others). Is that correct?
There was a problem hiding this comment.
Yes, that's correct. I will add that to the JavaDoc of the new checkAndMutate methods for batch version. Thanks.
hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutate.java
Show resolved
Hide resolved
| * @return the CheckAndMutate object | ||
| */ | ||
| public CheckAndMutate action(Row action) { | ||
| this.action = Preconditions.checkNotNull(action, "action is null"); |
There was a problem hiding this comment.
If this only supports Put, Delete, and RowMutations, should we check that up front?
There was a problem hiding this comment.
I will make Builder class and it will resolve this. Thanks.
| } | ||
|
|
||
| responseBuilder.addRegionActionResult(regionActionResultBuilder.build()); | ||
| quota.close(); |
There was a problem hiding this comment.
Maybe wrap this if condition branch with a finally to ensure the quote.close() happens?
There was a problem hiding this comment.
Yes, that's right. Thank you for pointing this out!
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
Show resolved
Hide resolved
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
Outdated
Show resolved
Hide resolved
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
Show resolved
Hide resolved
Comment on lines
572
to
586
| @Test(expected = IllegalArgumentException.class) | ||
| public void testCheckAndMutateWithoutAction() throws Throwable { | ||
| try (Table table = createTable()) { | ||
| table.checkAndMutate(new CheckAndMutate(ROWKEY) | ||
| .ifEquals(FAMILY, Bytes.toBytes("A"), Bytes.toBytes("a"))); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException.class) | ||
| public void testCheckAndMutateWithoutCondition() throws Throwable { | ||
| try (Table table = createTable()) { | ||
| table.checkAndMutate(new CheckAndMutate(ROWKEY) | ||
| .action(new Put(ROWKEY).addColumn(FAMILY, Bytes.toBytes("D"), Bytes.toBytes("d")))); | ||
| } | ||
| } |
There was a problem hiding this comment.
In other places, we can get around this by making a Builder class in which the build() method takes the action as an argument.
e.g.
CheckAndMutate cm = new CheckAndMutate.Builder(ROWKEY)
.ifEquals(FAMILY, Bytes.toBytes("A"), Bytes.toBytes("a"))
.build(action);
This gets rid of some of the ambiguity of "you must call this method before you use this object". I don't feel super strongly about it, given how much code you'd have to change as a result :)
There was a problem hiding this comment.
I guess this could also solve the "unsupported action" type checking, as well.
You could overload the build(..) method to accept only the concrete types you allow: Put, Increment, etc.
There was a problem hiding this comment.
Thanks! Making Builder class is a good idea. I will make this change.
brfrn169
commented
May 23, 2020
There was a problem hiding this comment.
@joshelser Thank you very much for taking look at this! I will modify the PR for your review.
| CompletableFuture<Boolean> checkAndMutate(CheckAndMutate checkAndMutate); | ||
|
|
||
| /** | ||
| * Batch version of checkAndMutate. |
There was a problem hiding this comment.
Yes, that's correct. I will add that to the JavaDoc of the new checkAndMutate methods for batch version. Thanks.
hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutate.java
Show resolved
Hide resolved
| } | ||
|
|
||
| responseBuilder.addRegionActionResult(regionActionResultBuilder.build()); | ||
| quota.close(); |
There was a problem hiding this comment.
Yes, that's right. Thank you for pointing this out!
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
Outdated
Show resolved
Hide resolved
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
Show resolved
Hide resolved
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
Show resolved
Hide resolved
Comment on lines
572
to
586
| @Test(expected = IllegalArgumentException.class) | ||
| public void testCheckAndMutateWithoutAction() throws Throwable { | ||
| try (Table table = createTable()) { | ||
| table.checkAndMutate(new CheckAndMutate(ROWKEY) | ||
| .ifEquals(FAMILY, Bytes.toBytes("A"), Bytes.toBytes("a"))); | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException.class) | ||
| public void testCheckAndMutateWithoutCondition() throws Throwable { | ||
| try (Table table = createTable()) { | ||
| table.checkAndMutate(new CheckAndMutate(ROWKEY) | ||
| .action(new Put(ROWKEY).addColumn(FAMILY, Bytes.toBytes("D"), Bytes.toBytes("d")))); | ||
| } | ||
| } |
There was a problem hiding this comment.
Thanks! Making Builder class is a good idea. I will make this change.
| * @return the CheckAndMutate object | ||
| */ | ||
| public CheckAndMutate action(Row action) { | ||
| this.action = Preconditions.checkNotNull(action, "action is null"); |
There was a problem hiding this comment.
I will make Builder class and it will resolve this. Thanks.
|
@joshelser I have modified the patch for your review. Could you please review it? |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
It looks like there were no test failures in the last QA but it reported the test failure. It seems like something errors other than test failures happened... |
|
Ping @joshelser |
|
Sorry Toshi! Rough week :)
Looks like the Java process up and died. Can't tell if it was due to code you have changed though https://builds.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-1648/3/PR_20JDK8_20Hadoop2_20Check_20Report/ Make sure to take a look at the Hadoop3 report and make sure you aren't introducing more javadoc warnings. I glanced at the one and it was the same number of warnings. A couple of more comments, but overall looks good. @Apache9 do you have interest in giving more feedback here? @busbey on your radar for 3.0.0? @saintstack FYI just as an all-around nice guy ;) |
joshelser
reviewed
May 29, 2020
hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutate.java
Outdated
Show resolved
Hide resolved
hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutate.java
Outdated
Show resolved
Hide resolved
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
Outdated
Show resolved
Hide resolved
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
Show resolved
Hide resolved
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
It looks like the unit tests are okay this time.
I checked the report and this patch is not introducing more javadoc warnings. |
joshelser
approved these changes
Jun 1, 2020
| /** | ||
| * A builder class for building a CheckAndMutate object. | ||
| */ | ||
| public static final class Builder { |
There was a problem hiding this comment.
Best practice to have interface audience/stability here too, I think.
|
@joshelser Thank you for reviewing this! I just modified the patch for your review. Thanks. |
|
🎊 +1 overall
This message was automatically generated. |
saintstack
reviewed
Jun 2, 2020
There was a problem hiding this comment.
I meant to review it and still haven't. Just did a quick skim. It looks great but its playing with fire (smile). Thanks @brfrn169
hbase-client/src/main/java/org/apache/hadoop/hbase/client/CheckAndMutate.java
Show resolved
Hide resolved
| return checkAndMutate(CheckAndMutate.newBuilder(row) | ||
| .ifMatches(family, qualifier, op, value) | ||
| .timeRange(timeRange) | ||
| .build(put)); |
There was a problem hiding this comment.
I don't get how what is replaced maps to a checkAndMutate instance? There is no matching in previous impl?
There was a problem hiding this comment.
Ah yes, we don't need to replace maps to a checkAndMutate instance. I will revert this change.
| return checkAndMutate(CheckAndMutate.newBuilder(row) | ||
| .ifMatches(family, qualifier, op, value) | ||
| .timeRange(timeRange) | ||
| .build(delete)); |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
Ping @saintstack |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.