PHOENIX-2676 Cannot support join operations in scans with limit
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7d90e882 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7d90e882 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7d90e882 Branch: refs/heads/calcite Commit: 7d90e88261dfc4ef30544ad7d92fa8c66653df56 Parents: 5127a65 Author: James Taylor <jtay...@salesforce.com> Authored: Wed Feb 17 12:34:48 2016 -0800 Committer: James Taylor <jtay...@salesforce.com> Committed: Wed Feb 17 12:34:48 2016 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/coprocessor/HashJoinRegionScanner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d90e882/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java index 8f64b55..bd9c5ec 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java @@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.hadoop.hbase.regionserver.NoLimitScannerContext; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.ScannerContext; import org.apache.hadoop.hbase.util.Bytes; @@ -274,7 +273,7 @@ public class HashJoinRegionScanner implements RegionScanner { try { while (shouldAdvance()) { hasMore = scanner.nextRaw(result, scannerContext); - processResults(result, scannerContext != NoLimitScannerContext.getInstance()); + processResults(result, false); // TODO detect if limit used here result.clear(); } @@ -316,7 +315,7 @@ public class HashJoinRegionScanner implements RegionScanner { try { while (shouldAdvance()) { hasMore = scanner.next(result, scannerContext); - processResults(result, scannerContext != NoLimitScannerContext.getInstance()); + processResults(result, false); // TODO detect if limit used here result.clear(); }