Distributing the external rankfiles was a dead end due to th eprocessing taking place.

Reverting back to get back to the drawing table. It must be done post deriving, based on size of expression.

3 files changed, 2 insertions, 7 deletions

diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index fbb48f8edf6..2d006bbd973 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -1583,7 +1583,6 @@
       "public com.yahoo.searchlib.rankingexpression.rule.SerializationContext withBindings(java.util.Map)",
       "public com.yahoo.searchlib.rankingexpression.rule.SerializationContext withoutBindings()",
       "public java.util.Map serializedFunctions()",
-      "public java.lang.String uniqueName(java.lang.String)",
       "public boolean needSerialization(java.lang.String)",
       "public bridge synthetic com.yahoo.searchlib.rankingexpression.rule.FunctionReferenceContext withoutBindings()",
       "public bridge synthetic com.yahoo.searchlib.rankingexpression.rule.FunctionReferenceContext withBindings(java.util.Map)"
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNode.java
index d33c36f0d3b..e96ba021750 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNode.java
@@ -87,7 +87,7 @@ public final class ReferenceNode extends CompositeNode {
             String functionName = getName();
             boolean needSerialization = (getArguments().size() > 0) || context.needSerialization(functionName);
 
-            if ( needSerialization) {
+            if ( needSerialization ) {
                 ExpressionFunction.Instance instance = function.expand(context, getArguments().expressions(), path);
                 functionName = instance.getName();
 
@@ -98,7 +98,7 @@ public final class ReferenceNode extends CompositeNode {
                     context.addFunctionTypeSerialization(functionName, function.returnType().get());
             }
             path.removeLast();
-            return string.append("rankingExpression(").append(context.uniqueName(functionName)).append(')');
+            return string.append("rankingExpression(").append(functionName).append(')');
         }
 
         // Not resolved in this context: output as-is
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
index c67a6f66d8c..a6a64348452 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
@@ -104,10 +104,6 @@ public class SerializationContext extends FunctionReferenceContext {
 
     public Map<String, String> serializedFunctions() { return serializedFunctions; }
 
-    public String uniqueName(String functionName) {
-        return functionName;
-    }
-
     public boolean needSerialization(String functionName) {
         return ! serializedFunctions().containsKey(RankingExpression.propertyName(functionName));
     }