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/10/18 16:04:04 UTC
[GitHub] pnowojski closed pull request #6730: [FLINK-10384][table] Add Sinh
math function supported in Table API and SQL
pnowojski closed pull request #6730: [FLINK-10384][table] Add Sinh math function supported in Table API and SQL
URL: https://github.com/apache/flink/pull/6730
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/functions.md b/docs/dev/table/functions.md
index 37171a2079f..e47b31772b3 100644
--- a/docs/dev/table/functions.md
+++ b/docs/dev/table/functions.md
@@ -1197,6 +1197,18 @@ SIN(numeric)
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight text %}
+SINH(numeric)
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Returns the hyperbolic sine of <i>numeric</i>.</p>
+ <p>The return type is <i>DOUBLE</i>.</p>
+ </td>
+ </tr>
+
<tr>
<td>
{% highlight text %}
@@ -1656,6 +1668,18 @@ NUMERIC.sin()
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight java %}
+NUMERIC.sinh()
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Returns the hyperbolic sine of <i>NUMERIC</i>.</p>
+ <p>The return type is <i>DOUBLE</i>.</p>
+ </td>
+ </tr>
+
<tr>
<td>
{% highlight java %}
@@ -2116,6 +2140,18 @@ NUMERIC.sin()
</td>
</tr>
+ <tr>
+ <td>
+ {% highlight scala %}
+NUMERIC.sinh()
+{% endhighlight %}
+ </td>
+ <td>
+ <p>Returns the hyperbolic sine of <i>NUMERIC</i>.</p>
+ <p>The return type is <i>DOUBLE</i>.</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 7c585674b54..f9fb93cb7fa 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
@@ -357,6 +357,11 @@ trait ImplicitExpressionOperations {
*/
def floor() = Floor(expr)
+ /**
+ * Calculates the hyperbolic sine of a given value.
+ */
+ def sinh() = Sinh(expr)
+
/**
* Calculates the smallest integer greater than or equal to a given number.
*/
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 1ae6e39e073..8abe55db8d5 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
@@ -84,6 +84,9 @@ object BuiltInMethods {
val ACOS = Types.lookupMethod(classOf[Math], "acos", classOf[Double])
val ACOS_DEC = Types.lookupMethod(classOf[SqlFunctions], "acos", classOf[JBigDecimal])
+ val SINH = Types.lookupMethod(classOf[Math], "sinh", classOf[Double])
+ val SINH_DEC = Types.lookupMethod(classOf[ScalarFunctions], "sinh", classOf[JBigDecimal])
+
val ATAN = Types.lookupMethod(classOf[Math], "atan", classOf[Double])
val ATAN_DEC = Types.lookupMethod(classOf[SqlFunctions], "atan", 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 9a6aeb15b3b..c7070400c9f 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
@@ -241,6 +241,18 @@ object FunctionGenerator {
DOUBLE_TYPE_INFO,
BuiltInMethods.LN)
+ addSqlFunctionMethod(
+ SINH,
+ Seq(DOUBLE_TYPE_INFO),
+ DOUBLE_TYPE_INFO,
+ BuiltInMethods.SINH)
+
+ addSqlFunctionMethod(
+ SINH,
+ Seq(BIG_DEC_TYPE_INFO),
+ DOUBLE_TYPE_INFO,
+ BuiltInMethods.SINH_DEC)
+
addSqlFunctionMethod(
EXP,
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 97e7190c0eb..05539deb711 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
@@ -165,6 +165,20 @@ case class Power(left: Expression, right: Expression) extends BinaryExpression w
}
}
+case class Sinh(child: Expression) extends UnaryExpression {
+
+ override private[flink] def resultType: TypeInformation[_] = DOUBLE_TYPE_INFO;
+
+ override private[flink] def validateInput(): ValidationResult =
+ TypeCheckUtils.assertNumericExpr(child.resultType, "Sinh")
+
+ override private[flink] def toRexNode(implicit relBuilder: RelBuilder) = {
+ relBuilder.call(ScalarSqlFunctions.SINH, child.toRexNode)
+ }
+
+ override def toString = s"sinh($child)"
+}
+
case class Sqrt(child: Expression) extends UnaryExpression with InputTypeSpec {
override private[flink] def resultType: TypeInformation[_] = DOUBLE_TYPE_INFO
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
index 85f47e8a7a1..35e4c25931b 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/functions/sql/ScalarSqlFunctions.scala
@@ -50,6 +50,14 @@ object ScalarSqlFunctions {
OperandTypes.family(SqlTypeFamily.INTEGER),
SqlFunctionCategory.NUMERIC)
+ val SINH = new SqlFunction(
+ "SINH",
+ SqlKind.OTHER_FUNCTION,
+ ReturnTypes.DOUBLE_NULLABLE,
+ null,
+ OperandTypes.NUMERIC,
+ SqlFunctionCategory.NUMERIC)
+
val HEX = new SqlFunction(
"HEX",
SqlKind.OTHER_FUNCTION,
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 91269e702b2..da7cf64b13e 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
@@ -121,6 +121,13 @@ object ScalarFunctions {
Math.tanh(x.doubleValue())
}
+ /**
+ * Returns the hyperbolic sine of a big decimal value.
+ */
+ def sinh(x: JBigDecimal): Double = {
+ Math.sinh(x.doubleValue())
+ }
+
/**
* Returns the logarithm of "x" with base "base".
*/
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 5a39014a6fd..b906a0d1091 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
@@ -231,6 +231,7 @@ object FunctionCatalog {
"minusPrefix" -> classOf[UnaryMinus],
"sin" -> classOf[Sin],
"cos" -> classOf[Cos],
+ "sinh" -> classOf[Sinh],
"tan" -> classOf[Tan],
"tanh" -> classOf[Tanh],
"cot" -> classOf[Cot],
@@ -460,6 +461,7 @@ class BasicOperatorTable extends ReflectiveSqlOperatorTable {
ScalarSqlFunctions.RPAD,
ScalarSqlFunctions.MD5,
ScalarSqlFunctions.SHA1,
+ ScalarSqlFunctions.SINH,
ScalarSqlFunctions.SHA224,
ScalarSqlFunctions.SHA256,
ScalarSqlFunctions.SHA384,
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 02baafd8382..42513c2a96f 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
@@ -1405,6 +1405,45 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
math.cos(-1231.1231231321321321111).toString)
}
+ @Test
+ def testSinh(): Unit = {
+ testAllApis(
+ 0.sinh(),
+ "0.sinh()",
+ "SINH(0)",
+ math.sinh(0).toString)
+
+ testAllApis(
+ -1.sinh(),
+ "-1.sinh()",
+ "SINH(-1)",
+ math.sinh(-1).toString)
+
+ testAllApis(
+ 'f4.sinh(),
+ "f4.sinh",
+ "SINH(f4)",
+ math.sinh(44L).toString)
+
+ testAllApis(
+ 'f6.sinh(),
+ "f6.sinh",
+ "SINH(f6)",
+ math.sinh(4.6D).toString)
+
+ testAllApis(
+ 'f7.sinh(),
+ "f7.sinh",
+ "SINH(f7)",
+ math.sinh(3).toString)
+
+ testAllApis(
+ 'f22.sinh(),
+ "f22.sinh",
+ "SINH(f22)",
+ math.sinh(2.0).toString)
+ }
+
@Test
def testTan(): 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 88cd78adfd9..7f897d090b1 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
@@ -109,6 +109,7 @@ class SqlExpressionTest extends ExpressionTestBase {
testSqlApi("CEILING(2.5)", "3")
testSqlApi("FLOOR(2.5)", "2")
testSqlApi("SIN(2.5)", "0.5984721441039564")
+ testSqlApi("SINH(2.5)", "6.0502044810397875")
testSqlApi("COS(2.5)", "-0.8011436155469337")
testSqlApi("TAN(2.5)", "-0.7470222972386603")
testSqlApi("TANH(2.5)", "0.9866142981514303")
----------------------------------------------------------------
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