v2

Author: stefnestor

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml

@@ -19,7 +19,7 @@ setup:
 ---
 "Request window limits without scroll":
   - do:
-      catch:      /Result window is too large, from \+ size must be less than or equal to[:] \[10000\] but was \[10010\]\. See the scroll api for a more efficient way to request large data sets\./
+      catch:      /Result window is too large, from \+ size must be less than or equal to[:] \[10000\] but was \[10010\]\. See search after for a more efficient way to request large data sets\./
       search:
         rest_total_hits_as_int: true
         index: test_1

server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java

@@ -571,7 +571,7 @@ private void assertWindowFails(SearchRequestBuilder search) {
                     + IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)
             )
         );
-        assertThat(e.toString(), containsString("See the scroll api for a more efficient way to request large data sets"));
+        assertThat(e.toString(), containsString("See search after for a more efficient way to request large data sets"));
     }
 
     private void assertRescoreWindowFails(int windowSize) {

server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java

@@ -360,7 +360,7 @@ public void preProcess() {
                         + maxResultWindow
                         + "] but was ["
                         + resultWindow
-                        + "]. See the search_after parameter for a more efficient way to request large data sets. "
+                        + "]. See search after for a more efficient way to request large data sets. "
                         + "This limit can be set by changing the ["
                         + IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey()
                         + "] index level setting."

server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java

@@ -196,7 +196,7 @@ protected Engine.Searcher acquireSearcherInternal(String source) {
                     "Result window is too large, from + size must be less than or equal to:"
                         + " ["
                         + maxResultWindow
-                        + "] but was [310]. See the search_after parameter for a more efficient way to request large data sets. "
+                        + "] but was [310]. See search after for a more efficient way to request large data sets. "
                         + "This limit can be set by changing the ["
                         + IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey()
                         + "] index level setting."