The incorrect NodeInfo is created when the optional parameter is not …

…used, leading to the incorrect constructor being used. Fixes elastic#32554
astefan · Aug 2, 2018 · 98bf256 · 98bf256
1 parent 5efc2ec
commit 98bf256
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...search/xpack/sql/expression/function/scalar/string/LocateFunctionProcessorDefinition.java b/...search/xpack/sql/expression/function/scalar/string/LocateFunctionProcessorDefinition.java
@@ -85,6 +85,10 @@ public final void collectFields(SqlSourceBuilder sourceBuilder) {
 
     @Override
     protected NodeInfo<LocateFunctionProcessorDefinition> info() {
+        if (start == null) {
+            return NodeInfo.create(this, LocateFunctionProcessorDefinition::new, expression(), pattern, source);
+        }
+
         return NodeInfo.create(this, LocateFunctionProcessorDefinition::new, expression(), pattern, source, start);
     }
 

diff --git a/...h/xpack/sql/expression/function/scalar/string/LocateFunctionProcessorDefinitionTests.java b/...h/xpack/sql/expression/function/scalar/string/LocateFunctionProcessorDefinitionTests.java
@@ -42,7 +42,6 @@ public static LocateFunctionProcessorDefinition randomLocateFunctionProcessorDef
                 .makeProcessorDefinition());
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32554")
     @Override
     public void testTransform() {
         // test transforming only the properties (location, expression),