diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-09-09 21:03:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 21:03:46 +0200 |
| commit | 133963eaed9c695eeb8488450c234f7a20d70074 (patch) | |
| tree | 0d238d3c7bb2ec277f75c2e75ae824da38bbdeb1 | |
| parent | 3bbf27bf9d235bbaf01165afcb9e175c2bbaaa89 (diff) | |
| parent | ec323fb90eb4bf792224bf47ecb5788a66ad698e (diff) | |
Merge pull request #14349 from vespa-engine/revert-14332-toregge/ignore-summary-override-if-attribute-vector-is-missing
Revert "Ignore summary override if attribute vector is missing." MERGEOK
| -rw-r--r-- | searchcore/src/tests/proton/docsummary/summarymap.cfg | 5 | ||||
| -rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/docsummary/summarymap.cfg b/searchcore/src/tests/proton/docsummary/summarymap.cfg index cb03ce76fd1..f2d429b1412 100644 --- a/searchcore/src/tests/proton/docsummary/summarymap.cfg +++ b/searchcore/src/tests/proton/docsummary/summarymap.cfg @@ -1,4 +1,4 @@ -override[17] +override[16] override[0].field "aa" override[0].command "copy" override[0].arguments "ab" @@ -46,6 +46,3 @@ override[14].arguments "wp2" override[15].field "bj" override[15].command "attribute" override[15].arguments "bj" -override[16].field "missing" -override[16].command "attribute" -override[16].arguments "missing" diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp index b9d0c27bd16..1a269e556d6 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp @@ -90,7 +90,7 @@ DynamicDocsumConfig::createFieldWriter(const string & fieldName, const string & } else if (overrideName == "attribute") { if (getEnvironment() && getEnvironment()->getAttributeManager()) { fieldWriter = AttributeDFWFactory::create(*getEnvironment()->getAttributeManager(), argument); - rc = true; // Allow missing attribute vector + rc = static_cast<bool>(fieldWriter); } } else if (overrideName == "attributecombiner") { if (getEnvironment() && getEnvironment()->getAttributeManager()) { |