remove lastEmittedDocPerShard logic from QueryThenFetchTask

was always null / unused
crate · Nov 17, 2014 · 988811a · 988811a
1 parent b626f3d
commit 988811a
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/sql/src/main/java/io/crate/executor/transport/task/elasticsearch/QueryThenFetchTask.java b/sql/src/main/java/io/crate/executor/transport/task/elasticsearch/QueryThenFetchTask.java
@@ -244,14 +244,12 @@ private void moveToSecondPhase() throws IOException {
             return;
         }
 
-        final ScoreDoc[] lastEmittedDocPerShard = null;
-        // searchPhaseController.getLastEmittedDocPerShard(request, sortedShardList, firstResults.length());
-
         final AtomicInteger counter = new AtomicInteger(docIdsToLoad.asList().size());
         for (AtomicArray.Entry<IntArrayList> entry : docIdsToLoad.asList()) {
             QuerySearchResult queryResult = firstResults.get(entry.index);
             DiscoveryNode node = nodes.get(queryResult.shardTarget().nodeId());
-            FetchSearchRequest fetchSearchRequest = createFetchRequest(queryResult, entry, lastEmittedDocPerShard);
+
+            FetchSearchRequest fetchSearchRequest = new FetchSearchRequest(EMPTY_SEARCH_REQUEST, queryResult.id(), entry.value);
             executeFetch(entry.index, queryResult.shardTarget(), counter, fetchSearchRequest, node);
         }
     }
@@ -366,16 +364,7 @@ private void releaseIrrelevantSearchContexts(AtomicArray<QuerySearchResult> firs
         }
     }
 
-    protected FetchSearchRequest createFetchRequest(QuerySearchResult queryResult,
-                                                    AtomicArray.Entry<IntArrayList> entry,
-                                                    ScoreDoc[] lastEmittedDocPerShard) {
-        if (lastEmittedDocPerShard != null) {
-            ScoreDoc lastEmittedDoc = lastEmittedDocPerShard[entry.index];
-            return new FetchSearchRequest(EMPTY_SEARCH_REQUEST, queryResult.id(), entry.value, lastEmittedDoc);
-        } else {
-            return new FetchSearchRequest(EMPTY_SEARCH_REQUEST, queryResult.id(), entry.value);
-        }
-    }
+
     @Override
     public List<ListenableFuture<QueryResult>> result() {
         return results;