phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sama...@apache.org
Subject phoenix git commit: PHOENIX-1598 Addendum - fix test failures because of mistake in rebase
Date Mon, 27 Feb 2017 08:05:45 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 d6a82e29f -> f6104965c


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/f6104965
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f6104965
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f6104965

Branch: refs/heads/4.x-HBase-1.1
Commit: f6104965c2010c1512d3585f257941f693f945cf
Parents: d6a82e2
Author: Samarth <samarth.jain@salesforce.com>
Authored: Mon Feb 27 00:05:36 2017 -0800
Committer: Samarth <samarth.jain@salesforce.com>
Committed: Mon Feb 27 00:05:36 2017 -0800

----------------------------------------------------------------------
 .../coprocessor/BaseScannerRegionObserver.java       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f6104965/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)


Mime
View raw message