From c9bad532ed114e57594f975fdb1f697e4a288910 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Tue, 22 May 2018 12:36:54 +0200
Subject: Iterate over indexes not fields

---
 .../main/java/com/yahoo/search/handler/SearchHandler.java   |  2 +-
 .../java/com/yahoo/search/querytransform/NGramSearcher.java | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/search')

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 1c6e92ebffc..e9e4e34727c 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -230,7 +230,7 @@ public class SearchHandler extends LoggingRequestHandler {
                 return (e.getCause() instanceof IllegalArgumentException)
                         ? invalidParameterResponse(request, e)
                         : illegalQueryResponse(request, e);
-            } catch (RuntimeException e) { // Make sure we generate a valid XML response even on unexpected errors
+            } catch (RuntimeException e) { // Make sure we generate a valid response even on unexpected errors
                 log.log(Level.WARNING, "Failed handling " + request, e);
                 return internalServerErrorResponse(request, e);
             }
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java
index 2768a546cd0..399ff6194c8 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java
@@ -40,8 +40,8 @@ public class NGramSearcher extends Searcher {
     private final CharacterClasses characterClasses;
 
     public NGramSearcher(Linguistics linguistics) {
-        gramSplitter= linguistics.getGramSplitter();
-        characterClasses= linguistics.getCharacterClasses();
+        gramSplitter = linguistics.getGramSplitter();
+        characterClasses = linguistics.getCharacterClasses();
     }
 
     @Override
@@ -54,7 +54,7 @@ public class NGramSearcher extends Searcher {
         if (rewritten)
             query.trace("Rewritten to n-gram matching",true,2);
 
-        Result result=execution.search(query);
+        Result result = execution.search(query);
         recombineNGrams(result.hits().deepIterator(), session);
         return result;
     }
@@ -160,10 +160,11 @@ public class NGramSearcher extends Searcher {
             if (hit.isMeta()) continue;
             Object sddocname = hit.getField(Hit.SDDOCNAME_FIELD);
             if (sddocname == null) return;
-            for (String fieldName : hit.fieldKeys()) { // TODO: Iterate over indexes instead
-                Index index = session.getIndex(fieldName, sddocname.toString());
+            for (Index index : session.getIndexes(sddocname.toString())) {
                 if (index.isNGram() && (index.getHighlightSummary() || index.getDynamicSummary())) {
-                    hit.setField(fieldName, recombineNGramsField(hit.getField(fieldName), index.getGramSize()));
+                    Object fieldValue = hit.getField(index.getName());
+                    if (fieldValue != null)
+                        hit.setField(index.getName(), recombineNGramsField(fieldValue, index.getGramSize()));
                 }
             }
         }
-- 
cgit v1.2.3