From 01ca8491cf402aa1cbe6ad914386aad7cb28a803 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Sat, 31 May 2014 13:35:11 +0200
Subject: [PATCH] Core: apply 'from' if there is one shard result.

---
 .../search/controller/SearchPhaseController.java            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java b/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
index 3090539d993..395e2392562 100644
--- a/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
+++ b/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
@@ -177,9 +177,13 @@ public class SearchPhaseController extends AbstractComponent {
                     return EMPTY_DOCS;
                 }
                 int resultDocsSize = scoreDocs.length < result.size() ? scoreDocs.length : result.size();
+                int offset = result.from();
+                if (scrollSort) {
+                    offset = 0;
+                }
                 ScoreDoc[] docs = new ScoreDoc[resultDocsSize];
                 for (int i = 0; i < resultDocsSize; i++) {
-                    ScoreDoc scoreDoc = scoreDocs[i];
+                    ScoreDoc scoreDoc = scoreDocs[offset + i];
                     scoreDoc.shardIndex = shardIndex;
                     docs[i] = scoreDoc;
                 }