From 804c38303f3c9b0094c0e49c88b2ec3175ef6e4f Mon Sep 17 00:00:00 2001
From: Costin Leau <costin@users.noreply.github.com>
Date: Fri, 27 Apr 2018 01:43:44 +0300
Subject: [PATCH] SQL: Add BinaryMathProcessor to named writeables list
 (#30127)

BinaryMathProcessor was missing from the list of register  named
writeables causing deserialization errors

Fix #30014
---
 .../function/scalar/Processors.java           |  2 +
 .../scalar/math/BinaryMathProcessorTests.java | 59 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/math/BinaryMathProcessorTests.java

diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/Processors.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/Processors.java
index d701d8fbd6144..2084ad684df67 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/Processors.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/Processors.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.xpack.sql.expression.function.scalar.arithmetic.BinaryArithmeticProcessor;
 import org.elasticsearch.xpack.sql.expression.function.scalar.arithmetic.UnaryArithmeticProcessor;
 import org.elasticsearch.xpack.sql.expression.function.scalar.datetime.DateTimeProcessor;
+import org.elasticsearch.xpack.sql.expression.function.scalar.math.BinaryMathProcessor;
 import org.elasticsearch.xpack.sql.expression.function.scalar.math.MathProcessor;
 import org.elasticsearch.xpack.sql.expression.function.scalar.processor.runtime.BucketExtractorProcessor;
 import org.elasticsearch.xpack.sql.expression.function.scalar.processor.runtime.ChainingProcessor;
@@ -40,6 +41,7 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         // arithmetic
         entries.add(new Entry(Processor.class, BinaryArithmeticProcessor.NAME, BinaryArithmeticProcessor::new));
         entries.add(new Entry(Processor.class, UnaryArithmeticProcessor.NAME, UnaryArithmeticProcessor::new));
+        entries.add(new Entry(Processor.class, BinaryMathProcessor.NAME, BinaryMathProcessor::new));
         // datetime
         entries.add(new Entry(Processor.class, DateTimeProcessor.NAME, DateTimeProcessor::new));
         // math
diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/math/BinaryMathProcessorTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/math/BinaryMathProcessorTests.java
new file mode 100644
index 0000000000000..6563760d22512
--- /dev/null
+++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/math/BinaryMathProcessorTests.java
@@ -0,0 +1,59 @@
+/*
+ * 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.scalar.math;
+
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.Writeable.Reader;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
+import org.elasticsearch.xpack.sql.expression.Literal;
+import org.elasticsearch.xpack.sql.expression.function.scalar.Processors;
+import org.elasticsearch.xpack.sql.expression.function.scalar.processor.runtime.ConstantProcessor;
+import org.elasticsearch.xpack.sql.expression.function.scalar.processor.runtime.Processor;
+
+import static org.elasticsearch.xpack.sql.tree.Location.EMPTY;
+
+public class BinaryMathProcessorTests extends AbstractWireSerializingTestCase<BinaryMathProcessor> {
+    public static BinaryMathProcessor randomProcessor() {
+        return new BinaryMathProcessor(
+                new ConstantProcessor(randomLong()),
+                new ConstantProcessor(randomLong()),
+                randomFrom(BinaryMathProcessor.BinaryMathOperation.values()));
+    }
+
+    @Override
+    protected BinaryMathProcessor createTestInstance() {
+        return randomProcessor();
+    }
+
+    @Override
+    protected Reader<BinaryMathProcessor> instanceReader() {
+        return BinaryMathProcessor::new;
+    }
+
+    @Override
+    protected NamedWriteableRegistry getNamedWriteableRegistry() {
+        return new NamedWriteableRegistry(Processors.getNamedWriteables());
+    }
+
+    public void testAtan2() {
+        Processor ba = new ATan2(EMPTY, l(1), l(1)).makeProcessorDefinition().asProcessor();
+        assertEquals(0.7853981633974483d, ba.process(null));
+    }
+
+    public void testPower() {
+        Processor ba = new Power(EMPTY, l(2), l(2)).makeProcessorDefinition().asProcessor();
+        assertEquals(4d, ba.process(null));
+    }
+
+    public void testHandleNull() {
+        assertNull(new ATan2(EMPTY, l(null), l(3)).makeProcessorDefinition().asProcessor().process(null));
+        assertNull(new Power(EMPTY, l(null), l(null)).makeProcessorDefinition().asProcessor().process(null));
+    }
+    
+    private static Literal l(Object value) {
+        return Literal.of(EMPTY, value);
+    }
+}
\ No newline at end of file