Skip to content

Commit a7e5845

Browse files
kvahedkvahed
committed
last commits from origin
1 parent 957f50e commit a7e5845

File tree

3 files changed

+11
-93
lines changed

3 files changed

+11
-93
lines changed

‎core/formats/columnstore2.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,11 @@ class column_base : public column_reader, private util::noncopyable {
393393
if (irs::IsNull(column_name)) {
394394
column_name = "<anonymous>";
395395
}
396-
IRS_LOG_WARN(
397-
absl::StrCat("Failed to allocate memory for buffered column id ",
398-
header().id, " name: ", column_name, " of size ", size));
396+
IRS_LOG_INFO(absl::StrCat(
397+
"Failed to allocate memory for buffered column id ", header().id,
398+
" name: ", column_name, " of size ", (size + mappings),
399+
". This can happen if no columns cache was configured or the "
400+
"column data size exceeds the columns cache size."));
399401
return false;
400402
}
401403

‎tests/search/bm25_test.cpp‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -970,8 +970,9 @@ TEST_P(bm25_test_case, test_query) {
970970
EXPECT_GT(counter.max, 0);
971971
counter.Reset();
972972

973+
// by_range single + scored_terms_limit(0)
973974
// by_range single + scored_terms_limit(1)
974-
{
975+
for (size_t limit = 0; limit != 2; ++limit) {
975976
auto values = column->iterator(irs::ColumnHint::kNormal);
976977
ASSERT_NE(nullptr, values);
977978
auto* actual_value = irs::get<irs::payload>(*values);
@@ -985,7 +986,7 @@ TEST_P(bm25_test_case, test_query) {
985986
filter.mutable_options()->range.max =
986987
irs::ViewCast<irs::byte_type>(std::string_view("9"));
987988
filter.mutable_options()->range.max_type = irs::BoundType::EXCLUSIVE;
988-
filter.mutable_options()->scored_terms_limit = 1;
989+
filter.mutable_options()->scored_terms_limit = limit;
989990

990991
std::multimap<irs::score_t, uint32_t, std::greater<>> sorted;
991992
constexpr std::array expected{3, 7};
@@ -1023,49 +1024,6 @@ TEST_P(bm25_test_case, test_query) {
10231024
EXPECT_GT(counter.max, 0);
10241025
counter.Reset();
10251026

1026-
// FIXME!!!
1027-
// // by_range single + scored_terms_limit(0)
1028-
// {
1029-
// auto values = column->iterator(irs::ColumnHint::kNormal);
1030-
// ASSERT_NE(nullptr, values);
1031-
// auto* actual_value = irs::get<irs::payload>(*values);
1032-
// ASSERT_NE(nullptr, actual_value);
1033-
//
1034-
// irs::by_range filter;
1035-
//
1036-
// filter.field("field").scored_terms_limit(0)
1037-
// .include<irs::Bound::MIN>(true).term<irs::Bound::MIN>("8")
1038-
// .include<irs::Bound::MAX>(false).term<irs::Bound::MAX>("9");
1039-
//
1040-
// std::multimap<irs::score_t, uint32_t, std::greater<>> sorted;
1041-
// constexpr std::array expected{ 3, 7 };
1042-
//
1043-
// irs::bytes_view_input in;
1044-
// auto prepared_filter = filter.prepare({.index=reader,
1045-
// .scorers=prepared_order}); auto docs =
1046-
// prepared_filter->execute({.segment=segment, .scorers=prepared_order});
1047-
// auto* score = irs::get<irs::score>(*docs);
1048-
// ASSERT_TRUE(bool(score));
1049-
//
1050-
// while(docs->next()) {
1051-
// irs::score_t score_value;
1052-
// (*score)(&score_value);
1053-
// ASSERT_EQ(docs->value(), values->seek(docs->value()));
1054-
// in.reset(actual_value->value);
1055-
//
1056-
// auto str_seq = irs::read_string<std::string>(in);
1057-
// auto seq = strtoull(str_seq.c_str(), nullptr, 10);
1058-
// sorted.emplace(score_value, seq);
1059-
// }
1060-
//
1061-
// ASSERT_EQ(expected.size(), sorted.size());
1062-
// size_t i = 0;
1063-
//
1064-
// for (auto& entry: sorted) {
1065-
// ASSERT_EQ(expected[i++], entry.second);
1066-
// }
1067-
// }
1068-
10691027
// by_range multiple
10701028
{
10711029
auto values = column->iterator(irs::ColumnHint::kNormal);

‎tests/search/tfidf_test.cpp‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -970,8 +970,9 @@ TEST_P(tfidf_test_case, test_query) {
970970
EXPECT_GT(counter.max, 0);
971971
counter.Reset();
972972

973+
// by_range single + scored_terms_limit(0)
973974
// by_range single + scored_terms_limit(1)
974-
{
975+
for (size_t limit = 0; limit != 2; ++limit) {
975976
auto values = column->iterator(irs::ColumnHint::kNormal);
976977
ASSERT_NE(nullptr, values);
977978
auto* actual_value = irs::get<irs::payload>(*values);
@@ -985,7 +986,7 @@ TEST_P(tfidf_test_case, test_query) {
985986
filter.mutable_options()->range.max =
986987
irs::ViewCast<irs::byte_type>(std::string_view("9"));
987988
filter.mutable_options()->range.max_type = irs::BoundType::EXCLUSIVE;
988-
filter.mutable_options()->scored_terms_limit = 1;
989+
filter.mutable_options()->scored_terms_limit = limit;
989990

990991
std::multimap<irs::score_t, uint64_t, std::greater<>> sorted;
991992
std::vector<uint64_t> expected{3, 7};
@@ -1022,49 +1023,6 @@ TEST_P(tfidf_test_case, test_query) {
10221023
EXPECT_GT(counter.max, 0);
10231024
counter.Reset();
10241025

1025-
// FIXME!!!
1026-
// by_range single + scored_terms_limit(0)
1027-
// {
1028-
// auto values = column->iterator(irs::ColumnHint::kNormal);
1029-
// ASSERT_NE(nullptr, values);
1030-
// auto* actual_value = irs::get<irs::payload>(*values);
1031-
// ASSERT_NE(nullptr, actual_value);
1032-
//
1033-
// irs::by_range filter;
1034-
//
1035-
// filter.field("field").scored_terms_limit(0)
1036-
// .include<irs::Bound::MIN>(true).term<irs::Bound::MIN>("8")
1037-
// .include<irs::Bound::MAX>(false).term<irs::Bound::MAX>("9");
1038-
//
1039-
// std::multimap<irs::score_t, uint64_t, std::greater<>> sorted;
1040-
// std::vector<uint64_t> expected{ 3, 7 };
1041-
//
1042-
// irs::bytes_view_input in;
1043-
// auto prepared_filter = filter.prepare({.index=reader,
1044-
// .scorers=prepared_order}); auto docs =
1045-
// prepared_filter->execute({.segment=segment, .scorers=prepared_order});
1046-
// auto* score = irs::get<irs::score>(*docs);
1047-
// ASSERT_TRUE(bool(score));
1048-
//
1049-
// while(docs->next()) {
1050-
// irs::score_t score_value;
1051-
// (*score)(&score_value);
1052-
// ASSERT_EQ(docs->value(), values->seek(docs->value()));
1053-
// in.reset(actual_value->value);
1054-
//
1055-
// auto str_seq = irs::read_string<std::string>(in);
1056-
// auto seq = strtoull(str_seq.c_str(), nullptr, 10);
1057-
// sorted.emplace(score_value, seq);
1058-
// }
1059-
//
1060-
// ASSERT_EQ(expected.size(), sorted.size());
1061-
// size_t i = 0;
1062-
//
1063-
// for (auto& entry: sorted) {
1064-
// ASSERT_EQ(expected[i++], entry.second);
1065-
// }
1066-
// }
1067-
10681026
// by_range multiple
10691027
{
10701028
auto values = column->iterator(irs::ColumnHint::kNormal);

0 commit comments

Comments
 (0)