Fix boost compute

core/search/all_filter.cpp

@@ -56,8 +56,7 @@ filter::prepared::ptr all::prepare(const PrepareContext& ctx) const {
 
   PrepareCollectors(ctx.scorers.buckets(), stats_buf);
 
-  return memory::make_managed<all_query>(std::move(stats),
-                                         this->boost() * ctx.boost);
+  return memory::make_managed<all_query>(std::move(stats), ctx.boost * boost());
 }
 
 }  // namespace irs

core/search/boolean_filter.cpp

@@ -337,21 +337,19 @@ filter::prepared::ptr boolean_filter::prepare(const PrepareContext& ctx) const {
     return prepared::empty();
   }
 
-  const PrepareContext sub_ctx{
-    .index = ctx.index,
-    .memory = ctx.memory,
-    .scorers = ctx.scorers,
-    .ctx = ctx.ctx,
-    .boost = ctx.boost * boost(),
-  };
-
   if (size == 1) {
     auto* filter = filters_.front().get();
     IRS_ASSERT(filter);
 
     // FIXME(gnusi): let Not handle everything?
     if (filter->type() != irs::type<irs::Not>::id()) {
-      return filter->prepare(sub_ctx);
+      return filter->prepare({
+        .index = ctx.index,
+        .memory = ctx.memory,
+        .scorers = ctx.scorers,
+        .ctx = ctx.ctx,
+        .boost = ctx.boost * boost(),
+      });
     }
   }
 
@@ -370,7 +368,7 @@ filter::prepared::ptr boolean_filter::prepare(const PrepareContext& ctx) const {
     incl.push_back(all_docs_no_boost.get());
   }
 
-  return PrepareBoolean(incl, excl, sub_ctx);
+  return PrepareBoolean(incl, excl, ctx);
 }
 
 void boolean_filter::group_filters(filter::ptr& all_docs_zero_boost,
@@ -431,16 +429,11 @@ filter::prepared::ptr And::PrepareBoolean(std::vector<const filter*>& incl,
     return prepared::empty();
   }
 
-  PrepareContext sub_ctx{
-    .index = ctx.index,
-    .memory = ctx.memory,
-    .scorers = ctx.scorers,
-    .ctx = ctx.ctx,
-    .boost = ctx.boost * boost(),
-  };
+  PrepareContext sub_ctx = ctx;
 
   // single node case
   if (1 == incl.size() && excl.empty()) {
+    sub_ctx.boost *= boost();
     return incl.front()->prepare(sub_ctx);
   }
 
@@ -499,20 +492,18 @@ filter::prepared::ptr And::PrepareBoolean(std::vector<const filter*>& incl,
 }
 
 filter::prepared::ptr Or::prepare(const PrepareContext& ctx) const {
-  const PrepareContext sub_ctx{
-    .index = ctx.index,
-    .memory = ctx.memory,
-    .scorers = ctx.scorers,
-    .ctx = ctx.ctx,
-    .boost = ctx.boost * boost(),
-  };
-
   if (0 == min_match_count_) {  // only explicit 0 min match counts!
     // all conditions are satisfied
-    return MakeAllDocsFilter(kNoBoost)->prepare(sub_ctx);
+    return MakeAllDocsFilter(kNoBoost)->prepare({
+      .index = ctx.index,
+      .memory = ctx.memory,
+      .scorers = ctx.scorers,
+      .ctx = ctx.ctx,
+      .boost = ctx.boost * boost(),
+    });
   }
 
-  return boolean_filter::prepare(sub_ctx);
+  return boolean_filter::prepare(ctx);
 }
 
 filter::prepared::ptr Or::PrepareBoolean(std::vector<const filter*>& incl,

core/search/phrase_filter.cpp

@@ -306,7 +306,7 @@ filter::prepared::ptr by_phrase::fixed_prepare_collect(const IndexReader& index,
 
   return memory::make_managed<FixedPhraseQuery>(
     std::move(phrase_states), std::move(positions), std::move(stats),
-    this->boost() * boost);
+    boost * this->boost());
 }
 
 filter::prepared::ptr by_phrase::variadic_prepare_collect(
@@ -424,7 +424,7 @@ filter::prepared::ptr by_phrase::variadic_prepare_collect(
 
   return memory::make_managed<VariadicPhraseQuery>(
     std::move(phrase_states), std::move(positions), std::move(stats),
-    this->boost() * boost);
+    boost * this->boost());
 }
 
 }  // namespace irs

core/search/wildcard_filter.hpp

@@ -70,7 +70,7 @@ class by_wildcard final : public filter_base<by_wildcard_options> {
   static field_visitor visitor(bytes_view term);
 
   filter::prepared::ptr prepare(const PrepareContext& ctx) const final {
-    return prepare(ctx.index, ctx.scorers, this->boost() * ctx.boost, field(),
+    return prepare(ctx.index, ctx.scorers, ctx.boost * boost(), field(),
                    options().term, options().scored_terms_limit);
   }
 };

tests/search/boolean_filter_tests.cpp

@@ -260,8 +260,8 @@ struct boosted : public irs::filter {
 
   irs::filter::prepared::ptr prepare(
     const irs::PrepareContext& ctx) const final {
-    return irs::memory::make_managed<boosted::prepared>(
-      docs, this->boost() * ctx.boost);
+    return irs::memory::make_managed<boosted::prepared>(docs,
+                                                        ctx.boost * boost());
   }
 
   irs::type_info::type_id type() const noexcept final {