Don't throw UOE in PercolateContext#from and #size

Create mapping in PercolatorTests#testPercolateSorting_unsupportedField in create index call instead of lazily via index call.

Author: martijnvg

src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java

@@ -64,7 +64,7 @@ public PercolateShardResponse(BytesRef[] matches, List<Map<String, HighlightFiel
         this.count = count;
         this.scores = scores;
         this.percolatorTypeId = context.percolatorTypeId;
-        this.requestedSize = context.size;
+        this.requestedSize = context.size();
         QuerySearchResult result = context.queryResult();
         if (result != null) {
             if (result.facets() != null) {

src/main/java/org/elasticsearch/percolator/PercolateContext.java

@@ -82,12 +82,11 @@
 public class PercolateContext extends SearchContext {
 
     public boolean limit;
-    public int size;
+    private int size;
     public boolean doSort;
     public byte percolatorTypeId;
     private boolean trackScores;
 
-    private final PercolateShardRequest request;
     private final SearchShardTarget searchShardTarget;
     private final IndexService indexService;
     private final IndexFieldDataService fieldDataService;
@@ -118,7 +117,6 @@ public class PercolateContext extends SearchContext {
     public PercolateContext(PercolateShardRequest request, SearchShardTarget searchShardTarget, IndexShard indexShard,
                             IndexService indexService, CacheRecycler cacheRecycler, PageCacheRecycler pageCacheRecycler,
                             BigArrays bigArrays, ScriptService scriptService) {
-        this.request = request;
         this.indexShard = indexShard;
         this.indexService = indexService;
         this.fieldDataService = indexService.fieldData();
@@ -554,7 +552,7 @@ public Filter aliasFilter() {
 
     @Override
     public int from() {
-        throw new UnsupportedOperationException();
+        return 0;
     }
 
     @Override
@@ -564,12 +562,14 @@ public SearchContext from(int from) {
 
     @Override
     public int size() {
-        throw new UnsupportedOperationException();
+        return size;
     }
 
     @Override
     public SearchContext size(int size) {
-        throw new UnsupportedOperationException();
+        this.size = size;
+        this.limit = true;
+        return this;
     }
 
     @Override

src/main/java/org/elasticsearch/percolator/PercolatorService.java

@@ -185,8 +185,8 @@ public PercolateShardResponse percolate(PercolateShardRequest request) {
                 throw new ElasticsearchIllegalArgumentException("Can't highlight if size isn't specified");
             }
 
-            if (context.size < 0) {
-                context.size = 0;
+            if (context.size() < 0) {
+                context.size(0);
             }
 
             // parse the source either into one MemoryIndex, if it is a single document or index multiple docs if nested
@@ -294,10 +294,9 @@ private ParsedDocument parseRequest(IndexService documentIndexService, Percolate
                     break;
                 } else if (token.isValue()) {
                     if ("size".equals(currentFieldName)) {
-                        context.limit = true;
-                        context.size = parser.intValue();
-                        if (context.size < 0) {
-                            throw new ElasticsearchParseException("size is set to [" + context.size + "] and is expected to be higher or equal to 0");
+                        context.size(parser.intValue());
+                        if (context.size() < 0) {
+                            throw new ElasticsearchParseException("size is set to [" + context.size() + "] and is expected to be higher or equal to 0");
                         }
                     } else if ("sort".equals(currentFieldName)) {
                         parseSort(parser, context);
@@ -531,7 +530,7 @@ public PercolateShardResponse doPercolate(PercolateShardRequest request, Percola
                 }
 
                 if (collector.exists()) {
-                    if (!context.limit || count < context.size) {
+                    if (!context.limit || count < context.size()) {
                         matches.add(entry.getKey().bytes);
                         if (context.highlight() != null) {
                             highlightPhase.hitExecute(context, context.hitContext());

src/main/java/org/elasticsearch/percolator/QueryCollector.java

@@ -184,7 +184,7 @@ final static class Match extends QueryCollector {
         Match(ESLogger logger, PercolateContext context, HighlightPhase highlightPhase) {
             super(logger, context);
             this.limit = context.limit;
-            this.size = context.size;
+            this.size = context.size();
             this.context = context;
             this.highlightPhase = highlightPhase;
         }
@@ -243,7 +243,7 @@ final static class MatchAndSort extends QueryCollector {
         MatchAndSort(ESLogger logger, PercolateContext context) {
             super(logger, context);
             // TODO: Use TopFieldCollector.create(...) for ascending and decending scoring?
-            topDocsCollector = TopScoreDocCollector.create(context.size, false);
+            topDocsCollector = TopScoreDocCollector.create(context.size(), false);
         }
 
         @Override
@@ -303,7 +303,7 @@ final static class MatchAndScore extends QueryCollector {
         MatchAndScore(ESLogger logger, PercolateContext context, HighlightPhase highlightPhase) {
             super(logger, context);
             this.limit = context.limit;
-            this.size = context.size;
+            this.size = context.size();
             this.context = context;
             this.highlightPhase = highlightPhase;
         }

src/test/java/org/elasticsearch/percolator/PercolatorTests.java

@@ -1256,15 +1256,17 @@ public void testPercolateSortingWithNoSize() throws Exception {
 
     @Test
     public void testPercolateSorting_unsupportedField() throws Exception {
-        client().admin().indices().prepareCreate("my-index").execute().actionGet();
+        client().admin().indices().prepareCreate("my-index")
+                .addMapping("my-type", "level", "type=integer")
+                .get();
         ensureGreen();
 
         client().prepareIndex("my-index", PercolatorService.TYPE_NAME, "1")
                 .setSource(jsonBuilder().startObject().field("query", matchAllQuery()).field("level", 1).endObject())
-                .execute().actionGet();
+                .get();
         client().prepareIndex("my-index", PercolatorService.TYPE_NAME, "2")
                 .setSource(jsonBuilder().startObject().field("query", matchAllQuery()).field("level", 2).endObject())
-                .execute().actionGet();
+                .get();
         refresh();
 
         PercolateResponse response = client().preparePercolate().setIndices("my-index").setDocumentType("my-type")