[3.8] Fix for ES-1147 (#16298)

Dronplane · web-flow · commit cb1d4ace70a5 · 2022-05-19T11:06:32.000+06:00
* fix boost propagation

* Update CHANGELOG

* wip
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 v3.8.7 (XXXX-XX-XX)
 -------------------
 
+* Fix ES-1147. Fixed boost propagation in STARTS_WITH function.
+
 * Fix documentation of collection's `cacheEnabled` property default.
 
 * Make all requests which are needed for shard resync at least medium priority
diff --git a/arangod/IResearch/IResearchFilterFactory.cpp b/arangod/IResearch/IResearchFilterFactory.cpp
@@ -3581,17 +3581,21 @@ Result fromFuncStartsWith(
 
     TRI_ASSERT(filterCtx.analyzer);
     kludge::mangleField(name, filterCtx.analyzer);
-    filter->boost(filterCtx.boost);
 
     if (isMultiPrefix) {
       auto& minMatchFilter = filter->add<irs::Or>();
       minMatchFilter.min_match_count(static_cast<size_t>(minMatchCount));
+      minMatchFilter.boost(filterCtx.boost);
       // become a new root
       filter = &minMatchFilter;
     }
 
     for (size_t i = 0, size = prefixes.size(); i < size; ++i) {
       auto& prefixFilter = filter->add<irs::by_prefix>();
+      if (!isMultiPrefix) {
+        TRI_ASSERT(prefixes.size() == 1);
+        prefixFilter.boost(filterCtx.boost);
+      }
       if (i + 1 < size) {
         *prefixFilter.mutable_field() = name;
       } else {
diff --git a/tests/IResearch/IResearchFilterFunction-test.cpp b/tests/IResearch/IResearchFilterFunction-test.cpp
@@ -5481,8 +5481,8 @@ TEST_F(IResearchFilterFunctionTest, StartsWith) {
   // with scoring limit (double), boost
   {
     irs::Or expected;
-    expected.boost(3.1f);
     auto& prefix = expected.add<irs::by_prefix>();
+    prefix.boost(3.1f);
     *prefix.mutable_field() = mangleStringIdentity("name");
     auto* opt = prefix.mutable_options();
     opt->term = irs::ref_cast<irs::byte_type>(irs::string_ref("abc"));
@@ -5503,10 +5503,10 @@ TEST_F(IResearchFilterFunctionTest, StartsWith) {
   // with scoring limit with min match count (double), boost
   {
     irs::Or expected;
-    expected.boost(3.1f);
     auto& orFilter = expected.add<irs::Or>();
     orFilter.min_match_count(2);
     auto& prefix = orFilter.add<irs::by_prefix>();
+    orFilter.boost(3.1f);
     *prefix.mutable_field() = mangleStringIdentity("name");
     auto* opt = prefix.mutable_options();
     opt->term = irs::ref_cast<irs::byte_type>(irs::string_ref("abc"));
