Revert "Bratseth/rank type information 2"

1 files changed, 0 insertions, 103 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java
deleted file mode 100644
index 4c8b5910b78..00000000000
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.searchdefinition.processing;
-
-import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.searchdefinition.RankProfile;
-import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchlib.rankingexpression.RankingExpression;
-import com.yahoo.searchlib.rankingexpression.Reference;
-import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode;
-import com.yahoo.tensor.TensorType;
-import com.yahoo.tensor.evaluation.TypeContext;
-import com.yahoo.vespa.model.container.search.QueryProfiles;
-
-import java.util.Map;
-
-/**
- * Resolves and assigns types to all functions in a ranking expression, and
- * validates the types of all ranking expressions under a search instance:
- * Some operators constrain the types of inputs, and first-and second-phase expressions
- * must return scalar values.
- *
- * In addition, the existence of all referred attribute, query and constant
- * features is ensured.
- *
- * @author bratseth
- */
-public class RankingExpressionTypeResolver extends Processor {
-
-    private final QueryProfileRegistry queryProfiles;
-
-    public RankingExpressionTypeResolver(Search search,
-                                         DeployLogger deployLogger,
-                                         RankProfileRegistry rankProfileRegistry,
-                                         QueryProfiles queryProfiles) {
-        super(search, deployLogger, rankProfileRegistry, queryProfiles);
-        this.queryProfiles = queryProfiles.getRegistry();
-    }
-
-    @Override
-    public void process(boolean validate, boolean documentsOnly) {
-        if (documentsOnly) return;
-
-        for (RankProfile profile : rankProfileRegistry.rankProfilesOf(search)) {
-            try {
-                resolveTypesIn(profile, validate);
-            }
-            catch (IllegalArgumentException e) {
-                throw new IllegalArgumentException("In " + search + ", " + profile, e);
-            }
-        }
-    }
-
-    /**
-     * Resolves the types of all functions in the given profile
-     *
-     * @throws IllegalArgumentException if validate is true and the given rank profile does not produce valid types
-     */
-    private void resolveTypesIn(RankProfile profile, boolean validate) {
-        TypeContext<Reference> context = profile.typeContext(queryProfiles);
-        for (Map.Entry<String, RankProfile.RankingExpressionFunction> function : profile.getFunctions().entrySet()) {
-            if ( ! function.getValue().function().arguments().isEmpty()) continue;
-            TensorType type = resolveType(function.getValue().function().getBody(),
-                                          "function '" + function.getKey() + "'",
-                                          context);
-            function.getValue().setReturnType(type);
-        }
-
-        if (validate) {
-            profile.getSummaryFeatures().forEach(f -> resolveType(f, "summary feature " + f, context));
-            ensureValidDouble(profile.getFirstPhaseRanking(), "first-phase expression", context);
-            ensureValidDouble(profile.getSecondPhaseRanking(), "second-phase expression", context);
-        }
-    }
-
-    private TensorType resolveType(RankingExpression expression, String expressionDescription, TypeContext context) {
-        if (expression == null) return null;
-        return resolveType(expression.getRoot(), expressionDescription, context);
-    }
-
-    private TensorType resolveType(ExpressionNode expression, String expressionDescription, TypeContext context) {
-        TensorType type;
-        try {
-            type = expression.type(context);
-        }
-        catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("The " + expressionDescription + " is invalid", e);
-        }
-        if (type == null) // Not expected to happen
-            throw new IllegalStateException("Could not determine the type produced by " + expressionDescription);
-        return type;
-    }
-
-    private void ensureValidDouble(RankingExpression expression, String expressionDescription, TypeContext context) {
-        if (expression == null) return;
-        TensorType type = resolveType(expression, expressionDescription, context);
-        if ( ! type.equals(TensorType.empty))
-            throw new IllegalArgumentException("The " + expressionDescription + " must produce a double " +
-                                               "(a tensor with no dimensions), but produces " + type);
-    }
-
-}