You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/08/02 13:15:06 UTC
[GitHub] asfgit closed pull request #6223: [FLINK-9688] [table] ATAN2 sql
function support
asfgit closed pull request #6223: [FLINK-9688] [table] ATAN2 sql function support
URL: https://github.com/apache/flink/pull/6223
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/dev/table/sql.md b/docs/dev/table/sql.md
index 3d6f0700184..19fd18a1589 100644
--- a/docs/dev/table/sql.md
+++ b/docs/dev/table/sql.md
@@ -1510,6 +1510,17 @@ ATAN(numeric)
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight text %}
+ATAN2(numeric, numeric)
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Calculates the arc tangent of a given coordinate.</p>
+ </td>
+ </tr>
+
<tr>
<td>
{% highlight text %}
diff --git a/docs/dev/table/tableApi.md b/docs/dev/table/tableApi.md
index a7b9522c015..87f708ed35b 100644
--- a/docs/dev/table/tableApi.md
+++ b/docs/dev/table/tableApi.md
@@ -2184,6 +2184,17 @@ NUMERIC.atan()
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight java %}
+atan2(NUMERIC, NUMERIC)
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Calculates the arc tangent of a given coordinate.</p>
+ </td>
+ </tr>
+
<tr>
<td>
{% highlight java %}
@@ -3748,6 +3759,17 @@ NUMERIC.atan()
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight scala %}
+atan2(NUMERIC, NUMERIC)
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Calculates the arc tangent of a given coordinate.</p>
+ </td>
+ </tr>
+
<tr>
<td>
{% highlight scala %}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
index b0bc5b66c33..868509b694f 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/api/scala/expressionDsl.scala
@@ -1180,6 +1180,15 @@ object concat {
}
}
+/**
+ * Calculates the arc tangent of a given coordinate.
+ */
+object atan2 {
+ def apply(expr: Expression, other: Expression): Expression = {
+ Atan2(expr, other)
+ }
+}
+
/**
* Returns the string that results from concatenating the arguments and separator.
* Returns NULL If the separator is NULL.
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
index ea4f0fd2f92..c357c17ed34 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/BuiltInMethods.scala
@@ -73,6 +73,12 @@ object BuiltInMethods {
val ATAN = Types.lookupMethod(classOf[Math], "atan", classOf[Double])
val ATAN_DEC = Types.lookupMethod(classOf[SqlFunctions], "atan", classOf[JBigDecimal])
+ val ATAN2 = Types.lookupMethod(classOf[Math], "atan2", classOf[Double], classOf[Double])
+ val ATAN2_DEC = Types.lookupMethod(
+ classOf[ScalarFunctions], "atan2", classOf[Double], classOf[JBigDecimal])
+ val ATAN2_DEC_DEC = Types.lookupMethod(classOf[ScalarFunctions], "atan2",
+ classOf[JBigDecimal], classOf[JBigDecimal])
+
val DEGREES = Types.lookupMethod(classOf[Math], "toDegrees", classOf[Double])
val DEGREES_DEC = Types.lookupMethod(classOf[SqlFunctions], "degrees", classOf[JBigDecimal])
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
index bd75617f474..33472548cd0 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/calls/FunctionGenerator.scala
@@ -300,6 +300,24 @@ object FunctionGenerator {
DOUBLE_TYPE_INFO,
BuiltInMethods.ATAN_DEC)
+ addSqlFunctionMethod(
+ ATAN2,
+ Seq(DOUBLE_TYPE_INFO, DOUBLE_TYPE_INFO),
+ DOUBLE_TYPE_INFO,
+ BuiltInMethods.ATAN2)
+
+ addSqlFunctionMethod(
+ ATAN2,
+ Seq(DOUBLE_TYPE_INFO, BIG_DEC_TYPE_INFO),
+ DOUBLE_TYPE_INFO,
+ BuiltInMethods.ATAN2_DEC)
+
+ addSqlFunctionMethod(
+ ATAN2,
+ Seq(BIG_DEC_TYPE_INFO, BIG_DEC_TYPE_INFO),
+ DOUBLE_TYPE_INFO,
+ BuiltInMethods.ATAN2_DEC_DEC)
+
addSqlFunctionMethod(
DEGREES,
Seq(DOUBLE_TYPE_INFO),
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
index 0378ce58c2a..a66f24e2ad5 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/mathExpressions.scala
@@ -243,6 +243,19 @@ case class Atan(child: Expression) extends UnaryExpression {
}
}
+case class Atan2(left: Expression, right: Expression) extends BinaryExpression with InputTypeSpec {
+ override private[flink] def resultType: TypeInformation[_] = DOUBLE_TYPE_INFO
+
+ override private[flink] def expectedTypes: Seq[TypeInformation[_]] =
+ BIG_DEC_TYPE_INFO :: BIG_DEC_TYPE_INFO :: Nil
+
+ override def toString: String = s"atan2($left, $right)"
+
+ override private[flink] def toRexNode(implicit relBuilder: RelBuilder): RexNode = {
+ relBuilder.call(SqlStdOperatorTable.ATAN2, left.toRexNode, right.toRexNode)
+ }
+}
+
case class Degrees(child: Expression) extends UnaryExpression {
override private[flink] def resultType: TypeInformation[_] = DOUBLE_TYPE_INFO
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
index 2e7c9f6825f..70ed2f35bc1 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/functions/ScalarFunctions.scala
@@ -32,6 +32,14 @@ object ScalarFunctions {
Math.pow(a, b.doubleValue())
}
+ def atan2(a: Double, b: JBigDecimal): Double = {
+ Math.atan2(a, b.doubleValue())
+ }
+
+ def atan2(a: JBigDecimal, b: JBigDecimal): Double = {
+ Math.atan2(a.doubleValue(), b.doubleValue())
+ }
+
/**
* Returns the string that results from concatenating the arguments.
* Returns NULL if any argument is NULL.
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
index 3184e0001ea..f257a68a6e3 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/validate/FunctionCatalog.scala
@@ -226,6 +226,7 @@ object FunctionCatalog {
"asin" -> classOf[Asin],
"acos" -> classOf[Acos],
"atan" -> classOf[Atan],
+ "atan2" -> classOf[Atan2],
"degrees" -> classOf[Degrees],
"radians" -> classOf[Radians],
"sign" -> classOf[Sign],
@@ -421,6 +422,7 @@ class BasicOperatorTable extends ReflectiveSqlOperatorTable {
SqlStdOperatorTable.ASIN,
SqlStdOperatorTable.ACOS,
SqlStdOperatorTable.ATAN,
+ SqlStdOperatorTable.ATAN2,
SqlStdOperatorTable.DEGREES,
SqlStdOperatorTable.RADIANS,
SqlStdOperatorTable.SIGN,
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
index a08f419a903..ce562a73a2a 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
@@ -1111,6 +1111,52 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
math.atan(-0.1231231321321321111).toString)
}
+ @Test
+ def testAtan2(): Unit = {
+ testAllApis(
+ atan2('f25, 'f26),
+ "atan2(f25, f26)",
+ "ATAN2(f25, f26)",
+ math.atan2(0.42.toByte, 0.toByte).toString)
+
+ testAllApis(
+ Atan2('f26, 'f25),
+ "atan2(f26, f25)",
+ "ATAN2(f26, f25)",
+ math.atan2(0.toShort, 0.toShort).toString)
+
+ testAllApis(
+ Atan2('f27, 'f27),
+ "atan2(f27, f27)",
+ "ATAN2(f27, f27)",
+ math.atan2(0.toLong, 0.toLong).toString)
+
+ testAllApis(
+ Atan2('f28, 'f28),
+ "atan2(f28, f28)",
+ "ATAN2(f28, f28)",
+ math.atan2(0.45.toFloat, 0.45.toFloat).toString)
+
+ testAllApis(
+ Atan2('f29, 'f29),
+ "atan2(f29, f29)",
+ "ATAN2(f29, f29)",
+ math.atan2(0.46, 0.46).toString)
+
+ testAllApis(
+ Atan2('f30, 'f30),
+ "atan2(f30, f30)",
+ "ATAN2(f30, f30)",
+ math.atan2(1, 1).toString)
+
+ testAllApis(
+ Atan2('f31, 'f31),
+ "atan2(f31, f31)",
+ "ATAN2(f31, f31)",
+ math.atan2(-0.1231231321321321111, -0.1231231321321321111).toString)
+ }
+
+
@Test
def testDegrees(): Unit = {
testAllApis(
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
index 3d4dab368ae..aaf7d3b6717 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/SqlExpressionTest.scala
@@ -111,6 +111,7 @@ class SqlExpressionTest extends ExpressionTestBase {
testSqlApi("ASIN(0.5)", "0.5235987755982989")
testSqlApi("ACOS(0.5)", "1.0471975511965979")
testSqlApi("ATAN(0.5)", "0.4636476090008061")
+ testSqlApi("ATAN2(0.5, 0.5)", "0.7853981633974483")
testSqlApi("DEGREES(0.5)", "28.64788975654116")
testSqlApi("RADIANS(0.5)", "0.008726646259971648")
testSqlApi("SIGN(-1.1)", "-1")
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services