You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2015/04/03 01:22:16 UTC
phoenix git commit: PHOENIX-1798 UnsupportedOperationException throws
from BaseResultIterators.getIterators (Cen Qi)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 3e217e391 -> de3e2ab7e
PHOENIX-1798 UnsupportedOperationException throws from BaseResultIterators.getIterators (Cen Qi)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/de3e2ab7
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/de3e2ab7
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/de3e2ab7
Branch: refs/heads/4.x-HBase-0.98
Commit: de3e2ab7eccacc7ad1af29557c5ea7d3e517c200
Parents: 3e217e3
Author: Samarth <sa...@salesforce.com>
Authored: Thu Apr 2 16:23:03 2015 -0700
Committer: Samarth <sa...@salesforce.com>
Committed: Thu Apr 2 16:23:03 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/phoenix/iterate/BaseResultIterators.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/de3e2ab7/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 a120143..9ac6a29 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
@@ -556,7 +556,7 @@ public abstract class BaseResultIterators extends ExplainTable implements Result
// Add any concatIterators that were successful so far
// as we need these to be in order
addIterator(iterators, concatIterators);
- concatIterators = Collections.emptyList();
+ concatIterators = Lists.newArrayList();
submitWork(newNestedScans, newFutures, allIterators, newNestedScans.size());
allFutures.add(newFutures);
for (List<Pair<Scan,Future<PeekingResultIterator>>> newFuture : reverseIfNecessary(newFutures, isReverse)) {