Uh oh!
There was an error while loading. Please reload this page.
HBASE-23093 : Avoid Optional Anti-Pattern where possible - #673
Merged
Conversation
virajjasaniforce-pushed
the
HBASE-23093-master
branch
from
September 29, 2019 18:47
4440e6c to
215c726CompareApache-HBase
commented
Sep 29, 2019
💔 -1 overall
This message was automatically generated. |
Apache-HBase
commented
Sep 29, 2019
💔 -1 overall
This message was automatically generated. |
Apache-HBase
commented
Sep 30, 2019
💔 -1 overall
This message was automatically generated. |
virajjasani
commented
Oct 4, 2019
ContributorAuthor
Please review @Apache9@petersomogyi |
petersomogyi
requested changes
Oct 5, 2019
petersomogyi
left a comment
Contributor
There was a problem hiding this comment.
Looks good. Minor nit.
| Optional<MetricsConnection> metrics = conn.getConnectionMetrics(); | ||
| Optional<ServerStatisticTracker> optStats = conn.getStatisticsTracker(); | ||
| if (!optStats.isPresent()) { | ||
| ServerStatisticTracker optStats = conn.getStatisticsTracker(); |
Contributor
There was a problem hiding this comment.
The variable name can be stats now.
petersomogyi
commented
Oct 5, 2019
Contributor
Added @Apache9 as a reviewer since he had some comments on the Jira. |
Apache-HBase
commented
Oct 5, 2019
🎊 +1 overall
This message was automatically generated. |
petersomogyi
approved these changes
Oct 7, 2019
Apache9
requested changes
Oct 8, 2019
| } | ||
| Optional<ServerStatisticTracker> getStatisticsTracker() { | ||
| ServerStatisticTracker getStatisticsTracker() { |
Contributor
There was a problem hiding this comment.
Why this change? It could be null and it is a return value, not a parameter...
ContributorAuthor
There was a problem hiding this comment.
This is just to simplify as we are putting this returned value directly as argument to some methods.
e.g.
https://github.com/apache/hbase/pull/673/files#diff-6705e0c1d8285fddc3d939ad3352b1a6R310
https://github.com/apache/hbase/pull/673/files#diff-e12d4030edb8885f06f86ee77cfb5b0cR383
Contributor
There was a problem hiding this comment.
I think we should align the interface... It is a bit confusing that we return Optional for some methods, and then some other methods which do not return an Optional but could still return null...
Uh oh!
There was an error while loading. Please reload this page.
| */ | ||
| private static <T> void connect(CompletableFuture<T> srcFuture, CompletableFuture<T> dstFuture, | ||
| Optional<MetricsConnection> metrics) { | ||
| MetricsConnection metrics) { |
Contributor
There was a problem hiding this comment.
Here I do not think it is necessary to do this change? The upper layer will get an Optional, and then we convert it to an object or a null, by checking if the object is null, and here we check it again...
| private static <T> void sendRequestsToSecondaryReplicas( | ||
| Function<Integer, CompletableFuture<T>> requestReplica, RegionLocations locs, | ||
| CompletableFuture<T> future, Optional<MetricsConnection> metrics) { | ||
| CompletableFuture<T> future, MetricsConnection metrics) { |
| static void updateStats(Optional<ServerStatisticTracker> optStats, | ||
| Optional<MetricsConnection> optMetrics, ServerName serverName, MultiResponse resp) { | ||
| if (!optStats.isPresent() && !optMetrics.isPresent()) { | ||
| static void updateStats(ServerStatisticTracker serverStatisticTracker, |
| RegionLocateType.CURRENT, replicaId -> get(get, replicaId), readRpcTimeoutNs, | ||
| conn.connConf.getPrimaryCallTimeoutNs(), retryTimer, conn.getConnectionMetrics()); | ||
| conn.connConf.getPrimaryCallTimeoutNs(), retryTimer, | ||
| conn.getConnectionMetrics().orElse(null)); |
Contributor
There was a problem hiding this comment.
This is what I mean, we unwrap the Optional, and then check if it is null, this does not make sense...
Uh oh!
There was an error while loading. Please reload this page.
| // Used to instantiate a scanner for compaction in test | ||
| @VisibleForTesting | ||
| StoreScanner(ScanInfo scanInfo, OptionalInt maxVersions, ScanType scanType, | ||
| StoreScanner(ScanInfo scanInfo, Integer maxVersions, ScanType scanType, |
Contributor
There was a problem hiding this comment.
Oh, what is the differece between an OptionalInt and an Integer? They are both wrapping types...
ContributorAuthor
There was a problem hiding this comment.
True both are wrapping but OptionalInt is again wrapping Integer also.
Here we call this:
https://github.com/apache/hbase/pull/673/files#diff-ff286d61ea5468d0f8978181e4f3a896R946
https://github.com/apache/hbase/pull/673/files#diff-ff286d61ea5468d0f8978181e4f3a896R974
At least we can directly pass int value 2 or null rather than OptionalInt.of(2) and Optional.empty()
Contributor
There was a problem hiding this comment.
Passing value 2 will introduce a Integer.valueOf(2) as you are passing an Integer, not a int. And Optional.empty is just a static object, which does not make any difference with null...
ContributorAuthor
There was a problem hiding this comment.
sure, let me change this to as it was before
Contributor
There was a problem hiding this comment.
And is it possible to just pass an int? I think not all the int values are valid for maxVersions, maybe we can use -1 to indicate null here?
| continue outer; | ||
| } | ||
| if (!requiresReplication(tableDesc, entry)) { | ||
| if (!requiresReplication(tableDesc.orElse(null), entry)) { |
Contributor
There was a problem hiding this comment.
OK, again, here we unwrap the optional by checking whether it is null and inside the method we checl it again...
Where does this Optional come from? If we could not change the root, let's keep it as is?
virajjasaniforce-pushed
the
HBASE-23093-master
branch
from
October 8, 2019 10:45
c1118e5 to
e0a5f24CompareApache-HBase
commented
Oct 8, 2019
🎊 +1 overall
This message was automatically generated. |
Apache9
commented
Oct 10, 2019
Contributor
Will take a look this night... |
Apache9
requested changes
Oct 10, 2019
| @Override | ||
| public void deregisterChildren(ConfigurationManager manager) { | ||
| stores.values().forEach(configurationManager.get()::deregisterObserver); | ||
| stores.values().forEach(store -> configurationManager.deregisterObserver(store)); |
Contributor
There was a problem hiding this comment.
Just use configurationManager::deregisterObserver?
| } | ||
| } | ||
| return this.firstKey; | ||
| return Optional.ofNullable(this.firstKey); |
Contributor
There was a problem hiding this comment.
Not sure if this has been answered but I think this method will be called multiple times? And we always need to do a wrapping and a null check?
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Apache9
requested changes
Oct 10, 2019
| .of(((CombinedBlockCache.CombinedCacheStats) this.cacheStats.get()).getLruCacheStats()); | ||
| l2Stats = Optional.of(((CombinedBlockCache.CombinedCacheStats) this.cacheStats.get()) | ||
| .getBucketCacheStats()); | ||
| this.blockCache = this.regionServer.getBlockCache().isPresent() ? |
Uh oh!
There was an error while loading. Please reload this page.
| */ | ||
| private void initMobFileCache() { | ||
| this.mobFileCache = this.regionServer.getMobFileCache(); | ||
| this.mobFileCache = this.regionServer.getMobFileCache().isPresent() ? |
virajjasaniforce-pushed
the
HBASE-23093-master
branch
from
October 10, 2019 13:39
e0a5f24 to
9ade583CompareApache-HBase
commented
Oct 10, 2019
💔 -1 overall
This message was automatically generated. |
virajjasani
commented
Oct 10, 2019
ContributorAuthor
TestBulkLoadReplication is passing locally |
asfgit pushed a commit
that referenced
this pull request
Oct 11, 2019
Signed-off-by: Peter Somogyi <psomogyi@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
asfgit pushed a commit
that referenced
this pull request
Oct 11, 2019
Signed-off-by: Peter Somogyi <psomogyi@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
asfgit pushed a commit
that referenced
this pull request
Oct 11, 2019
Signed-off-by: Peter Somogyi <psomogyi@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
infraio pushed a commit
to infraio/hbase
that referenced
this pull request
Aug 17, 2020
Signed-off-by: Peter Somogyi <psomogyi@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
symat pushed a commit
to symat/hbase
that referenced
this pull request
Feb 17, 2021
Signed-off-by: Peter Somogyi <psomogyi@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 122b5b2) Change-Id: I0f995fdf1e4d6b19c39c8bf8f63066bf5843a81a
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Jira: https://issues.apache.org/jira/browse/HBASE-23093