Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions be/src/olap/collection_statistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "collection_statistics.h"

#include <set>
#include <sstream>

#include "common/exception.h"
Expand All @@ -26,6 +27,7 @@
#include "olap/rowset/segment_v2/index_reader_helper.h"
#include "olap/rowset/segment_v2/inverted_index/analyzer/analyzer.h"
#include "olap/rowset/segment_v2/inverted_index/util/string_helper.h"
#include "util/uid_util.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
#include "vec/exprs/vliteral.h"
Expand Down Expand Up @@ -64,31 +66,44 @@ Status CollectionStatistics::collect(
}
}

#ifndef NDEBUG
std::stringstream ss;
ss << "term_num_docs: " << _total_num_docs;
for (const auto& [ws_field_name, num_tokens] : _total_num_tokens) {
ss << ", [field_name: " << StringHelper::to_string(ws_field_name)
<< ", num_tokens: " << num_tokens;
auto it = _term_doc_freqs.find(ws_field_name);
if (it != _term_doc_freqs.end()) {
ss << ", terms: {";
bool first = true;
for (const auto& [term, doc_freq] : it->second) {
if (!first) {
ss << ", ";
}
ss << StringHelper::to_string(term) << ": " << doc_freq;
first = false;
// Build a single-line log with query_id, tablet_ids, and per-field term statistics
if (VLOG_IS_ON(1)) {
std::set<int64_t> tablet_ids;
for (const auto& rs_split : rs_splits) {
if (rs_split.rs_reader && rs_split.rs_reader->rowset()) {
tablet_ids.insert(rs_split.rs_reader->rowset()->rowset_meta()->tablet_id());
}
ss << "}";
} else {
ss << ", (no term stats)";
}
ss << "]";

std::ostringstream oss;
oss << "CollectionStatistics: query_id=" << print_id(state->query_id());

oss << ", tablet_ids=[";
bool first_tablet = true;
for (int64_t tid : tablet_ids) {
if (!first_tablet) oss << ",";
oss << tid;
first_tablet = false;
}
oss << "]";

oss << ", total_num_docs=" << _total_num_docs;

for (const auto& [ws_field_name, num_tokens] : _total_num_tokens) {
oss << ", {field=" << StringHelper::to_string(ws_field_name)
<< ", num_tokens=" << num_tokens << ", terms=[";

bool first_term = true;
for (const auto& [term, doc_freq] : _term_doc_freqs.at(ws_field_name)) {
if (!first_term) oss << ", ";
oss << "(" << StringHelper::to_string(term) << ":" << doc_freq << ")";
first_term = false;
}
oss << "]}";
}

VLOG(1) << oss.str();
}
LOG(INFO) << "CollectionStatistics: " << ss.str();
#endif

return Status::OK();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const int32_t BM25Similarity::NUM_FREE_VALUES = 255 - static_cast<int>(MAX_INT4)
std::vector<float> BM25Similarity::LENGTH_TABLE = []() {
std::vector<float> table(256);
for (int32_t i = 0; i < 256; i++) {
table[i] = int_to_byte4(i);
table[i] = (float)byte4_to_int((uint8_t)i);
}
return table;
}();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TEST_F(BM25SimilarityTest, ScoreEdgeCasesTest) {
ASSERT_GT(score_high, 0.0f);

float score_max_norm = similarity_->score(1.0f, 255);
ASSERT_GT(score_max_norm, 0.0f);
ASSERT_GE(score_max_norm, 0.0f);
}

TEST_F(BM25SimilarityTest, Int4EncodingTest) {
Expand Down Expand Up @@ -231,6 +231,32 @@ TEST_F(BM25SimilarityTest, LengthTableInitializationTest) {
}
}

TEST_F(BM25SimilarityTest, LengthTableCorrectDecoding) {
for (int i = 0; i < 256; ++i) {
float expected = static_cast<float>(BM25Similarity::byte4_to_int(static_cast<uint8_t>(i)));
ASSERT_FLOAT_EQ(BM25Similarity::LENGTH_TABLE[i], expected)
<< "LENGTH_TABLE[" << i << "] should equal byte4_to_int(" << i << ")";
}

std::vector<int32_t> test_doc_lengths = {0, 1, 10, 50, 100, 500, 1000, 5000, 10000};
for (int32_t doc_len : test_doc_lengths) {
uint8_t encoded_norm = BM25Similarity::int_to_byte4(doc_len);
float decoded_via_table = BM25Similarity::LENGTH_TABLE[encoded_norm];
int32_t decoded_via_func = BM25Similarity::byte4_to_int(encoded_norm);

ASSERT_FLOAT_EQ(decoded_via_table, static_cast<float>(decoded_via_func))
<< "Mismatch for doc_len=" << doc_len << ", encoded_norm=" << (int)encoded_norm;

ASSERT_LE(decoded_via_func, doc_len)
<< "Decoded value should be <= original for doc_len=" << doc_len;
}

for (int i = 0; i < 256; ++i) {
int32_t correct_value = BM25Similarity::byte4_to_int(static_cast<uint8_t>(i));
ASSERT_FLOAT_EQ(BM25Similarity::LENGTH_TABLE[i], static_cast<float>(correct_value));
}
}

TEST_F(BM25SimilarityTest, DifferentParametersTest) {
mock_stats_->set_mock_idf(1.0f);
mock_stats_->set_mock_avg_dl(1.0f);
Expand Down
Loading