diff options
author | Kyle Rowan <karowan55@gmail.com> | 2021-02-05 09:16:48 +0000 |
---|---|---|
committer | Kyle Rowan <karowan55@gmail.com> | 2021-02-05 09:16:48 +0000 |
commit | 7221ea4b2edc54688f4a89eb4095fecef4be68cd (patch) | |
tree | 6bc1ff3e84a8d440187ca7ffec9dc0a3b186dfaf /container-search | |
parent | 147115c0242f0ebd3614fe0afa83f32cfdfd66af (diff) |
added searcher to replace OrItems
Diffstat (limited to 'container-search')
2 files changed, 147 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java new file mode 100644 index 00000000000..00c0db773d3 --- /dev/null +++ b/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java @@ -0,0 +1,43 @@ +package com.yahoo.search.querytransform; + +import com.yahoo.prelude.query.*; +import com.yahoo.processing.request.CompoundName; +import com.yahoo.search.Query; +import com.yahoo.search.Result; +import com.yahoo.search.Searcher; +import com.yahoo.search.searchchain.Execution; + +public class WeakAndReplacementSearcher extends Searcher { + private static final CompoundName WEAKAND_REPLACE = new CompoundName("weakand.replace"); + + @Override public Result search(Query query, Execution execution) { + if (!query.properties().getBoolean(WEAKAND_REPLACE)) { + return execution.search(query); + } + replaceOrItems(query); + return execution.search(query); + } + + private void replaceOrItems(Query query) { + Item root = query.getModel().getQueryTree().getRoot(); + int hits = query.properties().getInteger("wand.hits", WeakAndItem.defaultN); + query.getModel().getQueryTree().setRoot(replaceOrItems(root, hits)); + } + + private Item replaceOrItems(Item item, int hits) { + if (!(item instanceof CompositeItem)) { + return item; + } + CompositeItem compositeItem = (CompositeItem) item; + if (item instanceof OrItem) { + WeakAndItem newItem = new WeakAndItem(hits); + newItem.setWeight(item.getWeight()); + compositeItem.items().forEach(newItem::addItem); + compositeItem = newItem; + } + for (int i = 0; i < compositeItem.getItemCount(); i++) { + compositeItem.setItem(i, replaceOrItems(compositeItem.getItem(i), hits)); + } + return compositeItem; + } +} diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java new file mode 100644 index 00000000000..efc525cdd8d --- /dev/null +++ b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java @@ -0,0 +1,104 @@ +package com.yahoo.search.querytransform; + +import com.yahoo.component.chain.Chain; +import com.yahoo.prelude.query.*; +import com.yahoo.processing.request.CompoundName; +import com.yahoo.search.Query; +import com.yahoo.search.Result; +import com.yahoo.search.Searcher; +import com.yahoo.search.searchchain.Execution; +import org.junit.Test; + +import java.util.stream.IntStream; + +import static org.junit.Assert.*; + +public class WeakAndReplacementSearcherTestCase { + + private static final CompoundName WEAKAND_REPLACE = new CompoundName("weakand.replace"); + private static final int N = 99; + + + private Execution buildExec() { + return new Execution(new Chain<Searcher>(new WeakAndReplacementSearcher()), + Execution.Context.createContextStub()); + } + + private Query buildDefaultQuery(boolean searcherEnabled) { + Query query = new Query(); + query.properties().set("wand.hits", N); + query.properties().set(WEAKAND_REPLACE, searcherEnabled); + OrItem root = new OrItem(); + root.addItem(new WordItem("text")); + NotItem notItem = new NotItem(); + OrItem notItemOr = new OrItem(); + notItemOr.addItem(new IntItem(1, "index")); + notItemOr.addItem(new WordItem("positive")); + notItem.addPositiveItem(notItemOr); + notItem.addNegativeItem(new WordItem("negative")); + query.getModel().getQueryTree().setRoot(root); + return query; + } + + + + + @Test + public void requireOrItemsToBeReplaced() { + Query query = buildDefaultQuery(true); + Result result = buildExec().search(query); + Item root = TestUtils.getQueryTreeRoot(result); + assertFalse(orItemsExist(root)); + assertTrue(root instanceof WeakAndItem); + assertEquals(N, ((WeakAndItem)root).getN()); + } + + @Test + public void requireQueryPropertyToWork() { + Query query = buildDefaultQuery(false); + Item preRoot = query.getModel().getQueryTree().getRoot(); + Result result = buildExec().search(query); + Item root = TestUtils.getQueryTreeRoot(result); + assertTrue(orItemsExist(root)); + assertTrue(deepEquals(root, preRoot)); + } + + @Test + public void requireDoNothingOnNoOrItems() { + Query query = new Query(); + query.properties().set(WEAKAND_REPLACE, true); + AndItem andItem = new AndItem(); + andItem.addItem(new WordItem("1")); + andItem.addItem(new WordItem("2")); + query.getModel().getQueryTree().setRoot(andItem); + Result result = buildExec().search(query); + Item root = TestUtils.getQueryTreeRoot(result); + assertTrue(deepEquals(root, andItem)); + } + + private boolean deepEquals(Item item1, Item item2) { + if (item1 != item2) { + return false; + } + if (!(item1 instanceof CompositeItem)) { + return true; + } + + CompositeItem compositeItem1 = (CompositeItem) item1; + CompositeItem compositeItem2 = (CompositeItem) item2; + return IntStream.range(0, compositeItem1.getItemCount()) + .allMatch(i -> deepEquals(compositeItem1.getItem(i), compositeItem2.getItem(i))); + } + + private boolean orItemsExist(Item item) { + if (!(item instanceof CompositeItem)) { + return false; + } + if (item instanceof OrItem) { + return true; + } + CompositeItem compositeItem = (CompositeItem) item; + return compositeItem.items().stream().anyMatch(this::orItemsExist); + } + +} |