diff options
6 files changed, 13 insertions, 13 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(); diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp index 9d3d390efe1..3a3f2279ad2 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp @@ -231,7 +231,7 @@ void DocsumFilter::init(const FieldMap & fieldMap, const FieldPathMapT & fieldPa const ResConfigEntry &entry = *resClass->GetEntry(i); const DocsumTools::FieldSpec & toolsSpec = inputSpecs[i]; _fields.push_back(DocsumFieldSpec(entry._type, toolsSpec.getCommand())); - LOG(debug, "About to prepare field spec for summary field '%s'", entry._bindname.c_str()); + LOG(debug, "About to prepare field spec for summary field '%s'", entry._name.c_str()); prepareFieldSpec(_fields.back(), toolsSpec, fieldMap, fieldPathMap); } assert(entryCnt == _fields.size()); diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index 4877f114ebb..5b3ef733eec 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -92,12 +92,12 @@ DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg) for (uint32_t i = 0; i < _resultClass->GetNumEntries(); ++i) { const ResConfigEntry * entry = _resultClass->GetEntry(i); _fieldSpecs.emplace_back(); - _fieldSpecs.back().setOutputName(entry->_bindname); + _fieldSpecs.back().setOutputName(entry->_name); bool found = false; if (cfg) { // check if we have this summary field in the vsmsummary config for (uint32_t j = 0; j < cfg->fieldmap.size() && !found; ++j) { - if (entry->_bindname == cfg->fieldmap[j].summary.c_str()) { + if (entry->_name == cfg->fieldmap[j].summary.c_str()) { for (uint32_t k = 0; k < cfg->fieldmap[j].document.size(); ++k) { _fieldSpecs.back().getInputNames().push_back(cfg->fieldmap[j].document[k].field); } @@ -108,7 +108,7 @@ DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg) } if (!found) { // use yourself as input - _fieldSpecs.back().getInputNames().push_back(entry->_bindname); + _fieldSpecs.back().getInputNames().push_back(entry->_name); } } } else { |