diff options
| author | Jon Bratseth <bratseth@vespa.ai> | 2024-02-23 12:01:22 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@vespa.ai> | 2024-02-23 12:01:22 +0100 |
| commit | 82276df2d886993d2a98e01254d616504f66a920 (patch) | |
| tree | 61f71776b4ead6ffa4754bcff83cd495bb864300 /container-search/src/main/java/com | |
| parent | 9956c1867a8d36a67e15a416d1b75bec8aa53ba3 (diff) | |
Verify we can replace
Diffstat (limited to 'container-search/src/main/java/com')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/querytransform/CJKSearcher.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/CJKSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/CJKSearcher.java index 4f4573a1e5a..878ba230274 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/CJKSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/CJKSearcher.java @@ -79,7 +79,7 @@ public class CJKSearcher extends Searcher { for (ListIterator<Item> i = ((CompositeItem) root).getItemIterator(); i.hasNext();) { Item item = i.next(); Item transformedItem = transform(item); - if (item != transformedItem) + if (item != transformedItem && ((CompositeItem) root).acceptsItemsOfType(transformedItem.getItemType())) i.set(transformedItem); } return root; diff --git a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java index 0116d668d48..2d4ac86e3b2 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java +++ b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java @@ -75,14 +75,15 @@ public class MinimalQueryInserter extends Searcher { @Override public Result search(Query query, Execution execution) { + if (query.properties().get(YQL) == null) return execution.search(query); + Result errorResult; try { - if (query.properties().get(YQL) == null) return execution.search(query); - Result result = insertQuery(query, ParserEnvironment.fromExecutionContext(execution.context())); - return (result == null) ? execution.search(query) : result; + errorResult = insertQuery(query, ParserEnvironment.fromExecutionContext(execution.context())); } catch (IllegalArgumentException e) { throw new IllegalInputException("Illegal YQL query", e); } + return (errorResult == null) ? execution.search(query) : errorResult; } private static Result insertQuery(Query query, ParserEnvironment env) { |