Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35444173BA for ; Mon, 6 Apr 2015 18:37:55 +0000 (UTC) Received: (qmail 89060 invoked by uid 500); 6 Apr 2015 18:37:52 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 89021 invoked by uid 500); 6 Apr 2015 18:37:52 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 89009 invoked by uid 99); 6 Apr 2015 18:37:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 18:37:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB394E00BB; Mon, 6 Apr 2015 18:37:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Message-Id: <2750e653e3094c5aaf8dcf188bbd10b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-1580 Support UNION ALL Date: Mon, 6 Apr 2015 18:37:51 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 3135de872 -> 0f207c0cc 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/0f207c0c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0f207c0c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0f207c0c Branch: refs/heads/4.x-HBase-0.98 Commit: 0f207c0cc2e99a31cfc935445b513b7ff1befb7c Parents: 3135de8 Author: James Taylor Authored: Mon Apr 6 11:31:58 2015 -0700 Committer: James Taylor Committed: Mon Apr 6 11:33:10 2015 -0700 ---------------------------------------------------------------------- .../phoenix/iterate/MergeSortTopNResultIterator.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0f207c0c/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 orderByColumns; private final ImmutableBytesWritable ptr1 = new ImmutableBytesWritable(); private final ImmutableBytesWritable ptr2 = new ImmutableBytesWritable(); - public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, - List orderByColumns, boolean clientSideOnly) { + public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, List orderByColumns) { super(iterators); this.limit = limit == null ? -1 : limit; this.orderByColumns = orderByColumns; - this.clientSideOnly = clientSideOnly; - } - - public MergeSortTopNResultIterator(ResultIterators iterators, Integer limit, List orderByColumns) { - this(iterators, limit, orderByColumns, false); } @Override