Github user JamesRTaylor commented on a diff in the pull request:
https://github.com/apache/phoenix/pull/156#discussion_r58483665
--- Diff:
phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
---
@@ -556,35 +564,55 @@ private static String toString(List<byte[]> gps) {
} else {
endKey = regionBoundaries.get(regionIndex);
}
- HRegionLocation regionLocation =
regionLocations.get(regionIndex);
- if (isLocalIndex) {
- HRegionInfo regionInfo =
regionLocation.getRegionInfo();
- endRegionKey = regionInfo.getEndKey();
- keyOffset =
ScanUtil.getRowKeyOffset(regionInfo.getStartKey(), endRegionKey);
- }
- try {
- while (guideIndex < gpsSize &&
(currentGuidePost.compareTo(endKey) <= 0 || endKey.length == 0)) {
- Scan newScan = scanRanges.intersectScan(scan,
currentKeyBytes, currentGuidePostBytes, keyOffset,
- false);
- estimatedRows +=
gps.getRowCounts().get(guideIndex);
- estimatedSize +=
gps.getByteCounts().get(guideIndex);
- scans = addNewScan(parallelScans, scans, newScan,
currentGuidePostBytes, false, regionLocation);
- currentKeyBytes = currentGuidePost.copyBytes();
- currentGuidePost = PrefixByteCodec.decode(decoder,
input);
- currentGuidePostBytes =
currentGuidePost.copyBytes();
- guideIndex++;
- }
- } catch (EOFException e) {}
- Scan newScan = scanRanges.intersectScan(scan,
currentKeyBytes, endKey, keyOffset, true);
- if (isLocalIndex) {
- if (newScan != null) {
- newScan.setAttribute(EXPECTED_UPPER_REGION_KEY,
endRegionKey);
- } else if (!scans.isEmpty()) {
-
scans.get(scans.size()-1).setAttribute(EXPECTED_UPPER_REGION_KEY, endRegionKey);
- }
- }
- scans = addNewScan(parallelScans, scans, newScan, endKey,
true, regionLocation);
- currentKeyBytes = endKey;
+ if (Bytes.compareTo(scan.getStartRow(),
context.getScan().getStartRow()) != 0
+ || Bytes.compareTo(scan.getStopRow(),
context.getScan().getStopRow()) != 0) {
+ Scan newScan = ScanUtil.newScan(scan);
+ if(ScanUtil.isLocalIndex(scan)) {
+ newScan.setStartRow(regionInfo.getStartKey());
+ newScan.setAttribute(SCAN_ACTUAL_START_ROW,
regionInfo.getStartKey());
--- End diff --
Is there some symmetry between SCAN_ACTUAL_START_ROW and
EXPECTED_UPPER_REGION_KEY? Should they be named similarly?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
