summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-09-21 12:36:02 +0000
committerGeir Storli <geirst@yahooinc.com>2022-09-21 12:36:02 +0000
commit686fa6fef1bbd8ac12240d774c69ab076747e6a3 (patch)
treece321ca4b420a3ee4e66a32da29ceebeb1667970 /searchcore
parent034ec90d9277634618454f827ed5095135e1e1ca (diff)
Standardize on using lowercase first letter in function names.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp6
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h4
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp3
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/searchview.cpp2
5 files changed, 9 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index c53cafe0570..55353217d17 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -1015,7 +1015,7 @@ Fixture::Fixture()
_summaryCfg = ConfigGetter<vespa::config::search::SummaryConfig>::getConfig(
cfgId, ::config::FileSpec(TEST_PATH("summary.cfg")));
auto docsum_field_writer_factory = std::make_unique<MockDocsumFieldWriterFactory>();
- _resultCfg.ReadConfig(*_summaryCfg, cfgId.c_str(), *docsum_field_writer_factory);
+ _resultCfg.readConfig(*_summaryCfg, cfgId.c_str(), *docsum_field_writer_factory);
}
Fixture::~Fixture() = default;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index 1db172848db..be1c8941f65 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -73,7 +73,7 @@ DocsumContext::createSlimeReply()
{
IDocsumWriter::ResolveClassInfo rci = _docsumWriter.resolveClassInfo(_docsumState._args.getResultClassName(),
_docsumState._args.get_fields());
- _docsumWriter.InitState(_attrMgr, _docsumState, rci);
+ _docsumWriter.initState(_attrMgr, _docsumState, rci);
const size_t estimatedChunkSize(std::min(0x200000ul, _docsumState._docsumbuf.size()*0x400ul));
vespalib::Slime::UP response(std::make_unique<vespalib::Slime>(makeSlimeParams(estimatedChunkSize)));
Cursor & root = response->setObject();
@@ -125,7 +125,7 @@ DocsumContext::getDocsums()
}
void
-DocsumContext::FillSummaryFeatures(search::docsummary::GetDocsumsState& state)
+DocsumContext::fillSummaryFeatures(search::docsummary::GetDocsumsState& state)
{
assert(&_docsumState == &state);
if (_matcher->canProduceSummaryFeatures()) {
@@ -135,7 +135,7 @@ DocsumContext::FillSummaryFeatures(search::docsummary::GetDocsumsState& state)
}
void
-DocsumContext::FillRankFeatures(search::docsummary::GetDocsumsState& state)
+DocsumContext::fillRankFeatures(search::docsummary::GetDocsumsState& state)
{
assert(&_docsumState == &state);
// check if we are allowed to run
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
index 5c1db91f05d..509134b4ce1 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
@@ -49,8 +49,8 @@ public:
search::engine::DocsumReply::UP getDocsums();
// Implements GetDocsumsStateCallback
- void FillSummaryFeatures(search::docsummary::GetDocsumsState& state) override;
- void FillRankFeatures(search::docsummary::GetDocsumsState& state) override;
+ void fillSummaryFeatures(search::docsummary::GetDocsumsState& state) override;
+ void fillRankFeatures(search::docsummary::GetDocsumsState& state) override;
std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields &fields) override;
};
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index d801465372a..3a60d27a40f 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -94,7 +94,8 @@ SummarySetup(const vespalib::string & baseDir, const SummaryConfig & summaryCfg,
_juniperConfig = std::make_unique<juniper::Juniper>(&_juniperProps, _wordFolder.get());
auto resultConfig = std::make_unique<ResultConfig>();
auto docsum_field_writer_factory = std::make_unique<DocsumFieldWriterFactory>(summaryCfg.usev8geopositions, *this);
- if (!resultConfig->ReadConfig(summaryCfg, make_string("SummaryManager(%s)", baseDir.c_str()).c_str(), *docsum_field_writer_factory)) {
+ if (!resultConfig->readConfig(summaryCfg, make_string("SummaryManager(%s)", baseDir.c_str()).c_str(),
+ *docsum_field_writer_factory)) {
std::ostringstream oss;
::config::OstreamConfigWriter writer(oss);
writer.write(summaryCfg);
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
index d272a0dedf7..a17415db474 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
@@ -102,7 +102,7 @@ DocsumReply::UP
SearchView::getDocsums(const DocsumRequest & req)
{
LOG(spam, "getDocsums(): resultClass(%s), numHits(%zu)", req.resultClassName.c_str(), req.hits.size());
- if (_summarySetup->getResultConfig(). LookupResultClassId(req.resultClassName.c_str()) == ResultConfig::NoClassID()) {
+ if (_summarySetup->getResultConfig().lookupResultClassId(req.resultClassName.c_str()) == ResultConfig::noClassID()) {
Issue::report("There is no summary class with name '%s' in the summary config. Returning empty document summary for %zu hit(s)",
req.resultClassName.c_str(), req.hits.size());
return createEmptyReply(req);