PHOENIX-1580 Support UNION ALL
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5ea3607c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ea3607c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ea3607c Branch: refs/heads/calcite Commit: 5ea3607c7e0603e1e26b7e14ed166ea67818c038 Parents: c50feca Author: James Taylor <[email protected]> Authored: Mon Apr 6 11:31:58 2015 -0700 Committer: James Taylor <[email protected]> Committed: Mon Apr 6 11:31:58 2015 -0700 ---------------------------------------------------------------------- .../phoenix/iterate/MergeSortTopNResultIterator.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ea3607c/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortTopNResultIterator.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortTopNResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortTopNResultIterator.java index 87a6a62..4c4097f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortTopNResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortTopNResultIterator.java @@ -31,28 +31,19 @@ import org.apache.phoenix.schema.tuple.Tuple; * returning the rows ordered by the OrderByExpression. The input * iterators must be ordered by the OrderByExpression. * - * - * @since 0.1 */ public class MergeSortTopNResultIterator extends MergeSortResultIterator { private final int limit; - private final boolean clientSideOnly; private int count = 0; private final List<OrderByExpression> orderByColumns; private final ImmutableBytesWritable ptr1 = new ImmutableBytesWritable(); private final ImmutableBytesWritable ptr2 = new ImmutableBytesWritable(); - public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, - List<OrderByExpression> orderByColumns, boolean clientSideOnly) { + public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, List<OrderByExpression> orderByColumns) { super(iterators); this.limit = limit == null ? -1 : limit; this.orderByColumns = orderByColumns; - this.clientSideOnly = clientSideOnly; - } - - public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, List<OrderByExpression> orderByColumns) { - this(iterators, limit, orderByColumns, false); } @Override
