diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesCryptoFunction.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesCryptoFunction.java index 1aaeaaa978..ac8245e8ab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesCryptoFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AesCryptoFunction.java @@ -62,13 +62,6 @@ public abstract class AesCryptoFunction extends CryptoFunction { super(name, arguments); } - @Override - public void checkLegalityBeforeTypeCoercion() { - if (arity() == 4) { - CryptoFunction.checkBlockEncryptionMode(getArgument(3), AES_MODES, "aes"); - } - } - public static StringLiteral getDefaultBlockEncryptionMode() { return CryptoFunction.getDefaultBlockEncryptionMode("AES_128_ECB"); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CryptoFunction.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CryptoFunction.java index 58dc04851a..b3f253f65d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CryptoFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CryptoFunction.java @@ -17,11 +17,9 @@ package org.apache.doris.nereids.trees.expressions.functions.scalar; -import org.apache.doris.nereids.exceptions.AnalysisException; import org.apache.doris.nereids.trees.expressions.Expression; import org.apache.doris.nereids.trees.expressions.functions.AlwaysNullable; import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature; -import org.apache.doris.nereids.trees.expressions.literal.StringLikeLiteral; import org.apache.doris.nereids.trees.expressions.literal.StringLiteral; import org.apache.doris.qe.ConnectContext; @@ -29,7 +27,6 @@ import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import java.util.List; -import java.util.Set; /** CryptoFunction */ public abstract class CryptoFunction extends ScalarFunction @@ -69,17 +66,6 @@ public abstract class CryptoFunction extends ScalarFunction return getName() + "(" + StringUtils.join(args, ", ") + ")"; } - /** checkBlockEncryptionMode */ - static void checkBlockEncryptionMode(Expression blockEncryptionMode, Set modes, String name) { - if (!(blockEncryptionMode instanceof StringLikeLiteral)) { - throw new AnalysisException("blockEncryptionMode should be string literal: " + blockEncryptionMode); - } - String mode = ((StringLikeLiteral) blockEncryptionMode).getStringValue(); - if (!modes.contains(mode.toUpperCase())) { - throw new AnalysisException("session variable block_encryption_mode is invalid with " + name); - } - } - /** getBlockEncryptionMode */ static StringLiteral getDefaultBlockEncryptionMode(String defaultMode) { String blockEncryptionMode = ""; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Sm4CryptoFunction.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Sm4CryptoFunction.java index 5b4e2ad149..68e3f76881 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Sm4CryptoFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Sm4CryptoFunction.java @@ -43,13 +43,6 @@ public abstract class Sm4CryptoFunction extends CryptoFunction { super(name, arguments); } - @Override - public void checkLegalityBeforeTypeCoercion() { - if (arity() == 4) { - CryptoFunction.checkBlockEncryptionMode(getArgument(3), SM4_MODES, "sm4"); - } - } - /** getDefaultBlockEncryptionMode */ static StringLiteral getDefaultBlockEncryptionMode() { return CryptoFunction.getDefaultBlockEncryptionMode("SM4_128_ECB"); diff --git a/regression-test/data/nereids_function_p0/scalar_function/R-W.out b/regression-test/data/nereids_function_p0/scalar_function/R-W.out index d3b52a7e03..8726d91244 100644 --- a/regression-test/data/nereids_function_p0/scalar_function/R-W.out +++ b/regression-test/data/nereids_function_p0/scalar_function/R-W.out @@ -1005,19 +1005,19 @@ j��\n��k�pZ�>��6 j��\n��k�pZ�>��6 -- !sql -- -�oB�8b����!�O� -�/����Z5Aw��� -�/����Z5Aw��� -�/����Z5Aw��� -�/����Z5Aw��� -7�v�$QG�o~�L�� -7�v�$QG�o~�L�� -7�v�$QG�o~�L�� -7�v�$QG�o~�L�� -I[S /�^Ptg��u -I[S /�^Ptg��u -I[S /�^Ptg��u -I[S /�^Ptg��u +\N +\N +\N +\N +\N +\N +\N +\N +\N +\N +\N +\N +\N -- !sql -- \N diff --git a/regression-test/suites/nereids_function_p0/scalar_function/R-W.groovy b/regression-test/suites/nereids_function_p0/scalar_function/R-W.groovy index fce073db99..0add8955c5 100644 --- a/regression-test/suites/nereids_function_p0/scalar_function/R-W.groovy +++ b/regression-test/suites/nereids_function_p0/scalar_function/R-W.groovy @@ -123,18 +123,17 @@ suite("nereids_scalar_fn_4") { sql "select sm4_decrypt(kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1" sql "select sm4_decrypt(kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr" qt_sql """ select sm4_decrypt(kvchrs1, kvchrs1, kvchrs1, "SM4_128_ECB") from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1 """ - qt_sql """ select sm4_decrypt(kstr, kstr, kstr, "SM4_128_ECB") from fn_test order by kstr, kstr, kstr, kstr """ + qt_sql """ select sm4_decrypt(kstr, kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr, kstr """ sql "select sm4_encrypt(kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1" sql "select sm4_encrypt(kstr, kstr) from fn_test order by kstr, kstr" sql "select sm4_encrypt(kvchrs1, kvchrs1, kvchrs1) from fn_test order by kvchrs1, kvchrs1, kvchrs1" sql "select sm4_encrypt(kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr" qt_sql """ select sm4_encrypt(kvchrs1, kvchrs1, kvchrs1, "SM4_128_ECB") from fn_test order by kvchrs1, kvchrs1, kvchrs1, kvchrs1""" - qt_sql """ select sm4_encrypt(kstr, kstr, kstr, "SM4_128_ECB") from fn_test order by kstr, kstr, kstr, kstr""" + qt_sql """ select sm4_encrypt(kstr, kstr, kstr, kstr) from fn_test order by kstr, kstr, kstr, kstr""" sql "select space(10) from fn_test order by kint" qt_sql """ select split_part(kvchrs1, " ", 1) from fn_test order by kvchrs1, kvchrs1, kint""" qt_sql """ select split_part(kstr, " ", 1) from fn_test order by kstr, kstr, kint""" qt_sql "select sqrt(kdbl) from fn_test order by kdbl" - // data out of geometry-style range qt_sql "select st_astext(st_point_vc) from fn_test order by st_point_vc" qt_sql "select st_astext(st_point_str) from fn_test order by st_point_str" qt_sql "select st_aswkt(st_point_vc) from fn_test order by st_point_vc"