diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-05-11 16:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 16:11:49 +0200 |
| commit | d6254bf1814d8046f432ff89410cc25aa059a2f0 (patch) | |
| tree | b14ffd54caac84af2f61995f72edc71a26b7fef9 /container-search/src/main/java/com/yahoo/prelude/searcher | |
| parent | 270a07a699463c6e0d509987c70509114b1ca870 (diff) | |
Revert "Bratseth/allocation free hit field traversal"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/searcher')
3 files changed, 2 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java index 415ebd7871c..164ff9a993b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java @@ -74,7 +74,7 @@ public class DocumentSourceSearcher extends Searcher { removePropertiesNotStartingByA(attributeHit); attributeHit.setFillable(); attributeHit.setRelevance(fullHit.getRelevance()); - for (Object propertyKeyObject : fullHit.fields().keySet()) { + for (Object propertyKeyObject : (Set) fullHit.fields().keySet()) { String propertyKey=propertyKeyObject.toString(); if (propertyKey.startsWith("attribute")) attributeHit.setField(propertyKey, fullHit.getField(propertyKey)); diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java index ca87c0c1d46..9e1808bb08e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java @@ -107,12 +107,6 @@ public class JuniperSearcher extends Searcher { if (searchDefinitionField == null) continue; String searchDefinitionName = searchDefinitionField.toString(); - // TODO: Switch to iterate over indexes in the outer loop: - //for (Index index : indexFacts.getIndexes(searchDefinitionName())) { - // if (index.getDynamicSummary() || index.getHighlightSummary()) { - // insertTags(hit.buildHitField(index.getName(), true, true), bolding, index.getDynamicSummary()); - // } - //} for (String fieldName : hit.fields().keySet()) { Index index = indexFacts.getIndex(fieldName, searchDefinitionName); if (index.getDynamicSummary() || index.getHighlightSummary()) diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/QuotingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/QuotingSearcher.java index d4cad7f1246..7ff5b1b1a0e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/QuotingSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/QuotingSearcher.java @@ -20,7 +20,7 @@ import com.yahoo.search.searchchain.Execution; * * May be extended to do quoting template sensitive. * - * @author Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class QuotingSearcher extends Searcher { |