Merge pull request #4251 from vespa-engine/havardpe/rename-limits

rename stop word limits
vespa-engine · Nov 1, 2024 · 14e748c · 14e748c
2 parents c4ca239 + ae810e7
commit 14e748c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/performance/wand_stopwords/MicroBmSearcher.java b/tests/performance/wand_stopwords/MicroBmSearcher.java
@@ -91,27 +91,25 @@ public Result search(Query weakAndQuery, Execution execution) {
         var andSet = getHitIds(andResult);
 
         Query weakAndQuery20 = changeRoot(weakAndQuery, new WeakAndItem());
-        weakAndQuery20.properties().set("rankproperty.vespa.matching.weakand.stop_word_limit", "0.20");
+        weakAndQuery20.properties().set("rankproperty.vespa.matching.weakand.stop_word_adjust_limit", "0.20");
         Result weakAndResult20 = execution.search(weakAndQuery20);
         execution.fill(weakAndResult20);
         var weakAndSet20 = getHitIds(weakAndResult20);
 
         Query weakAndQuery05 = changeRoot(weakAndQuery, new WeakAndItem());
-        weakAndQuery05.properties().set("rankproperty.vespa.matching.weakand.stop_word_limit", "0.05");
+        weakAndQuery05.properties().set("rankproperty.vespa.matching.weakand.stop_word_adjust_limit", "0.05");
         Result weakAndResult05 = execution.search(weakAndQuery05);
         execution.fill(weakAndResult05);
         var weakAndSet05 = getHitIds(weakAndResult05);
 
         Query weakAndQueryD20 = changeRoot(weakAndQuery, new WeakAndItem());
-        weakAndQueryD20.properties().set("rankproperty.vespa.matching.weakand.stop_word_limit", "0.20");
-        weakAndQueryD20.properties().set("rankproperty.vespa.matching.weakand.stop_word_strategy", "drop");
+        weakAndQueryD20.properties().set("rankproperty.vespa.matching.weakand.stop_word_drop_limit", "0.20");
         Result weakAndResultD20 = execution.search(weakAndQueryD20);
         execution.fill(weakAndResultD20);
         var weakAndSetD20 = getHitIds(weakAndResultD20);
 
         Query weakAndQueryD05 = changeRoot(weakAndQuery, new WeakAndItem());
-        weakAndQueryD05.properties().set("rankproperty.vespa.matching.weakand.stop_word_limit", "0.05");
-        weakAndQueryD05.properties().set("rankproperty.vespa.matching.weakand.stop_word_strategy", "drop");
+        weakAndQueryD05.properties().set("rankproperty.vespa.matching.weakand.stop_word_drop_limit", "0.05");
         Result weakAndResultD05 = execution.search(weakAndQueryD05);
         execution.fill(weakAndResultD05);
         var weakAndSetD05 = getHitIds(weakAndResultD05);

diff --git a/tests/performance/wand_stopwords/wikimedia.sd b/tests/performance/wand_stopwords/wikimedia.sd
@@ -24,7 +24,9 @@ schema wikimedia {
 
   rank-profile default {
     rank-properties {
-      vespa.matching.weakand.stop_word_limit: 1.0
+      vespa.matching.weakand.stop_word_adjust_limit: 1.0
+      vespa.matching.weakand.stop_word_score_limit: 1.0
+      vespa.matching.weakand.stop_word_drop_limit: 1.0
     }
     first-phase {
       # expression: bm25(title) + bm25(text)