This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 774f66c6bc [Enhencement](test) enhencement regression test of java udf
(#17251)
774f66c6bc is described below
commit 774f66c6bc35976f837100a1d464334d0d8a1182
Author: zhangstar333 <[email protected]>
AuthorDate: Wed Mar 1 09:34:40 2023 +0800
[Enhencement](test) enhencement regression test of java udf (#17251)
when run regression test of java udf many times.
if failed in some reason, the next time will meet error like: function
already exist
Issue Number: close #xxx
---
.../collect/test_javaudf_groupcount.groovy | 2 +-
.../collect/test_javaudf_murmurhash3.groovy | 3 +-
.../collect/test_javaudf_sessionize.groovy | 3 +-
.../javaudf_p0/date/test_javaudf_adddays.groovy | 3 +-
.../date/test_javaudf_addisoperioud.groovy | 3 +-
.../javaudf_p0/date/test_javaudf_daydiff.groovy | 3 +-
.../json/test_javaudf_convertfromcamelcase.groovy | 3 +-
.../json/test_javaudf_converttocamelcase.groovy | 3 +-
.../sanity/test_javaudf_assertequal.groovy | 3 +-
.../sanity/test_javaudf_assertlessthan.groovy | 3 +-
.../sanity/test_javaudf_assertudf.groovy | 3 +-
.../javaudf_p0/sketch/test_javaudf_md5.groovy | 3 +-
.../test_javaudaf_my_date_datetime.groovy | 12 +++++---
.../test_javaudaf_mygroupconcat_string.groovy | 3 +-
.../javaudf_p0/test_javaudaf_mysum_decimal.groovy | 3 +-
.../test_javaudaf_mysum_float_double.groovy | 5 +--
.../javaudf_p0/test_javaudaf_mysum_int.groovy | 3 +-
.../javaudf_p0/test_javaudaf_null_test.groovy | 3 +-
.../suites/javaudf_p0/test_javaudf_array.groovy | 6 ++++
.../suites/javaudf_p0/test_javaudf_boolean.groovy | 3 +-
.../suites/javaudf_p0/test_javaudf_case.groovy | 3 +-
.../suites/javaudf_p0/test_javaudf_date.groovy | 36 ++++++++++++++--------
.../suites/javaudf_p0/test_javaudf_decimal.groovy | 6 ++--
.../suites/javaudf_p0/test_javaudf_float.groovy | 6 ++--
.../suites/javaudf_p0/test_javaudf_int.groovy | 15 ++++++---
.../suites/javaudf_p0/test_javaudf_null.groovy | 2 +-
.../suites/javaudf_p0/test_javaudf_string.groovy | 3 +-
27 files changed, 97 insertions(+), 47 deletions(-)
diff --git
a/regression-test/suites/javaudf_p0/collect/test_javaudf_groupcount.groovy
b/regression-test/suites/javaudf_p0/collect/test_javaudf_groupcount.groovy
index f22e338062..6e250655ec 100644
--- a/regression-test/suites/javaudf_p0/collect/test_javaudf_groupcount.groovy
+++ b/regression-test/suites/javaudf_p0/collect/test_javaudf_groupcount.groovy
@@ -51,8 +51,8 @@ suite("test_javaudf_groupcount") {
qt_select """ SELECT group_count(col_1) as a FROM ${tableName} ORDER
BY a; """
- sql """ DROP FUNCTION group_count(string); """
} finally {
+ try_sql("DROP FUNCTION IF EXISTS group_count(string);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/collect/test_javaudf_murmurhash3.groovy
b/regression-test/suites/javaudf_p0/collect/test_javaudf_murmurhash3.groovy
index a84f245f27..8d1a6a08ab 100644
--- a/regression-test/suites/javaudf_p0/collect/test_javaudf_murmurhash3.groovy
+++ b/regression-test/suites/javaudf_p0/collect/test_javaudf_murmurhash3.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_murmurhash3") {
qt_select """ SELECT murmurhash3(col_1) as a FROM ${tableName} ORDER
BY a; """
- sql """ DROP FUNCTION murmurhash3(string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS murmurhash3(string);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/collect/test_javaudf_sessionize.groovy
b/regression-test/suites/javaudf_p0/collect/test_javaudf_sessionize.groovy
index 0907ba8bf0..276c0bbecc 100644
--- a/regression-test/suites/javaudf_p0/collect/test_javaudf_sessionize.groovy
+++ b/regression-test/suites/javaudf_p0/collect/test_javaudf_sessionize.groovy
@@ -53,8 +53,9 @@ suite("test_javaudf_sessionize") {
qt_select """ SELECT sessionize(col_1, col_2, col_3) as a FROM
${tableName} ORDER BY a; """
- sql """ DROP FUNCTION sessionize(string, bigint, int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS sessionize(string, bigint, int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/date/test_javaudf_adddays.groovy
b/regression-test/suites/javaudf_p0/date/test_javaudf_adddays.groovy
index e116727d91..fc3ee13537 100644
--- a/regression-test/suites/javaudf_p0/date/test_javaudf_adddays.groovy
+++ b/regression-test/suites/javaudf_p0/date/test_javaudf_adddays.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_adddays") {
qt_select """ SELECT add_days(col_1, 1) as a FROM ${tableName} ORDER
BY a; """
- sql """ DROP FUNCTION add_days(string, int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS add_days(string, int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/date/test_javaudf_addisoperioud.groovy
b/regression-test/suites/javaudf_p0/date/test_javaudf_addisoperioud.groovy
index 3e52a26745..1b4a88ad6c 100644
--- a/regression-test/suites/javaudf_p0/date/test_javaudf_addisoperioud.groovy
+++ b/regression-test/suites/javaudf_p0/date/test_javaudf_addisoperioud.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_addisoperioud") {
qt_select """ SELECT add_days(col_1, 'YYYYMMdd', 'PT02H00M') as a FROM
${tableName} ORDER BY a; """
- sql """ DROP FUNCTION add_days(string, string, string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS add_days(string, string, string);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/date/test_javaudf_daydiff.groovy
b/regression-test/suites/javaudf_p0/date/test_javaudf_daydiff.groovy
index 18f2e2794b..4a78910ec0 100644
--- a/regression-test/suites/javaudf_p0/date/test_javaudf_daydiff.groovy
+++ b/regression-test/suites/javaudf_p0/date/test_javaudf_daydiff.groovy
@@ -52,8 +52,9 @@ suite("test_javaudf_daydiff") {
qt_select """ SELECT day_diff(col_1, col_2) as a FROM ${tableName}
ORDER BY a; """
- sql """ DROP FUNCTION day_diff(string, string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS day_diff(string, string);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/json/test_javaudf_convertfromcamelcase.groovy
b/regression-test/suites/javaudf_p0/json/test_javaudf_convertfromcamelcase.groovy
index 66796dcb44..b6076969f6 100644
---
a/regression-test/suites/javaudf_p0/json/test_javaudf_convertfromcamelcase.groovy
+++
b/regression-test/suites/javaudf_p0/json/test_javaudf_convertfromcamelcase.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_convertfromcamelcase") {
qt_select """ SELECT convert_from_camel(col_1) as a FROM ${tableName}
ORDER BY a; """
- sql """ DROP FUNCTION convert_from_camel(string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS convert_from_camel(string); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/json/test_javaudf_converttocamelcase.groovy
b/regression-test/suites/javaudf_p0/json/test_javaudf_converttocamelcase.groovy
index 421018bc22..5fade3c30c 100644
---
a/regression-test/suites/javaudf_p0/json/test_javaudf_converttocamelcase.groovy
+++
b/regression-test/suites/javaudf_p0/json/test_javaudf_converttocamelcase.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_converttocamelcase") {
qt_select """ SELECT convert_to_camel(col_1) as a FROM ${tableName}
ORDER BY a; """
- sql """ DROP FUNCTION convert_to_camel(string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS convert_to_camel(string); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertequal.groovy
b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertequal.groovy
index 2f22bed540..c0715abe23 100644
--- a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertequal.groovy
+++ b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertequal.groovy
@@ -53,8 +53,9 @@ suite("test_javaudf_assertequal") {
qt_select """ SELECT asser_equal(col_1, col_2) as a FROM ${tableName}
ORDER BY a; """
- sql """ DROP FUNCTION asser_equal(double, double); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS asser_equal(double, double); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertlessthan.groovy
b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertlessthan.groovy
index 5177d16437..da043c31db 100644
---
a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertlessthan.groovy
+++
b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertlessthan.groovy
@@ -53,8 +53,9 @@ suite("test_javaudf_assertlessthan") {
qt_select """ SELECT asser_lessthan(col_1, col_2) as a FROM
${tableName} ORDER BY a; """
- sql """ DROP FUNCTION asser_lessthan(double, double); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS asser_lessthan(double, double); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertudf.groovy
b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertudf.groovy
index 067d591044..6649c8284e 100644
--- a/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertudf.groovy
+++ b/regression-test/suites/javaudf_p0/sanity/test_javaudf_assertudf.groovy
@@ -43,8 +43,9 @@ suite("test_javaudf_assertudf") {
qt_select """ SELECT assert(true, "not OK"); """
- sql """ DROP FUNCTION assert(boolean, string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS assert(boolean, string); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/sketch/test_javaudf_md5.groovy
b/regression-test/suites/javaudf_p0/sketch/test_javaudf_md5.groovy
index 3694d283fb..8f9b0cf282 100644
--- a/regression-test/suites/javaudf_p0/sketch/test_javaudf_md5.groovy
+++ b/regression-test/suites/javaudf_p0/sketch/test_javaudf_md5.groovy
@@ -51,8 +51,9 @@ suite("test_javaudf_md5") {
qt_select """ SELECT md5(col_1) as a FROM ${tableName} ORDER BY a; """
- sql """ DROP FUNCTION md5(string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS md5(string); ")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/test_javaudaf_my_date_datetime.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_my_date_datetime.groovy
index 7fc649fa67..0d09c42e6d 100644
--- a/regression-test/suites/javaudf_p0/test_javaudaf_my_date_datetime.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudaf_my_date_datetime.groovy
@@ -69,7 +69,7 @@ suite("test_javaudaf_my_date_datetime") {
qt_select2 """ select user_id, udaf_my_day_datev2(datev2_col) from
${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_day_datev2(datev2); """
+
// test date
sql """ CREATE AGGREGATE FUNCTION udaf_my_day_date(date) RETURNS date
PROPERTIES (
@@ -83,7 +83,7 @@ suite("test_javaudaf_my_date_datetime") {
qt_select4 """ select user_id, udaf_my_day_date(date_col) from
${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_day_date(date); """
+
// test datetimev2
sql """ CREATE AGGREGATE FUNCTION udaf_my_hour_datetimev2(datetimev2)
RETURNS datetimev2 PROPERTIES (
@@ -97,7 +97,7 @@ suite("test_javaudaf_my_date_datetime") {
qt_select6 """ select user_id, udaf_my_hour_datetimev2(datetimev2_col)
from ${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_hour_datetimev2(datetimev2); """
+
// test datetime
sql """ CREATE AGGREGATE FUNCTION udaf_my_hour_datetime(datetime)
RETURNS datetime PROPERTIES (
@@ -111,9 +111,13 @@ suite("test_javaudaf_my_date_datetime") {
qt_select6 """ select user_id, udaf_my_hour_datetime(datetime_col)
from ${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_hour_datetime(datetime); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_hour_datetime(datetime)")
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_day_datev2(datev2);")
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_day_date(date);")
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_hour_datetimev2(datetimev2);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/test_javaudaf_mygroupconcat_string.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_mygroupconcat_string.groovy
index 5b2bddc3bb..0926aada26 100644
---
a/regression-test/suites/javaudf_p0/test_javaudaf_mygroupconcat_string.groovy
+++
b/regression-test/suites/javaudf_p0/test_javaudaf_mygroupconcat_string.groovy
@@ -66,8 +66,9 @@ suite("test_javaudaf_mygroupconcat_string") {
qt_select1 """ SELECT user_id, udaf_mygroupconcat_string(varchar_col)
result FROM ${tableName} GROUP BY user_id order by user_id; """
- sql """ DROP FUNCTION udaf_mygroupconcat_string(string); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_mygroupconcat_string(string);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_decimal.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_decimal.groovy
index 4342822981..6526b6ceaf 100644
--- a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_decimal.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_decimal.groovy
@@ -62,8 +62,9 @@ suite("test_javaudaf_mysum_decimal") {
qt_select2 """ select user_id, udaf_my_sum_decimal(cost_1) from
${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_sum_decimal(decimal(27,9)); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_sum_decimal(decimal(27,9));")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git
a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_float_double.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_float_double.groovy
index 01780f9d6b..92ce70a91b 100644
--- a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_float_double.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_float_double.groovy
@@ -68,7 +68,7 @@ suite("test_javaudaf_mysum_float_double") {
qt_select2 """ select user_id,
udaf_my_sum_double(double_col,double_col) from ${tableName} group by user_id
order by user_id; """
- sql """ DROP FUNCTION udaf_my_sum_double(double,double); """
+
sql """ CREATE AGGREGATE FUNCTION udaf_my_sum_float(float) RETURNS
float PROPERTIES (
"file"="file://${jarPath}",
@@ -81,9 +81,10 @@ suite("test_javaudaf_mysum_float_double") {
qt_select4 """ select user_id, udaf_my_sum_float(float_col) from
${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_sum_float(float); """
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_sum_float(float);")
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_sum_double(double,double);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_int.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_int.groovy
index cd7ee3779f..ad3f2cc532 100644
--- a/regression-test/suites/javaudf_p0/test_javaudaf_mysum_int.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudaf_mysum_int.groovy
@@ -72,8 +72,9 @@ suite("test_javaudaf_mysum_int") {
qt_select4 """ select user_id, udaf_my_sum_int(user_id), sum(user_id)
from ${tableName} group by user_id order by user_id; """
- sql """ DROP FUNCTION udaf_my_sum_int(int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_my_sum_int(int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudaf_null_test.groovy
b/regression-test/suites/javaudf_p0/test_javaudaf_null_test.groovy
index 920f0aad4a..2e4548152c 100644
--- a/regression-test/suites/javaudf_p0/test_javaudaf_null_test.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudaf_null_test.groovy
@@ -69,8 +69,9 @@ suite("test_javaudaf_null_test") {
qt_select2 """ select user_id, udaf_null_test_int(user_id) from
${tableName} group by user_id order by user_id; """
qt_select3 """ SELECT udaf_null_test_int(1) result FROM ${tableName};
"""
- sql """ DROP FUNCTION udaf_null_test_int(int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS udaf_null_test_int(int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_array.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_array.groovy
index 15ecb239fc..89a89dc37d 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_array.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_array.groovy
@@ -117,6 +117,12 @@ suite("test_javaudf_array") {
qt_select_13 """ SELECT java_udf_array_date_test(array(datev2_col)),
tinyint_col as result FROM ${tableName} ORDER BY result; """
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_array_int_test(array<int>);")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_array_return_int_test(array<int>);")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_array_return_string_test(array<string>);")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_array_string_test(array<string>);")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_array_datatime_test(array<datetime>);")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_array_date_test(array<date>);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_boolean.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_boolean.groovy
index f45caf31f6..a753c3c222 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_boolean.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_boolean.groovy
@@ -63,8 +63,9 @@ suite("test_javaudf_boolean") {
qt_select """ SELECT user_id,java_udf_boolean_test(boo_1) as result
FROM ${tableName} order by user_id; """
- sql """ DROP FUNCTION java_udf_boolean_test(BOOLEAN); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_boolean_test(BOOLEAN);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_case.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_case.groovy
index 2e5d87747a..2ce55023b5 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_case.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_case.groovy
@@ -61,8 +61,9 @@ suite("test_javaudf_case") {
qt_select """ SELECT
starttime,java_udf_dateCase_test(starttime,start,end) as sum FROM ${tableName}
order by starttime; """
- sql """ DROP FUNCTION java_udf_dateCase_test(date,int,int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_dateCase_test(date,int,int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_date.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_date.groovy
index a5e87b8e46..60d52515fd 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_date.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_date.groovy
@@ -67,7 +67,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_date_test1('2011-01-01', '2011-01-01')
result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_date_test1(null, '2011-01-01') result
FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_date_test1(date, date); """
+
sql """ CREATE FUNCTION java_udf_date_test2(date, date) RETURNS
boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -79,7 +79,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_date_test2('2011-01-01', '2011-01-01')
result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_date_test2(null, '2011-01-01') result
FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_date_test2(date, date); """
+
sql """ CREATE FUNCTION java_udf_date_test3(date, date) RETURNS
boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -91,7 +91,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_date_test3('2011-01-01', '2011-01-01')
result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_date_test3(null, '2011-01-01') result
FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_date_test3(date, date); """
+
sql """ CREATE FUNCTION java_udf_datetime_test1(datetime, datetime)
RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -103,7 +103,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetime_test1('2011-01-01',
'2011-01-01') result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_datetime_test1(null, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetime_test1(datetime, datetime); """
+
sql """ CREATE FUNCTION java_udf_datetime_test2(datetime, datetime)
RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -115,7 +115,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetime_test2('2011-01-01',
'2011-01-01') result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_datetime_test2(null, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetime_test2(datetime, datetime); """
+
sql """ CREATE FUNCTION java_udf_datetime_test3(datetime, datetime)
RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -127,7 +127,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetime_test3('2011-01-01',
'2011-01-01') result FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_datetime_test3(null, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetime_test3(datetime, datetime); """
+
sql """ CREATE FUNCTION java_udf_datev2_test1(datev2, datev2) RETURNS
boolean PROPERTIES (
@@ -138,7 +138,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datev2_test1(datev2_col, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datev2_test1(datev2, datev2); """
+
sql """ CREATE FUNCTION java_udf_datev2_test2(datev2, datev2) RETURNS
boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -148,7 +148,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datev2_test2(datev2_col, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datev2_test2(datev2, datev2); """
+
sql """ CREATE FUNCTION java_udf_datev2_test3(datev2, datev2) RETURNS
boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -158,7 +158,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datev2_test3(datev2_col, '2011-01-01')
result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datev2_test3(datev2, datev2); """
+
sql """ CREATE FUNCTION java_udf_datetimev2_test1(datetimev2,
datetimev2) RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -168,7 +168,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetimev2_test1(datetimev2_col,
'2011-01-01') result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetimev2_test1(datetimev2,
datetimev2); """
+
sql """ CREATE FUNCTION java_udf_datetimev2_test2(datetimev2,
datetimev2) RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -178,7 +178,7 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetimev2_test2(datetimev2_col,
'2011-01-01') result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetimev2_test2(datetimev2,
datetimev2); """
+
sql """ CREATE FUNCTION java_udf_datetimev2_test3(datetimev2,
datetimev2) RETURNS boolean PROPERTIES (
"file"="file://${jarPath}",
@@ -188,8 +188,20 @@ suite("test_javaudf_date") {
qt_select """ SELECT java_udf_datetimev2_test3(datetimev2_col,
'2011-01-01') result FROM ${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_datetimev2_test3(datetimev2,
datetimev2); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_date_test3(date, date);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetime_test1(datetime,
datetime);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetime_test2(datetime,
datetime);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetime_test3(datetime,
datetime);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datev2_test1(datev2,
datev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datev2_test2(datev2,
datev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datev2_test3(datev2,
datev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetimev2_test1(datetimev2,
datetimev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetimev2_test2(datetimev2,
datetimev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_datetimev2_test3(datetimev2,
datetimev2);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_date_test2(date, date);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_date_test1(date, date);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_decimal.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_decimal.groovy
index 406fb857f7..664dd0abc9 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_decimal.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_decimal.groovy
@@ -63,7 +63,7 @@ suite("test_javaudf_decimal") {
qt_select """ SELECT user_id,java_udf_decimal_test(cost_1, cost_2) as
sum FROM ${tableName} order by user_id; """
- sql """ DROP FUNCTION
java_udf_decimal_test(decimal(27,9),decimal(27,9)); """
+
sql """ DROP FUNCTION if exists
java_udf_decimal_string_test(decimal(27,9),String,String); """
@@ -73,8 +73,10 @@ suite("test_javaudf_decimal") {
"type"="JAVA_UDF"
); """
qt_select_decimal_string """ SELECT
java_udf_decimal_string_test(2.83645,'asd','a') as result; """
- sql """ DROP FUNCTION
java_udf_decimal_string_test(decimal(27,9),String,String); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_decimal_test(decimal(27,9),decimal(27,9));")
+ try_sql("DROP FUNCTION IF EXISTS
java_udf_decimal_string_test(decimal(27,9),String,String);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_float.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_float.groovy
index a1bd2426c9..06a7f6a473 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_float.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_float.groovy
@@ -65,7 +65,7 @@ suite("test_javaudf_float") {
qt_select """ SELECT user_id,java_udf_float_test(float_1, float_2) as
sum FROM ${tableName} order by user_id; """
- sql """ DROP FUNCTION java_udf_float_test(FLOAT,FLOAT); """
+
sql """ CREATE FUNCTION java_udf_double_test(DOUBLE,DOUBLE) RETURNS
DOUBLE PROPERTIES (
"file"="file://${jarPath}",
@@ -80,8 +80,10 @@ suite("test_javaudf_float") {
qt_select """ SELECT user_id,java_udf_double_test(double_1, double_1)
as sum FROM ${tableName} order by user_id; """
- sql """ DROP FUNCTION java_udf_double_test(DOUBLE,DOUBLE); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_double_test(DOUBLE,DOUBLE);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_float_test(FLOAT,FLOAT);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_int.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_int.groovy
index 6e8a590b5d..a7d2615e86 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_int.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_int.groovy
@@ -67,7 +67,7 @@ suite("test_javaudf_int") {
qt_select """ SELECT java_udf_int_test(user_id) result FROM
${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_int_test(null) result ; """
- sql """ DROP FUNCTION java_udf_int_test(int); """
+
sql """ CREATE FUNCTION java_udf_tinyint_test(tinyint) RETURNS tinyint
PROPERTIES (
"file"="file://${jarPath}",
@@ -78,7 +78,7 @@ suite("test_javaudf_int") {
qt_select """ SELECT java_udf_tinyint_test(tinyint_col) result FROM
${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_tinyint_test(null) result ; """
- sql """ DROP FUNCTION java_udf_tinyint_test(tinyint); """
+
sql """ CREATE FUNCTION java_udf_smallint_test(smallint) RETURNS
smallint PROPERTIES (
"file"="file://${jarPath}",
@@ -89,7 +89,7 @@ suite("test_javaudf_int") {
qt_select """ SELECT java_udf_smallint_test(smallint_col) result FROM
${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_smallint_test(null) result ; """
- sql """ DROP FUNCTION java_udf_smallint_test(smallint); """
+
sql """ CREATE FUNCTION java_udf_bigint_test(bigint) RETURNS bigint
PROPERTIES (
"file"="file://${jarPath}",
@@ -100,7 +100,7 @@ suite("test_javaudf_int") {
qt_select """ SELECT java_udf_bigint_test(bigint_col) result FROM
${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_bigint_test(null) result ; """
- sql """ DROP FUNCTION java_udf_bigint_test(bigint); """
+
sql """ CREATE FUNCTION java_udf_largeint_test(largeint) RETURNS
largeint PROPERTIES (
"file"="file://${jarPath}",
@@ -111,8 +111,13 @@ suite("test_javaudf_int") {
qt_select """ SELECT java_udf_largeint_test(largeint_col) result FROM
${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_largeint_test(null) result ; """
- sql """ DROP FUNCTION java_udf_largeint_test(largeint); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_tinyint_test(tinyint);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_smallint_test(smallint);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_bigint_test(bigint);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_largeint_test(largeint);")
+ try_sql("DROP FUNCTION IF EXISTS java_udf_int_test(int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_null.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_null.groovy
index e2699f1b4b..7e884c9b2e 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_null.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_null.groovy
@@ -63,8 +63,8 @@ suite("test_javaudf_null") {
qt_select """ SELECT java_udf_null_test(1) result; """
qt_select """ SELECT java_udf_null_test(user_id) result FROM
${tableName} ORDER BY result; """
- sql """ DROP FUNCTION java_udf_null_test(int); """
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_null_test(int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
diff --git a/regression-test/suites/javaudf_p0/test_javaudf_string.groovy
b/regression-test/suites/javaudf_p0/test_javaudf_string.groovy
index 479acb5699..07a1ac0697 100644
--- a/regression-test/suites/javaudf_p0/test_javaudf_string.groovy
+++ b/regression-test/suites/javaudf_p0/test_javaudf_string.groovy
@@ -67,8 +67,9 @@ suite("test_javaudf_string") {
qt_select """ SELECT java_udf_string_test(string_col, 2, 3) result
FROM ${tableName} ORDER BY result; """
qt_select """ SELECT java_udf_string_test('abcdef', 2, 3),
java_udf_string_test('abcdefg', 2, 3) result FROM ${tableName} ORDER BY result;
"""
- sql """ DROP FUNCTION java_udf_string_test(string, int, int); """
+
} finally {
+ try_sql("DROP FUNCTION IF EXISTS java_udf_string_test(string, int,
int);")
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
