diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2023-06-13 08:27:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 08:27:55 +0200 |
| commit | 982817bd81908a320338ae1c2b1945392ca69398 (patch) | |
| tree | 34f6c7b5ce6dcd0ab91cd9e0290afab27b44dd12 /container-search/src/main/java/com/yahoo/prelude | |
| parent | bb324300a8884035423dafaab1ebb7c72da2ae4c (diff) | |
| parent | d876e1b4855c55ab6a8544001009418efec9abac (diff) | |
Merge pull request #27382 from vespa-engine/bratseth/validate-prefix-matching-take-2-alternative-ending
Bratseth/validate prefix matching take 2 alternative ending
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
3 files changed, 13 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java index e245faec919..af8f63ab9f2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/Index.java +++ b/container-search/src/main/java/com/yahoo/prelude/Index.java @@ -36,6 +36,7 @@ public class Index { private boolean hostIndex = false; private StemMode stemMode = StemMode.NONE; private boolean isAttribute = false; + private boolean isIndex = false; private boolean isDefaultPosition = false; private boolean dynamicSummary=false; private boolean highlightSummary=false; @@ -157,6 +158,8 @@ public class Index { setNGram(true, Integer.parseInt(command.substring(6))); } else if (command.equals("attribute")) { setAttribute(true); + } else if (command.equals("index")) { + setIndex(true); } else if (command.equals("default-position")) { setDefaultPosition(true); } else if (command.equals("plain-tokens")) { @@ -273,6 +276,12 @@ public class Index { this.isAttribute = isAttribute; } + public boolean isIndex() { return isIndex; } + + public void setIndex(boolean isIndex) { + this.isIndex = isIndex; + } + public boolean hasPlainTokens() { return plainTokens; } public void setPlainTokens(boolean plainTokens) { diff --git a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java index 1d9e32ec374..a232841f29f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java +++ b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java @@ -86,12 +86,13 @@ public class SearchDefinition { return idx; } - public void addCommand(String indexName, String commandString) { + public Index addCommand(String indexName, String commandString) { Index index = getOrCreateIndex(indexName); index.addCommand(commandString); if (index.isDefaultPosition()) { defaultPosition = index.getName(); } + return index; } } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java b/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java index 7f37b77919b..e278ad38487 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java @@ -27,8 +27,9 @@ public final class ToolBox { /** * Invoked when all sub-items have been visited, or immediately after * visit() if there are no sub-items or visit() returned false. + * This default implementation does nothing. */ - public abstract void onExit(); + public void onExit() {} } |