diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-01-12 21:49:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-12 21:49:40 +0100 |
commit | b72c29c29a2c8dd8ecac8aeffdaff688b21ee41c (patch) | |
tree | fd8ea0f55ec4a17feff93139238a435ddf7715ac /config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java | |
parent | 08fbcebedf2c2bd78c13727fb91cc25b9b196c2f (diff) | |
parent | c10677061733478b8e4028fafc68f05972877643 (diff) |
Merge pull request #1502 from yahoo/revert-1495-bratseth/tensor-type-info-in-documents
Revert "Bratseth/tensor type info in documents"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java index 9ee5f48a906..1349abc3795 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java @@ -2,7 +2,6 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.document.TensorDataType; import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.document.Attribute; import com.yahoo.document.DataType; @@ -50,25 +49,22 @@ public class ValidateFieldTypes extends Processor { DataType seenType = seenFields.get(fieldName); if (seenType == null) { seenFields.put(fieldName, fieldType); - } else if ( ! compatibleTypes(seenType, fieldType)) { - throw newProcessException(searchName, fieldName, "Incompatible types. Expected " + + } else if ( ! equalTypes(seenType, fieldType)) { + throw newProcessException(searchName, fieldName, "Duplicate field name with different types. Expected " + seenType.getName() + " for " + fieldDesc + " '" + fieldName + "', got " + fieldType.getName() + "."); } } - private boolean compatibleTypes(DataType seenType, DataType fieldType) { + private boolean equalTypes(DataType d1, DataType d2) { // legacy tag field type compatibility; probably not needed any more (Oct 2016) - if ("tag".equals(seenType.getName())) { - return "tag".equals(fieldType.getName()) || "WeightedSet<string>".equals(fieldType.getName()); + if ("tag".equals(d1.getName())) { + return "tag".equals(d2.getName()) || "WeightedSet<string>".equals(d2.getName()); } - if ("tag".equals(fieldType.getName())) { - return "tag".equals(seenType.getName()) || "WeightedSet<string>".equals(seenType.getName()); + if ("tag".equals(d2.getName())) { + return "tag".equals(d1.getName()) || "WeightedSet<string>".equals(d1.getName()); } - if (seenType instanceof TensorDataType && fieldType instanceof TensorDataType) { - return fieldType.isAssignableFrom(seenType); // TODO: Just do this for all types - } - return seenType.equals(fieldType); + return d1.equals(d2); } } |