Skip to content

[opt](inverted index) prevent excessive memory usage caused by too many terms. #33609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qidaye merged 1 commit into from
Apr 18, 2024
Merged

[opt](inverted index) prevent excessive memory usage caused by too many terms. #33609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 16 additions & 32 deletions be/src/olap/rowset/segment_v2/inverted_index/query/disjunction_query.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,59 +23,43 @@ DisjunctionQuery::DisjunctionQuery(const std::shared_ptr<lucene::search::IndexSe
const TQueryOptions& query_options)
: _searcher(searcher) {}

DisjunctionQuery::~DisjunctionQuery() {
for (auto& term_doc : _term_docs) {
if (term_doc) {
_CLDELETE(term_doc);
}
}
for (auto& term : _terms) {
if (term) {
_CLDELETE(term);
}
}
}

void DisjunctionQuery::add(const std::wstring& field_name, const std::vector<std::string>& terms) {
if (terms.empty()) {
_CLTHROWA(CL_ERR_IllegalArgument, "DisjunctionQuery::add: terms empty");
}

for (const auto& term : terms) {
std::wstring ws_term = StringUtil::string_to_wstring(term);
Term* t = _CLNEW Term(field_name.c_str(), ws_term.c_str());
_terms.push_back(t);
TermDocs* term_doc = _searcher->getReader()->termDocs(t);
_term_docs.push_back(term_doc);
_term_iterators.emplace_back(term_doc);
}
_field_name = field_name;
_terms = terms;
}

void DisjunctionQuery::search(roaring::Roaring& roaring) {
roaring::Roaring result;
auto func = [&roaring](const TermIterator& term_docs, bool first) {
roaring::Roaring result;
auto func = [this, &roaring](const std::string& term, bool first) {
std::wstring ws_term = StringUtil::string_to_wstring(term);
auto* t = _CLNEW Term(_field_name.c_str(), ws_term.c_str());
auto* term_doc = _searcher->getReader()->termDocs(t);
TermIterator iterator(term_doc);

DocRange doc_range;
while (term_docs.readRange(&doc_range)) {
roaring::Roaring result;
while (iterator.readRange(&doc_range)) {
if (doc_range.type_ == DocRangeType::kMany) {
result.addMany(doc_range.doc_many_size_, doc_range.doc_many->data());
} else {
result.addRange(doc_range.doc_range.first, doc_range.doc_range.second);
}
}

_CLDELETE(term_doc);
_CLDELETE(t);

if (first) {
roaring.swap(result);
} else {
roaring |= result;
}
};
for (int i = 0; i < _term_iterators.size(); i++) {
auto& iter = _term_iterators[i];
if (i == 0) {
func(iter, true);
} else {
func(iter, false);
}
for (int i = 0; i < _terms.size(); i++) {
func(_terms[i], i == 0);
}
}

Expand Down
7 changes: 3 additions & 4 deletions be/src/olap/rowset/segment_v2/inverted_index/query/disjunction_query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ class DisjunctionQuery : public Query {
public:
DisjunctionQuery(const std::shared_ptr<lucene::search::IndexSearcher>& searcher,
const TQueryOptions& query_options);
~DisjunctionQuery() override;
~DisjunctionQuery() override = default;

void add(const std::wstring& field_name, const std::vector<std::string>& terms) override;
void search(roaring::Roaring& roaring) override;

private:
std::shared_ptr<lucene::search::IndexSearcher> _searcher;

std::vector<Term*> _terms;
std::vector<TermDocs*> _term_docs;
std::vector<TermIterator> _term_iterators;
std::wstring _field_name;
Copy link
Contributor

@xiaokang xiaokang Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to put common fields: _filed_name and _terms in parent class Query.

std::vector<std::string> _terms;
};

} // namespace doris::segment_v2