diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-09-10 09:15:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 09:15:57 +0200 |
| commit | 366162504449bc93187b6d7ce8b47f0fe99e8437 (patch) | |
| tree | a7b110cd32714d343b4f074295ae9531bd57f978 | |
| parent | 4ea99060d59413de4e37c81bc4fd77401d8fb9be (diff) | |
| parent | 1e797e8156bba8d212c7d4236e027ed6b2d488c3 (diff) | |
Merge pull request #14360 from vespa-engine/revert-14349-revert-14332-toregge/ignore-summary-override-if-attribute-vector-is-missing
Revert "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, 5 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/docsummary/summarymap.cfg b/searchcore/src/tests/proton/docsummary/summarymap.cfg index f2d429b1412..cb03ce76fd1 100644 --- a/searchcore/src/tests/proton/docsummary/summarymap.cfg +++ b/searchcore/src/tests/proton/docsummary/summarymap.cfg @@ -1,4 +1,4 @@ -override[16] +override[17] override[0].field "aa" override[0].command "copy" override[0].arguments "ab" @@ -46,3 +46,6 @@ 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 1a269e556d6..b9d0c27bd16 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 = static_cast<bool>(fieldWriter); + rc = true; // Allow missing attribute vector } } else if (overrideName == "attributecombiner") { if (getEnvironment() && getEnvironment()->getAttributeManager()) { |