summaryrefslogtreecommitdiffstats
path: root/streamingvisitors
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 /streamingvisitors
parent034ec90d9277634618454f827ed5095135e1e1ca (diff)
Standardize on using lowercase first letter in function names.
Diffstat (limited to 'streamingvisitors')
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp4
-rw-r--r--streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp16
-rw-r--r--streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp18
-rw-r--r--streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h4
4 files changed, 21 insertions, 21 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 4b64b7ab45b..bb84d141d99 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -161,9 +161,9 @@ SearchVisitor::SummaryGenerator::get_streaming_docsums_state(const vespalib::str
ds._args.setLocation(_location.value());
}
if (_stack_dump.has_value()) {
- ds._args.SetStackDump(_stack_dump.value().size(), _stack_dump.value().data());
+ ds._args.setStackDump(_stack_dump.value().size(), _stack_dump.value().data());
}
- _docsumWriter->InitState(_attr_manager, ds, state->get_resolve_class_info());
+ _docsumWriter->initState(_attr_manager, ds, state->get_resolve_class_info());
auto insres = _docsum_states.insert(std::make_pair(summary_class, std::move(state)));
return *insres.first->second;
}
diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
index aa9c9bd860b..845e81dc01b 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
@@ -206,9 +206,9 @@ DocsumStoreFieldValue
DocsumStoreVsmDocument::get_field_value(const vespalib::string& field_name) const
{
if (_document != nullptr) {
- auto entry_idx = _result_class.GetIndexFromName(field_name.c_str());
+ auto entry_idx = _result_class.getIndexFromName(field_name.c_str());
if (entry_idx >= 0) {
- assert((uint32_t) entry_idx < _result_class.GetNumEntries());
+ assert((uint32_t) entry_idx < _result_class.getNumEntries());
return _docsum_filter.get_summary_field(entry_idx, _vsm_document);
}
try {
@@ -230,9 +230,9 @@ void
DocsumStoreVsmDocument::insert_summary_field(const vespalib::string& field_name, vespalib::slime::Inserter& inserter) const
{
if (_document != nullptr) {
- auto entry_idx = _result_class.GetIndexFromName(field_name.c_str());
+ auto entry_idx = _result_class.getIndexFromName(field_name.c_str());
if (entry_idx >= 0) {
- assert((uint32_t) entry_idx < _result_class.GetNumEntries());
+ assert((uint32_t) entry_idx < _result_class.getNumEntries());
_docsum_filter.insert_summary_field(entry_idx, _vsm_document, inserter);
return;
}
@@ -257,9 +257,9 @@ DocsumStoreVsmDocument::insert_juniper_field(const vespalib::string& field_name,
if (field_value) {
FieldModifier* modifier = nullptr;
if (is_struct_or_multivalue_field_type(*field_value->getDataType())) {
- auto entry_idx = _result_class.GetIndexFromName(field_name.c_str());
+ auto entry_idx = _result_class.getIndexFromName(field_name.c_str());
if (entry_idx >= 0) {
- assert((uint32_t) entry_idx < _result_class.GetNumEntries());
+ assert((uint32_t) entry_idx < _result_class.getNumEntries());
modifier = _docsum_filter.get_field_modifier(entry_idx);
}
} else {
@@ -324,10 +324,10 @@ void DocsumFilter::init(const FieldMap & fieldMap, const FieldPathMapT & fieldPa
const ResultClass *resClass = _tools->getResultClass();
const std::vector<DocsumTools::FieldSpec> & inputSpecs = _tools->getFieldSpecs();
if (resClass != nullptr) {
- uint32_t entryCnt = resClass->GetNumEntries();
+ uint32_t entryCnt = resClass->getNumEntries();
assert(entryCnt == inputSpecs.size());
for (uint32_t i = 0; i < entryCnt; ++i) {
- const ResConfigEntry &entry = *resClass->GetEntry(i);
+ const ResConfigEntry &entry = *resClass->getEntry(i);
const DocsumTools::FieldSpec & toolsSpec = inputSpecs[i];
_fields.push_back(DocsumFieldSpec(toolsSpec.getCommand()));
LOG(debug, "About to prepare field spec for summary field '%s'", entry.name().c_str());
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
index 34a8ca8713e..dc055bd5fec 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
@@ -25,7 +25,7 @@ GetDocsumsStateCallback::GetDocsumsStateCallback() :
_matching_elements_filler()
{ }
-void GetDocsumsStateCallback::FillSummaryFeatures(GetDocsumsState& state)
+void GetDocsumsStateCallback::fillSummaryFeatures(GetDocsumsState& state)
{
if (_summaryFeatures) { // set the summary features to write to the docsum
state._summaryFeatures = _summaryFeatures;
@@ -33,7 +33,7 @@ void GetDocsumsStateCallback::FillSummaryFeatures(GetDocsumsState& state)
}
}
-void GetDocsumsStateCallback::FillRankFeatures(GetDocsumsState& state)
+void GetDocsumsStateCallback::fillRankFeatures(GetDocsumsState& state)
{
if (_rankFeatures) { // set the rank features to write to the docsum
state._rankFeatures = _rankFeatures;
@@ -86,11 +86,11 @@ DocsumTools::set_writer(std::unique_ptr<DynamicDocsumWriter> writer)
bool
DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg)
{
- uint32_t defaultSummaryId = getResultConfig()->LookupResultClassId(cfg->outputclass);
- _resultClass = getResultConfig()->LookupResultClass(defaultSummaryId);
+ uint32_t defaultSummaryId = getResultConfig()->lookupResultClassId(cfg->outputclass);
+ _resultClass = getResultConfig()->lookupResultClass(defaultSummaryId);
if (_resultClass != nullptr) {
- for (uint32_t i = 0; i < _resultClass->GetNumEntries(); ++i) {
- const ResConfigEntry * entry = _resultClass->GetEntry(i);
+ for (uint32_t i = 0; i < _resultClass->getNumEntries(); ++i) {
+ const ResConfigEntry * entry = _resultClass->getEntry(i);
_fieldSpecs.emplace_back();
_fieldSpecs.back().setOutputName(entry->name());
bool found = false;
@@ -147,15 +147,15 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot)
// init result config
auto resCfg = std::make_unique<ResultConfig>();
auto docsum_field_writer_factory = std::make_unique<DocsumFieldWriterFactory>(summary.get()->usev8geopositions, *docsumTools, *_fieldsCfg.get());
- if ( ! resCfg->ReadConfig(*summary.get(), _configId.c_str(), *docsum_field_writer_factory)) {
+ if ( !resCfg->readConfig(*summary.get(), _configId.c_str(), *docsum_field_writer_factory)) {
throw std::runtime_error("(re-)configuration of VSM (docsum tools) failed due to bad summary config");
}
docsum_field_writer_factory.reset();
// init keyword extractor
auto kwExtractor = std::make_unique<KeywordExtractor>(nullptr);
- kwExtractor->AddLegalIndexSpec(_highlightindexes.c_str());
- vespalib::string spec = kwExtractor->GetLegalIndexSpec();
+ kwExtractor->addLegalIndexSpec(_highlightindexes.c_str());
+ vespalib::string spec = kwExtractor->getLegalIndexSpec();
LOG(debug, "index highlight spec: '%s'", spec.c_str());
// create dynamic docsum writer
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index ca7ead1afff..63704b1c5a7 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
@@ -34,8 +34,8 @@ private:
public:
GetDocsumsStateCallback();
- void FillSummaryFeatures(GetDocsumsState& state) override;
- void FillRankFeatures(GetDocsumsState& state) override;
+ void fillSummaryFeatures(GetDocsumsState& state) override;
+ void fillRankFeatures(GetDocsumsState& state) override;
std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields& fields) override;
void setSummaryFeatures(const search::FeatureSet::SP & sf) { _summaryFeatures = sf; }
void setRankFeatures(const search::FeatureSet::SP & rf) { _rankFeatures = rf; }