QL: Refactor FunctionRegistry to make it pluggable

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/expression/function/EqlFunctionRegistry.java

@@ -31,10 +31,10 @@
 public class EqlFunctionRegistry extends FunctionRegistry {
 
     public EqlFunctionRegistry() {
-        super(functions());
+        register(functions());
     }
 
-    private static FunctionDefinition[][] functions() {
+    private FunctionDefinition[][] functions() {
         return new FunctionDefinition[][] {
         // Scalar functions
         // String

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/function/FunctionDefinition.java

@@ -14,31 +14,26 @@
 public class FunctionDefinition {
     /**
      * Converts an {@link UnresolvedFunction} into the a proper {@link Function}.
+     * <p>
+     * Provides the basic signature (unresolved function + runtime configuration object) while
+     * allowing extensions through the vararg extras which subclasses should expand for their
+     * own purposes.
      */
     @FunctionalInterface
     public interface Builder {
-        Function build(UnresolvedFunction uf, boolean distinct, Configuration configuration);
+        Function build(UnresolvedFunction uf, Configuration configuration, Object... extras);
     }
 
     private final String name;
     private final List<String> aliases;
     private final Class<? extends Function> clazz;
     private final Builder builder;
 
-    /**
-     * Is this a datetime function compatible with {@code EXTRACT}.
-     */
-    // TODO: needs refactoring so that specific function properties (per language) are isolated from QL
-    private final boolean extractViable;
-
-
-    protected FunctionDefinition(String name, List<String> aliases, Class<? extends Function> clazz, boolean dateTime, Builder builder) {
+    protected FunctionDefinition(String name, List<String> aliases, Class<? extends Function> clazz, Builder builder) {
         this.name = name;
         this.aliases = aliases;
         this.clazz = clazz;
         this.builder = builder;
-
-        this.extractViable = dateTime;
     }
 
     public String name() {
@@ -53,17 +48,10 @@ public Class<? extends Function> clazz() {
         return clazz;
     }
 
-    public Builder builder() {
+    protected Builder builder() {
         return builder;
     }
 
-    /**
-     * Is this a datetime function compatible with {@code EXTRACT}.
-     */
-    public boolean extractViable() {
-        return extractViable;
-    }
-
     @Override
     public String toString() {
         return format(null, "{}({})", name, aliases.isEmpty() ? "" : aliases.size() == 1 ? aliases.get(0) : aliases);

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/function/FunctionResolutionStrategy.java

@@ -24,7 +24,7 @@ public interface FunctionResolutionStrategy {
      * Build the real function from this one and resolution metadata.
      */
     default Function buildResolved(UnresolvedFunction uf, Configuration cfg, FunctionDefinition def) {
-        return def.builder().build(uf, false, cfg);
+        return def.builder().build(uf, cfg);
     }
 
     /**

x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/expression/function/FunctionRegistryTests.java

@@ -32,19 +32,19 @@ public class FunctionRegistryTests extends ESTestCase {
 
     public void testNoArgFunction() {
         UnresolvedFunction ur = uf(DEFAULT);
-        FunctionRegistry r = new FunctionRegistry(def(DummyFunction.class, DummyFunction::new, "DUMMY_FUNCTION"));
+        FunctionRegistry r = new FunctionRegistry(defineDummyNoArgFunction());
         FunctionDefinition def = r.resolveFunction(ur.name());
         assertEquals(ur.source(), ur.buildResolved(randomConfiguration(), def).source());
     }
 
+    public static FunctionDefinition defineDummyNoArgFunction() {
+        return def(DummyFunction.class, DummyFunction::new, "DUMMY_FUNCTION");
+    }
+
     public void testUnaryFunction() {
         UnresolvedFunction ur = uf(DEFAULT, mock(Expression.class));
-        FunctionRegistry r = new FunctionRegistry(def(DummyFunction.class, (Source l, Expression e) -> {
-            assertSame(e, ur.children().get(0));
-            return new DummyFunction(l);
-        }, "DUMMY_FUNCTION"));
+        FunctionRegistry r = new FunctionRegistry(defineDummyUnaryFunction(ur));
         FunctionDefinition def = r.resolveFunction(ur.name());
-        assertFalse(def.extractViable());
         assertEquals(ur.source(), ur.buildResolved(randomConfiguration(), def).source());
 
         // No children aren't supported
@@ -58,6 +58,13 @@ public void testUnaryFunction() {
         assertThat(e.getMessage(), endsWith("expects exactly one argument"));
     }
 
+    public static FunctionDefinition defineDummyUnaryFunction(UnresolvedFunction ur) {
+        return def(DummyFunction.class, (Source l, Expression e) -> {
+            assertSame(e, ur.children().get(0));
+            return new DummyFunction(l);
+        }, "DUMMY_FUNCTION");
+    }
+
     public void testBinaryFunction() {
         UnresolvedFunction ur = uf(DEFAULT, mock(Expression.class), mock(Expression.class));
         FunctionRegistry r = new FunctionRegistry(def(DummyFunction.class, (Source l, Expression lhs, Expression rhs) -> {
@@ -67,7 +74,6 @@ public void testBinaryFunction() {
         }, "DUMMY_FUNCTION"));
         FunctionDefinition def = r.resolveFunction(ur.name());
         assertEquals(ur.source(), ur.buildResolved(randomConfiguration(), def).source());
-        assertFalse(def.extractViable());
 
         // No children aren't supported
         ParsingException e = expectThrows(ParsingException.class, () ->

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/SqlFunctionDefinition.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+package org.elasticsearch.xpack.sql.expression.function;
+
+import org.elasticsearch.xpack.ql.expression.function.Function;
+import org.elasticsearch.xpack.ql.expression.function.FunctionDefinition;
+
+import java.util.List;
+
+public class SqlFunctionDefinition extends FunctionDefinition {
+
+    /**
+     * Is this a datetime function compatible with {@code EXTRACT}.
+     */
+    private final boolean extractViable;
+
+    protected SqlFunctionDefinition(String name,
+                                    List<String> aliases,
+                                    Class<? extends Function> clazz,
+                                    boolean dateTime,
+                                    Builder builder) {
+        super(name, aliases, clazz, builder);
+        this.extractViable = dateTime;
+    }
+
+    /**
+     * Is this a datetime function compatible with {@code EXTRACT}.
+     */
+    public boolean extractViable() {
+        return extractViable;
+    }
+
+    @Override
+    protected Builder builder() {
+        return super.builder();
+    }
+}