diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-14 12:28:19 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-14 12:28:19 +0000 |
commit | 1d1b1f3754fd876c4ea4684fcb4887d4fbd77724 (patch) | |
tree | 85441528c2d84068c97fe1218a341ee997025da7 /searchcore | |
parent | 760768ad9a5f376275b06ed38a516e80cba1aa65 (diff) |
Handle that [docid] can use an optional attribute.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index 6f4ebe2b537..4668b8c65ab 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -1989,7 +1989,7 @@ TEST(DocumentMetaStoreTest, serialize_for_sort) EXPECT_EQ(SZ, dms.serializeForAscendingSort(2, asc_dest, sizeof(asc_dest), nullptr)); EXPECT_TRUE(dms.getGid(2, gid)); EXPECT_EQ(0, memcmp(asc_dest, gid.get(), SZ)); - + uint8_t desc_dest[SZ]; EXPECT_EQ(SZ, dms.serializeForDescendingSort(2, desc_dest, sizeof(desc_dest), nullptr)); for (size_t i(0); i < SZ; i++) { diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp index f332ca5ec26..ce1f30593c5 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp @@ -28,7 +28,7 @@ ResultProcessor::Result::~Result() = default; ResultProcessor::Sort::Sort(uint32_t partitionId, const vespalib::Doom & doom, IAttributeContext &ac, const vespalib::string &ss) : sorter(FastS_DefaultResultSorter::instance()), _ucaFactory(std::make_unique<search::uca::UcaConverterFactory>()), - sortSpec(partitionId, doom, *_ucaFactory) + sortSpec("[no-metastore]", partitionId, doom, *_ucaFactory) { if (!ss.empty() && sortSpec.Init(ss.c_str(), ac)) { sorter = &sortSpec; @@ -46,9 +46,9 @@ ResultProcessor::Context::~Context() = default; void ResultProcessor::GroupingSource::merge(Source &s) { - GroupingSource &rhs = static_cast<GroupingSource&>(s); - assert((ctx == 0) == (rhs.ctx == 0)); - if (ctx != 0) { + auto &rhs = dynamic_cast<GroupingSource&>(s); + assert((ctx == nullptr) == (rhs.ctx == nullptr)); + if (ctx != nullptr) { search::grouping::GroupingManager man(*ctx); man.merge(*rhs.ctx); } @@ -112,7 +112,7 @@ ResultProcessor::extract_docid_ordering(const PartialResult &result) const } std::sort(list.begin(), list.end(), [](const auto &a, const auto &b){ return (a.first < b.first); }); return list; -}; +} ResultProcessor::Result::UP ResultProcessor::makeReply(PartialResultUP full_result) |