diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-22 12:18:36 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-22 12:18:36 +0100 |
commit | 30cd11107f4e00331dfe8a4c7d1fa2b0e9ef7d94 (patch) | |
tree | 9c171f4c186eb9be8fb669b733f15cfb51bebf81 /config-model | |
parent | 76c5c6d2ea96842d81cdaa482335e3ddf17a5659 (diff) | |
parent | d7640ecc7ab7d1f776756d78efe1e46a3769575f (diff) |
Merge with master
Diffstat (limited to 'config-model')
3 files changed, 32 insertions, 32 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java index 99897d8a564..35ec45acba8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java @@ -75,8 +75,7 @@ public class SummaryClass extends Derived { SummaryClassField sf = fields.get(name); if (!SummaryClassField.convertDataType(type, transform).equals(sf.getType())) { deployLogger.log(Level.WARNING, "Conflicting definition of field " + name + ". " + - "Declared as type " + sf.getType() + " and " + - type); + "Declared as type " + sf.getType() + " and " + type); } } else { fields.put(name, new SummaryClassField(name, type, transform)); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java index 3416b15cd63..e1bfa90cc36 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java @@ -33,11 +33,12 @@ public class SummaryClassField { LONGDATA("longdata"), XMLSTRING("xmlstring"), FEATUREDATA("featuredata"), - JSONSTRING("jsonstring"); + JSONSTRING("jsonstring"), + TENSOR("tensor"); private String name; - private Type(String name) { + Type(String name) { this.name = name; } @@ -88,7 +89,7 @@ public class SummaryClassField { } else if (fval instanceof PredicateFieldValue) { return Type.STRING; } else if (fval instanceof TensorFieldValue) { - return Type.JSONSTRING; + return Type.TENSOR; } else if (fieldType instanceof CollectionDataType) { if (transform != null && transform.equals(SummaryTransform.POSITIONS)) { return Type.XMLSTRING; diff --git a/config-model/src/test/derived/tensor/summary.cfg b/config-model/src/test/derived/tensor/summary.cfg index 3882af1b70b..5e5507836b0 100644 --- a/config-model/src/test/derived/tensor/summary.cfg +++ b/config-model/src/test/derived/tensor/summary.cfg @@ -1,27 +1,27 @@ -defaultsummaryid 1113059691 -classes[0].id 1113059691 -classes[0].name "default" -classes[0].fields[0].name "f1" -classes[0].fields[0].type "jsonstring" -classes[0].fields[1].name "f3" -classes[0].fields[1].type "jsonstring" -classes[0].fields[2].name "f4" -classes[0].fields[2].type "jsonstring" -classes[0].fields[3].name "rankfeatures" -classes[0].fields[3].type "featuredata" -classes[0].fields[4].name "summaryfeatures" -classes[0].fields[4].type "featuredata" -classes[0].fields[5].name "documentid" -classes[0].fields[5].type "longstring" -classes[1].id 457955124 -classes[1].name "attributeprefetch" -classes[1].fields[0].name "f2" -classes[1].fields[0].type "jsonstring" -classes[1].fields[1].name "f3" -classes[1].fields[1].type "jsonstring" -classes[1].fields[2].name "f4" -classes[1].fields[2].type "jsonstring" -classes[1].fields[3].name "rankfeatures" -classes[1].fields[3].type "featuredata" -classes[1].fields[4].name "summaryfeatures" -classes[1].fields[4].type "featuredata"
\ No newline at end of file +defaultsummaryid 289405525 +classes[].id 289405525 +classes[].name "default" +classes[].fields[].name "f1" +classes[].fields[].type "tensor" +classes[].fields[].name "f3" +classes[].fields[].type "tensor" +classes[].fields[].name "f4" +classes[].fields[].type "tensor" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "documentid" +classes[].fields[].type "longstring" +classes[].id 1860420340 +classes[].name "attributeprefetch" +classes[].fields[].name "f2" +classes[].fields[].type "tensor" +classes[].fields[].name "f3" +classes[].fields[].type "tensor" +classes[].fields[].name "f4" +classes[].fields[].type "tensor" +classes[].fields[].name "rankfeatures" +classes[].fields[].type "featuredata" +classes[].fields[].name "summaryfeatures" +classes[].fields[].type "featuredata" |