-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-30016 Cached table regions locations are not using in TableSnapshotInputFormatImpl#getSplits #7975
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
srinireddy2020
wants to merge
1
commit into
apache:master
Choose a base branch
from
srinireddy2020:HBASE-30016
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
HBASE-30016 Cached table regions locations are not using in TableSnapshotInputFormatImpl#getSplits #7975
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -424,74 +424,76 @@ public static List<InputSplit> getSplits(Scan scan, SnapshotManifest manifest, | |
|
|
||
| Connection connection = null; | ||
| RegionLocator regionLocator = null; | ||
| if (localityEnabled && useRegionLoc) { | ||
| Configuration newConf = new Configuration(conf); | ||
| newConf.setInt("hbase.hconnection.threads.max", 1); | ||
| try { | ||
| List<InputSplit> splits = new ArrayList<>(); | ||
| try { | ||
| if (localityEnabled && useRegionLoc) { | ||
| Configuration newConf = new Configuration(conf); | ||
| newConf.setInt("hbase.hconnection.threads.max", 1); | ||
|
|
||
| connection = ConnectionFactory.createConnection(newConf); | ||
| regionLocator = connection.getRegionLocator(htd.getTableName()); | ||
|
|
||
| /* Get all locations for the table and cache it */ | ||
| regionLocator.getAllRegionLocations(); | ||
| } finally { | ||
| if (connection != null) { | ||
| connection.close(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| List<InputSplit> splits = new ArrayList<>(); | ||
| for (RegionInfo hri : regionManifests) { | ||
| // load region descriptor | ||
| List<String> hosts = null; | ||
| if (localityEnabled) { | ||
| if (regionLocator != null) { | ||
| /* Get Location from the local cache */ | ||
| HRegionLocation location = regionLocator.getRegionLocation(hri.getStartKey(), false); | ||
|
|
||
| hosts = new ArrayList<>(1); | ||
| hosts.add(location.getHostname()); | ||
| } else { | ||
| hosts = calculateLocationsForInputSplit(conf, htd, hri, tableDir); | ||
| for (RegionInfo hri : regionManifests) { | ||
| // load region descriptor | ||
| List<String> hosts = null; | ||
| if (localityEnabled) { | ||
| if (regionLocator != null) { | ||
| /* Get Location from the local cache */ | ||
| HRegionLocation location = regionLocator.getRegionLocation(hri.getStartKey(), false); | ||
|
|
||
| hosts = new ArrayList<>(1); | ||
| hosts.add(location.getHostname()); | ||
| } else { | ||
| hosts = calculateLocationsForInputSplit(conf, htd, hri, tableDir); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (numSplits > 1) { | ||
| byte[][] sp = sa.split(hri.getStartKey(), hri.getEndKey(), numSplits, true); | ||
| for (int i = 0; i < sp.length - 1; i++) { | ||
| if (numSplits > 1) { | ||
| byte[][] sp = sa.split(hri.getStartKey(), hri.getEndKey(), numSplits, true); | ||
| for (int i = 0; i < sp.length - 1; i++) { | ||
| if ( | ||
| PrivateCellUtil.overlappingKeys(scan.getStartRow(), scan.getStopRow(), sp[i], | ||
| sp[i + 1]) | ||
| ) { | ||
|
|
||
| Scan boundedScan = new Scan(scan); | ||
| if (scan.getStartRow().length == 0) { | ||
| boundedScan.withStartRow(sp[i]); | ||
| } else { | ||
| boundedScan.withStartRow( | ||
| Bytes.compareTo(scan.getStartRow(), sp[i]) > 0 ? scan.getStartRow() : sp[i]); | ||
| } | ||
|
|
||
| if (scan.getStopRow().length == 0) { | ||
| boundedScan.withStopRow(sp[i + 1]); | ||
| } else { | ||
| boundedScan.withStopRow(Bytes.compareTo(scan.getStopRow(), sp[i + 1]) < 0 | ||
| ? scan.getStopRow() | ||
| : sp[i + 1]); | ||
| } | ||
|
|
||
| splits.add(new InputSplit(htd, hri, hosts, boundedScan, restoreDir)); | ||
| } | ||
| } | ||
| } else { | ||
| if ( | ||
| PrivateCellUtil.overlappingKeys(scan.getStartRow(), scan.getStopRow(), sp[i], sp[i + 1]) | ||
| PrivateCellUtil.overlappingKeys(scan.getStartRow(), scan.getStopRow(), | ||
| hri.getStartKey(), hri.getEndKey()) | ||
| ) { | ||
|
|
||
| Scan boundedScan = new Scan(scan); | ||
| if (scan.getStartRow().length == 0) { | ||
| boundedScan.withStartRow(sp[i]); | ||
| } else { | ||
| boundedScan.withStartRow( | ||
| Bytes.compareTo(scan.getStartRow(), sp[i]) > 0 ? scan.getStartRow() : sp[i]); | ||
| } | ||
|
|
||
| if (scan.getStopRow().length == 0) { | ||
| boundedScan.withStopRow(sp[i + 1]); | ||
| } else { | ||
| boundedScan.withStopRow( | ||
| Bytes.compareTo(scan.getStopRow(), sp[i + 1]) < 0 ? scan.getStopRow() : sp[i + 1]); | ||
| } | ||
|
|
||
| splits.add(new InputSplit(htd, hri, hosts, boundedScan, restoreDir)); | ||
| splits.add(new InputSplit(htd, hri, hosts, scan, restoreDir)); | ||
| } | ||
| } | ||
| } else { | ||
| if ( | ||
| PrivateCellUtil.overlappingKeys(scan.getStartRow(), scan.getStopRow(), hri.getStartKey(), | ||
| hri.getEndKey()) | ||
| ) { | ||
|
|
||
| splits.add(new InputSplit(htd, hri, hosts, scan, restoreDir)); | ||
| } | ||
| } | ||
| } finally { | ||
| if (connection != null) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i believe all changes are just because we added an extra block {} and code got shifted? |
||
| connection.close(); | ||
| } | ||
| } | ||
|
|
||
| return splits; | ||
| } | ||
|
|
||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we do try-with-resources here