Revert changes for PHOENIX-2714
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/87e8f29b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/87e8f29b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/87e8f29b Branch: refs/heads/calcite Commit: 87e8f29bb2f93b875c73dce499cf5b95044072c4 Parents: 9ac854a Author: maryannxue <maryann....@gmail.com> Authored: Thu Feb 25 15:23:03 2016 -0500 Committer: maryannxue <maryann....@gmail.com> Committed: Thu Feb 25 15:23:03 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/phoenix/execute/ScanPlan.java | 5 ----- .../apache/phoenix/iterate/BaseResultIterators.java | 10 ++-------- .../org/apache/phoenix/iterate/ResultIterators.java | 1 - .../apache/phoenix/iterate/UnionResultIterators.java | 5 ----- .../phoenix/iterate/AggregateResultScannerTest.java | 5 ----- .../phoenix/iterate/ConcatResultIteratorTest.java | 10 ---------- .../phoenix/iterate/MergeSortResultIteratorTest.java | 15 --------------- 7 files changed, 2 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java index f622e8e..673a641 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java @@ -34,7 +34,6 @@ import org.apache.phoenix.coprocessor.ScanRegionObserver; import org.apache.phoenix.expression.Expression; import org.apache.phoenix.iterate.ChunkedResultIterator; import org.apache.phoenix.iterate.ConcatResultIterator; -import org.apache.phoenix.iterate.DefaultParallelScanGrouper; import org.apache.phoenix.iterate.LimitingResultIterator; import org.apache.phoenix.iterate.MergeSortRowKeyResultIterator; import org.apache.phoenix.iterate.MergeSortTopNResultIterator; @@ -258,8 +257,4 @@ public class ScanPlan extends BaseQueryPlan { } } - public long getEstimatedBytes() throws SQLException { - return new ParallelIterators(this, null, parallelIteratorFactory, DefaultParallelScanGrouper.getInstance()).getEstimatedSize(); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java index c3da407..fc3edbe 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java @@ -560,10 +560,8 @@ public abstract class BaseResultIterators extends ExplainTable implements Result while (guideIndex < gpsSize && (currentGuidePost.compareTo(endKey) <= 0 || endKey.length == 0)) { Scan newScan = scanRanges.intersectScan(scan, currentKeyBytes, currentGuidePostBytes, keyOffset, false); - if (newScan != null) { - estimatedRows += gps.getRowCounts().get(guideIndex); - estimatedSize += gps.getByteCounts().get(guideIndex); - } + 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); @@ -874,8 +872,4 @@ public abstract class BaseResultIterators extends ExplainTable implements Result return "ResultIterators [name=" + getName() + ",id=" + scanId + ",scans=" + scans + "]"; } - @Override - public long getEstimatedSize() { - return estimatedSize; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ResultIterators.java index e76db56..16f8b41 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ResultIterators.java @@ -26,7 +26,6 @@ import org.apache.phoenix.util.SQLCloseable; public interface ResultIterators extends SQLCloseable { public int size(); - public long getEstimatedSize(); public List<KeyRange> getSplits(); public List<List<Scan>> getScans(); public void explain(List<String> planSteps); http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/main/java/org/apache/phoenix/iterate/UnionResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/UnionResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/UnionResultIterators.java index 0c2cfea..5018dad 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/UnionResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/UnionResultIterators.java @@ -139,9 +139,4 @@ public class UnionResultIterators implements ResultIterators { public List<PeekingResultIterator> getIterators() throws SQLException { return iterators; } - - @Override - public long getEstimatedSize() { - return 0; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java index 60e4b2d..f53e871 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java @@ -168,11 +168,6 @@ public class AggregateResultScannerTest extends BaseConnectionlessQueryTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; ResultIterator scanner = new GroupedAggregatingResultIterator(new MergeSortRowKeyResultIterator(iterators), aggregationManager.getAggregators()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/test/java/org/apache/phoenix/iterate/ConcatResultIteratorTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/ConcatResultIteratorTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/ConcatResultIteratorTest.java index 2670c6d..cf71724 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/ConcatResultIteratorTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/ConcatResultIteratorTest.java @@ -85,11 +85,6 @@ public class ConcatResultIteratorTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; Tuple[] expectedResults = new Tuple[] { @@ -153,11 +148,6 @@ public class ConcatResultIteratorTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; ResultIterator scanner = new MergeSortRowKeyResultIterator(iterators); AssertResults.assertResults(scanner, expectedResults); http://git-wip-us.apache.org/repos/asf/phoenix/blob/87e8f29b/phoenix-core/src/test/java/org/apache/phoenix/iterate/MergeSortResultIteratorTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/MergeSortResultIteratorTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/MergeSortResultIteratorTest.java index 6e3e0b7..9b2e8de 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/MergeSortResultIteratorTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/MergeSortResultIteratorTest.java @@ -100,11 +100,6 @@ public class MergeSortResultIteratorTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; ResultIterators reverseIterators = new ResultIterators() { @@ -135,11 +130,6 @@ public class MergeSortResultIteratorTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; ResultIterator scanner = new MergeSortRowKeyResultIterator(iterators); AssertResults.assertResults(scanner, expectedResults); @@ -203,11 +193,6 @@ public class MergeSortResultIteratorTest { @Override public void close() throws SQLException { } - - @Override - public long getEstimatedSize() { - return 0; - } }; ResultIterator scanner = new MergeSortRowKeyResultIterator(iterators, 0, true); AssertResults.assertResults(scanner, expectedResults);
