You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ja...@apache.org on 2023/01/30 10:53:04 UTC
[doris] branch master updated: [fix](Nereids): fix AesDecrypt, AesEncrypt. (#16213)
This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c6014975a4 [fix](Nereids): fix AesDecrypt, AesEncrypt. (#16213)
c6014975a4 is described below
commit c6014975a4c58a500d9c8195d8ba88d748b3539d
Author: jakevin <ja...@gmail.com>
AuthorDate: Mon Jan 30 18:52:56 2023 +0800
[fix](Nereids): fix AesDecrypt, AesEncrypt. (#16213)
---
.../trees/expressions/functions/scalar/AesDecrypt.java | 8 +-------
.../trees/expressions/functions/scalar/AesEncrypt.java | 11 +----------
.../suites/nereids_function_p0/scalar_function/A-F.groovy | 10 ++++------
3 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesDecrypt.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesDecrypt.java
index 521e7520fa..a3109ab3e2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesDecrypt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesDecrypt.java
@@ -54,21 +54,15 @@ public class AesDecrypt extends AesCryptoFunction {
.args(StringType.INSTANCE, StringType.INSTANCE, StringType.INSTANCE, StringType.INSTANCE)
);
- /**
- * constructor with 2 arguments.
- */
public AesDecrypt(Expression arg0, Expression arg1) {
super("aes_decrypt", arg0, arg1);
}
- /**
- * constructor with 3 arguments.
- */
public AesDecrypt(Expression arg0, Expression arg1, Expression arg2) {
super("aes_decrypt", arg0, arg1, arg2, getDefaultBlockEncryptionMode());
}
- private AesDecrypt(Expression arg0, Expression arg1, Expression arg2, StringLiteral arg3) {
+ public AesDecrypt(Expression arg0, Expression arg1, Expression arg2, Expression arg3) {
super("aes_decrypt", arg0, arg1, arg2, arg3);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesEncrypt.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesEncrypt.java
index e340964764..1a0ef5b401 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesEncrypt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesEncrypt.java
@@ -54,24 +54,15 @@ public class AesEncrypt extends AesCryptoFunction {
.args(StringType.INSTANCE, StringType.INSTANCE, StringType.INSTANCE, StringType.INSTANCE)
);
- /**
- * constructor with 2 arguments.
- */
public AesEncrypt(Expression arg0, Expression arg1) {
super("aes_encrypt", arg0, arg1);
}
- /**
- * constructor with 3 arguments.
- */
public AesEncrypt(Expression arg0, Expression arg1, Expression arg2) {
super("aes_encrypt", arg0, arg1, arg2, getDefaultBlockEncryptionMode());
}
- /**
- * constructor with 4 arguments.
- */
- public AesEncrypt(Expression arg0, Expression arg1, Expression arg2, StringLiteral arg3) {
+ public AesEncrypt(Expression arg0, Expression arg1, Expression arg2, Expression arg3) {
super("aes_encrypt", arg0, arg1, arg2, arg3);
}
diff --git a/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy b/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
index 6fe236127f..e04d3a6c3b 100644
--- a/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
+++ b/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
@@ -33,16 +33,14 @@ suite("nereids_scalar_fn_1") {
sql "select aes_decrypt(kstr, kstr) from fn_test order by kstr, kstr"
sql "select aes_decrypt(kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1"
sql "select aes_decrypt(kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr"
- // cannot find function
- // sql "select aes_decrypt(kvchrs1, kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1"
- // sql "select aes_decrypt(kstr, kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr, kstr"
+ sql """select aes_decrypt(kvchrs1, kvchrs1, kvchrs1, "AES_128_ECB") from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1"""
+ sql """select aes_decrypt(kstr, kstr, kstr, "AES_128_ECB") from fn_test order by kstr, kstr, kstr, kstr"""
sql "select aes_encrypt(kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1"
sql "select aes_encrypt(kstr, kstr) from fn_test order by kstr, kstr"
sql "select aes_encrypt(kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1"
sql "select aes_encrypt(kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr"
- // cannot find function
- // sql "select aes_encrypt(kvchrs1, kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1"
- // sql "select aes_encrypt(kstr, kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr, kstr"
+ sql """select aes_encrypt(kvchrs1, kvchrs1, kvchrs1, "AES_128_ECB") from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1"""
+ sql """select aes_encrypt(kstr, kstr, kstr, "AES_128_ECB") from fn_test order by kstr, kstr, kstr, kstr"""
qt_sql "select append_trailing_char_if_absent(kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1"
qt_sql "select append_trailing_char_if_absent(kstr, kstr) from fn_test order by kstr, kstr"
qt_sql "select ascii(kvchrs1) from fn_test order by kvchrs1"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org