fixup! extend PageableTask interface and provide a generic PageabaleT…

…askResult
crate · Feb 18, 2015 · 7a6d6bd · 7a6d6bd
1 parent 691abd8
commit 7a6d6bd
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 33 deletions.
diff --git a/sql/src/main/java/io/crate/executor/BigArrayPage.java b/sql/src/main/java/io/crate/executor/BigArrayPage.java
@@ -23,7 +23,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterators;
 import org.elasticsearch.common.util.ObjectArray;
 
 import java.util.Iterator;
@@ -86,11 +85,6 @@ public boolean isLastPage() {
         return isLastPage;
     }
 
-    @Override
-    public Page concat(Page otherPage) {
-        return new IteratorPage(Iterators.concat(iterator(), otherPage.iterator()), size + otherPage.size(), otherPage.isLastPage());
-    }
-
     @Override
     public Iterator<Object[]> iterator() {
         return new ObjectArrayIterator<>(page, start, size);

diff --git a/sql/src/main/java/io/crate/executor/IteratorPage.java b/sql/src/main/java/io/crate/executor/IteratorPage.java
@@ -21,8 +21,6 @@
 
 package io.crate.executor;
 
-import com.google.common.collect.Iterators;
-
 import java.util.Iterator;
 
 public class IteratorPage implements Page {
@@ -47,12 +45,6 @@ public boolean isLastPage() {
         return isLastPage;
     }
 
-    @Override
-    public Page concat(Page otherPage) {
-        return new IteratorPage(Iterators.concat(iterator, otherPage.iterator()),
-                size + otherPage.size(), otherPage.isLastPage());
-    }
-
     @Override
     public Iterator<Object[]> iterator() {
         return iterator;

diff --git a/sql/src/main/java/io/crate/executor/ObjectArrayPage.java b/sql/src/main/java/io/crate/executor/ObjectArrayPage.java
@@ -22,7 +22,6 @@
 package io.crate.executor;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterators;
 import io.crate.core.collections.ArrayIterator;
 
 import java.util.Iterator;
@@ -60,10 +59,4 @@ public long size() {
     public boolean isLastPage() {
         return isLastPage;
     }
-
-    @Override
-    public Page concat(Page otherPage) {
-        return new IteratorPage(Iterators.concat(iterator(), otherPage.iterator()),
-                size + otherPage.size(), otherPage.isLastPage());
-    }
 }
diff --git a/sql/src/main/java/io/crate/executor/Page.java b/sql/src/main/java/io/crate/executor/Page.java
@@ -37,8 +37,6 @@ public interface Page extends Iterable<Object[]> {
 
     public boolean isLastPage();
 
-    public Page concat(Page otherPage);
-
     public static final Page EMPTY = new Page() {
         @Override
         public long size() {
@@ -50,11 +48,6 @@ public boolean isLastPage() {
             return true;
         }
 
-        @Override
-        public Page concat(Page otherPage) {
-            return otherPage;
-        }
-
         @Override
         public Iterator<Object[]> iterator() {
             return Collections.emptyIterator();

diff --git a/sql/src/main/java/io/crate/executor/PageableTaskResult.java b/sql/src/main/java/io/crate/executor/PageableTaskResult.java
@@ -84,7 +84,7 @@ private ListenableFuture<TaskResult> pageWithOverlap(final PageInfo newPageInfo)
         task.fetchMore(remainingPageInfo, context, new FutureCallback<TaskResult>() {
             @Override
             public void onSuccess(TaskResult result) {
-                future.set(new PageableTaskResult<>(task, newPageInfo, page.concat(result.page()), context));
+                future.set(new PageableTaskResult<>(task, newPageInfo, Pages.concat(page, result.page()), context));
             }
 
             @Override

diff --git a/sql/src/main/java/io/crate/executor/Pages.java b/sql/src/main/java/io/crate/executor/Pages.java
@@ -0,0 +1,14 @@
+package io.crate.executor;
+
+import com.google.common.collect.Iterators;
+
+public class Pages {
+
+    public static Page concat(Page firstPage, Page secondPage) {
+        return new IteratorPage(
+                Iterators.concat(firstPage.iterator(), secondPage.iterator()),
+                firstPage.size() + secondPage.size(),
+                secondPage.isLastPage()
+        );
+    }
+}
diff --git a/sql/src/main/java/io/crate/operation/qtf/QueryThenFetchOperation.java b/sql/src/main/java/io/crate/operation/qtf/QueryThenFetchOperation.java
@@ -133,10 +133,7 @@ public void execute(FutureCallback<QueryThenFetchContext> callback,
         AtomicInteger totalOps = new AtomicInteger(0);
 
         int requestIdx = -1;
-        Iterator<Tuple<String, QueryShardRequest>> iterator = ctx.requests.iterator();
-        //noinspection WhileLoopReplaceableByForEach
-        while (iterator.hasNext()) {
-            Tuple<String, QueryShardRequest> requestTuple = iterator.next();
+        for (Tuple<String, QueryShardRequest> requestTuple : ctx.requests) {
             requestIdx++;
             state.blocks().indexBlockedRaiseException(ClusterBlockLevel.READ, requestTuple.v2().index());
             transportQueryShardAction.executeQuery(