diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-09-07 11:18:03 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-09-07 11:35:55 +0200 |
commit | c99e3a20201ce6ed2b721a09c3a75685468b6444 (patch) | |
tree | 26c349dad6d75662ebf0f2d147c6322b205441ce /searchsummary | |
parent | 6a4629eef5284bbf66e400b8a29692bfaa2b9d96 (diff) |
Rename search::docsummary::ResConfigEntry::_bindname member variable to _name.
Diffstat (limited to 'searchsummary')
4 files changed, 9 insertions, 9 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index 181af0ca9a3..422400dc2ef 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -61,8 +61,8 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid, for (uint32_t i = 0; i < rci.outputClass->GetNumEntries(); ++i) { const ResConfigEntry *resCfg = rci.outputClass->GetEntry(i); const DocsumFieldWriter *writer = resCfg->_docsum_field_writer.get(); - if (state->_args.needField(resCfg->_bindname) && ! writer->isDefaultValue(docid, state)) { - const Memory field_name(resCfg->_bindname.data(), resCfg->_bindname.size()); + if (state->_args.needField(resCfg->_name) && ! writer->isDefaultValue(docid, state)) { + const Memory field_name(resCfg->_name.data(), resCfg->_name.size()); ObjectInserter inserter(docsum, field_name); writer->insertField(docid, nullptr, state, resCfg->_type, inserter); } @@ -77,9 +77,9 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid, vespalib::slime::Cursor & docsum = topInserter.insertObject(); for (uint32_t i = 0; i < rci.outputClass->GetNumEntries(); ++i) { const ResConfigEntry *outCfg = rci.outputClass->GetEntry(i); - if ( ! state->_args.needField(outCfg->_bindname)) continue; + if ( ! state->_args.needField(outCfg->_name)) continue; const DocsumFieldWriter *writer = outCfg->_docsum_field_writer.get(); - const Memory field_name(outCfg->_bindname.data(), outCfg->_bindname.size()); + const Memory field_name(outCfg->_name.data(), outCfg->_name.size()); ObjectInserter inserter(docsum, field_name); if (writer != nullptr) { if (! writer->isDefaultValue(docid, state)) { @@ -87,7 +87,7 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid, } } else { if (doc) { - doc->insert_summary_field(outCfg->_bindname, inserter); + doc->insert_summary_field(outCfg->_name, inserter); } } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp index df02d438557..0bf9e61fc36 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp @@ -7,7 +7,7 @@ namespace search::docsummary { ResConfigEntry::ResConfigEntry() noexcept : _type(RES_BAD), - _bindname(), + _name(), _docsum_field_writer() { } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.h b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.h index aaf0ca905bc..b5b5c620c88 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.h @@ -15,7 +15,7 @@ class DocsumFieldWriter; **/ struct ResConfigEntry { ResType _type; - vespalib::string _bindname; + vespalib::string _name; std::unique_ptr<DocsumFieldWriter> _docsum_field_writer; ResConfigEntry() noexcept; ~ResConfigEntry(); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp index f84de793815..781cd62a818 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp @@ -35,8 +35,8 @@ ResultClass::AddConfigEntry(const char *name, ResType type, std::unique_ptr<Docs _nameMap[name] = _entries.size(); ResConfigEntry e; - e._type = type; - e._bindname = name; + e._type = type; + e._name = name; if (docsum_field_writer) { docsum_field_writer->setIndex(_entries.size()); bool generated = docsum_field_writer->IsGenerated(); |