Merge pull request #4438 from vespa-engine/bratseth/tensorflow-models

Bratseth/tensorflow models

10 files changed, 20 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/TensorTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/TensorTransformer.java
index 69e353ceb35..65176006a2a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/TensorTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/TensorTransformer.java
@@ -118,7 +118,7 @@ public class TensorTransformer extends ExpressionTransformer {
     private ExpressionNode replaceMaxAndMinFunction(FunctionNode node) {
         ExpressionNode arg1 = node.children().get(0);
         ExpressionNode arg2 = node.children().get(1);
-        
+
         TensorFunctionNode.TensorFunctionExpressionNode expression = TensorFunctionNode.wrapArgument(arg1);
         Reduce.Aggregator aggregator = Reduce.Aggregator.valueOf(node.getFunction().name());
         String dimension = ((ReferenceNode) arg2).getName();
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
index c52a5dc465d..f932265cb93 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java
@@ -259,7 +259,7 @@ public final class Attribute implements Cloneable, Serializable {
             throw new IllegalArgumentException("Field " + fieldType + " not supported in convertCollectionType");
         }
     }
-    
+
     private static Optional<TensorType> convertTensorType(DataType fieldType) {
         if ( ! ( fieldType instanceof TensorDataType)) return Optional.empty();
         return Optional.of(((TensorDataType)fieldType).getTensorType());
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java
index c8918f39834..8b6df1a87db 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java
@@ -29,7 +29,7 @@ public class ImmutableImportedSDField implements ImmutableSDField {
 
     @Override
     public <T extends Expression> boolean containsExpression(Class<T> searchFor) {
-        throw createUnsupportedException();
+        throw createUnsupportedException(searchFor.getSimpleName());
     }
 
     @Override
@@ -79,9 +79,9 @@ public class ImmutableImportedSDField implements ImmutableSDField {
 
     @Override
     public Index getIndex(String name) {
-        if (!importedField.fieldName().equals(name)) {
+        if ( ! importedField.fieldName().equals(name)) {
             throw new IllegalArgumentException("Getting an index (" + name + ") with different name than the imported field ("
-                    + importedField.fieldName() + ") is not supported");
+                                               + importedField.fieldName() + ") is not supported");
         }
         String targetIndexName = importedField.targetField().getName();
         return importedField.targetField().getIndex(targetIndexName);
@@ -104,7 +104,7 @@ public class ImmutableImportedSDField implements ImmutableSDField {
 
     @Override
     public ScriptExpression getIndexingScript() {
-        throw createUnsupportedException();
+        throw createUnsupportedException("indexing");
     }
 
     @Override
@@ -119,12 +119,12 @@ public class ImmutableImportedSDField implements ImmutableSDField {
 
     @Override
     public ImmutableSDField getStructField(String name) {
-        throw createUnsupportedException();
+        throw createUnsupportedException("struct");
     }
 
     @Override
     public Collection<? extends ImmutableSDField> getStructFields() {
-        throw createUnsupportedException();
+        throw createUnsupportedException("struct");
     }
 
     @Override
@@ -134,12 +134,12 @@ public class ImmutableImportedSDField implements ImmutableSDField {
 
     @Override
     public Stemming getStemming(Search search) {
-        throw createUnsupportedException();
+        throw createUnsupportedException("stemming");
     }
 
     @Override
     public Ranking getRanking() {
-        throw createUnsupportedException();
+        throw createUnsupportedException("ranking");
     }
 
     @Override
@@ -158,8 +158,8 @@ public class ImmutableImportedSDField implements ImmutableSDField {
                 importedField.targetField().getDataType());
     }
 
-    private static UnsupportedOperationException createUnsupportedException() {
-        return new UnsupportedOperationException("This aspect is not meaningful or relevant for an imported field.");
+    private static UnsupportedOperationException createUnsupportedException(String aspect) {
+        return new UnsupportedOperationException("'" + aspect + "' is not meaningful or relevant for an imported field.");
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
index 96a9448739a..9368d6aaa39 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
@@ -20,7 +20,7 @@ import java.util.Set;
  */
 public class DocumentManager {
 
-    public DocumentmanagerConfig.Builder produce(DocumentModel model, 
+    public DocumentmanagerConfig.Builder produce(DocumentModel model,
                                                  DocumentmanagerConfig.Builder documentConfigBuilder) {
         documentConfigBuilder.enablecompression(false);
         Set<DataType> handled = new HashSet<>();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
index 6eeb12ffdd9..ce3c04f41f7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
@@ -45,7 +45,7 @@ public class ConstantTensorJsonValidator {
             throw new IllegalArgumentException("Ranking constant file names must end with either '.json' or '.json.lz4'");
         }
     }
-    
+
     private void validateTensor(TensorType type, Reader tensorData) {
         wrapIOException(() -> {
             this.parser = jsonFactory.createParser(tensorData);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
index 4a9310799aa..c686f023d5b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
@@ -64,7 +64,7 @@ public class RankingConstantsValidator extends Validator {
 
     private void validateRankingConstant(RankingConstant rankingConstant, ApplicationPackage applicationPackage) throws FileNotFoundException {
         ApplicationFile tensorApplicationFile = applicationPackage.getFile(Path.fromString(rankingConstant.getFileName()));
-        new ConstantTensorJsonValidator().validate(rankingConstant.getFileName(), 
+        new ConstantTensorJsonValidator().validate(rankingConstant.getFileName(),
                                                    rankingConstant.getTensorType(),
                                                    tensorApplicationFile.createReader());
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
index a5b7d67e377..e1675007bbc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
@@ -8,6 +8,7 @@ import com.yahoo.vespa.model.content.Redundancy;
  * Builds redundancy config for a content cluster.
  */
 public class RedundancyBuilder {
+
     Redundancy build(ModelElement clusterXml) {
         Integer initialRedundancy = 2;
         Integer finalRedundancy = 3;
@@ -37,4 +38,5 @@ public class RedundancyBuilder {
 
         return new Redundancy(initialRedundancy, finalRedundancy, readyCopies);
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
index 9407c21fee8..960a3b7d6db 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
@@ -173,7 +173,7 @@ public class RankProfileTestCase extends SearchDefinitionTestCase {
         assertFalse(findProperty(rawProfile.configProperties(), "vespa.type.query.tensor3").isPresent());
         assertFalse(findProperty(rawProfile.configProperties(), "vespa.type.query.numeric").isPresent());
     }
-    
+
     private static Optional<String> findProperty(List<Pair<String, String>> properties, String key) {
         for (Pair<String, String> property : properties)
             if (property.getFirst().equals(key))
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 7cd00e155bb..4600f6ae4c6 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -123,7 +123,7 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     public void testIndexinfoFieldsets() throws IOException, ParseException {
         assertCorrectDeriving("indexinfo_fieldsets");
     }
-    
+
     @Test
     public void testStreamingJuniper() throws IOException, ParseException {
         assertCorrectDeriving("streamingjuniper");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
index 12bdd8d2b5c..e5693d24f0f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
@@ -202,5 +202,5 @@ public class TensorTransformTestCase extends SearchDefinitionTestCase {
         }
         return b.toString();
     }
-    
+
 }