WIP

core/search/min_match_disjunction.hpp

@@ -212,7 +212,7 @@ class MinMatchDisjunction : public doc_iterator,
  // greater than required min_match. All matched iterators points
  // to current matched document after this call.
  // Returns total matched iterators count.
- size_t MatchCount() {
+ size_t match_count() {
  PushValidToLead();
  return lead_;
  }
@@ -233,7 +233,7 @@ class MinMatchDisjunction : public doc_iterator,
 
  // score lead iterators
  std::memset(res, 0, static_cast<Merger&>(self).byte_size());
- std::for_each(self.lead(), self.heap_.end(), [&self, res](size_t it) {
+ std::for_each(self.Lead(), self.heap_.end(), [&self, res](size_t it) {
  IRS_ASSERT(it < self.itrs_.size());
  if (auto& score = *self.itrs_[it].score; !score.IsDefault()) {
  auto& merger = static_cast<Merger&>(self);

core/search/ngram_similarity_query.cpp

@@ -117,7 +117,7 @@ class NGramApprox<true> : public Conjunction<CostAdapter<>, NoopAggregator> {
  }(std::move(itrs))},
  match_count_{min_match_count} {}
 
- size_t MatchCount() const noexcept { return match_count_; }
+ size_t match_count() const noexcept { return match_count_; }
 
  private:
  size_t match_count_;
@@ -493,7 +493,7 @@ class NGramSimilarityDocIterator : public doc_iterator, private score_ctx {
 
  bool next() final {
  while (approx_.next()) {
- if (checker_.Check(approx_.MatchCount(), value())) {
+ if (checker_.Check(approx_.match_count(), value())) {
  return true;
  }
  }
@@ -513,7 +513,7 @@ class NGramSimilarityDocIterator : public doc_iterator, private score_ctx {
  const auto doc_id = approx_.seek(target);
 
  if (doc_limits::eof(doc_id) ||
- checker_.Check(approx_.MatchCount(), doc->value)) {
+ checker_.Check(approx_.match_count(), doc->value)) {
  return doc_id;
  }