summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <tegge@oath.com>2017-08-21 09:30:25 +0000
committerTor Egge <tegge@oath.com>2017-08-21 09:30:25 +0000
commit76e27c702649b236431f2897397514dea3d95c09 (patch)
tree2efcc6bb747ffe1d406c0733d9fb5f127fd0305e /searchcore
parent3a78992a83949fd4d085badc6f2dc241afb5560b (diff)
Stop trying to get attribute field from old schema when determining if
document store needs to be populated from attribute that is being removed. If attribute aspect removal has been delayed during an earlier reconfig then the old schema won't have information about the attribute.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
index bc18f772fcb..711f8ebdcaf 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
@@ -81,14 +81,6 @@ getAttributesToPopulate(const ARIConfig &newCfg,
return IReprocessingReader::SP();
}
-Schema::AttributeField
-getAttributeField(const Schema &schema, const vespalib::string &name)
-{
- uint32_t attrFieldId = schema.getAttributeFieldId(name);
- assert(attrFieldId != Schema::UNKNOWN_FIELD_ID);
- return schema.getAttributeField(attrFieldId);
-}
-
std::vector<IReprocessingRewriter::SP>
getFieldsToPopulate(const ARIConfig &newCfg,
const ARIConfig &oldCfg,
@@ -101,7 +93,6 @@ getFieldsToPopulate(const ARIConfig &newCfg,
oldCfg.getAttrMgr()->getAttributeList(attrList);
for (const auto &guard : attrList) {
const vespalib::string &name = guard->getName();
- Schema::AttributeField attrField = getAttributeField(oldCfg.getSchema(), name);
BasicType attrType(guard->getConfig().basicType());
bool inNewAttrMgr = newCfg.getAttrMgr()->getAttribute(name)->valid();
bool unchangedField = inspector.hasUnchangedField(name);