phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-1580 Support UNION ALL
Date Mon, 06 Apr 2015 18:37:51 GMT
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 <jamestaylor@apache.org>
Authored: Mon Apr 6 11:31:58 2015 -0700
Committer: James Taylor <jamestaylor@apache.org>
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<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


Mime
View raw message