summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-03-31 14:42:25 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-04-03 12:49:12 +0200
commit841f9a4fd89eba84ac0cf52c9d7b2333d0b821d1 (patch)
treef81ea5cbd93bbc32fd1d7e1c43a2febc9c2c5b70
parentfbf084f74b6de6c2269ef9e66af473cc6687b44f (diff)
Don't add imported fields to default summary
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java2
-rw-r--r--config-model/src/test/derived/importedfields/summary.cfg8
2 files changed, 3 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
index 5ec60ef7e54..2098d0c0808 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
@@ -47,6 +47,7 @@ public class Processing {
SummaryConsistency::new,
SummaryNamesFieldCollisions::new,
SummaryFieldsMustHaveValidSource::new,
+ AddAttributeTransformToSummaryOfImportedFields::new,
MakeDefaultSummaryTheSuperSet::new,
Bolding::new,
AttributeProperties::new,
@@ -72,7 +73,6 @@ public class Processing {
TensorFieldProcessor::new,
RankProfileTypeSettingsProcessor::new,
ReferenceFieldsProcessor::new,
- AddAttributeTransformToSummaryOfImportedFields::new,
// These two should be last.
IndexingValidation::new,
diff --git a/config-model/src/test/derived/importedfields/summary.cfg b/config-model/src/test/derived/importedfields/summary.cfg
index 35d5549d333..d0042be0e2a 100644
--- a/config-model/src/test/derived/importedfields/summary.cfg
+++ b/config-model/src/test/derived/importedfields/summary.cfg
@@ -1,14 +1,10 @@
-defaultsummaryid 1379505517
-classes[].id 1379505517
+defaultsummaryid 1151071433
+classes[].id 1151071433
classes[].name "default"
classes[].fields[].name "rankfeatures"
classes[].fields[].type "featuredata"
classes[].fields[].name "summaryfeatures"
classes[].fields[].type "featuredata"
-classes[].fields[].name "my_budget"
-classes[].fields[].type "integer"
-classes[].fields[].name "my_person_name"
-classes[].fields[].type "longstring"
classes[].fields[].name "documentid"
classes[].fields[].type "longstring"
classes[].id 153697641