PHOENIX-1598 Addendum - fix test failures because of mistake in rebase
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81e93255 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81e93255 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81e93255 Branch: refs/heads/calcite Commit: 81e9325588c82c614403371c99a93b03925d4383 Parents: 3c7ff99 Author: Samarth <samarth.j...@salesforce.com> Authored: Mon Feb 27 00:06:49 2017 -0800 Committer: Samarth <samarth.j...@salesforce.com> Committed: Mon Feb 27 00:06:49 2017 -0800 ---------------------------------------------------------------------- .../coprocessor/BaseScannerRegionObserver.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/81e93255/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index b4bda98..e042150 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -492,26 +492,17 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { if ((offset > 0 || ScanUtil.isLocalIndex(scan)) && !ScanUtil.isAnalyzeTable(scan)) { if(hasReferences && actualStartKey!=null) { next = scanTillScanStartRow(s, arrayKVRefs, arrayFuncRefs, result, - scannerContext, arrayElementCell); + scannerContext, arrayElementCell); if (result.isEmpty()) { return next; } - IndexUtil.wrapResultUsingOffset(c, result, offset, dataColumns, - tupleProjector, dataRegion, indexMaintainer, viewConstants, ptr); - } - if (projector != null) { - Tuple toProject = useQualifierAsListIndex ? new PositionBasedMultiKeyValueTuple(result) : new ResultTuple(Result.create(result)); - Tuple tuple = projector.projectResults(toProject, useNewValueColumnQualifier); - result.clear(); - result.add(tuple.getValue(0)); - if(arrayElementCell != null) - result.add(arrayElementCell); } IndexUtil.wrapResultUsingOffset(c, result, offset, dataColumns, tupleProjector, dataRegion, indexMaintainer, viewConstants, ptr); } if (projector != null) { - Tuple tuple = projector.projectResults(new ResultTuple(Result.create(result))); + Tuple toProject = useQualifierAsListIndex ? new PositionBasedMultiKeyValueTuple(result) : new ResultTuple(Result.create(result)); + Tuple tuple = projector.projectResults(toProject, useNewValueColumnQualifier); result.clear(); result.add(tuple.getValue(0)); if(arrayElementCell != null)
