Changeset: 40fc70e0eb37 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/40fc70e0eb37
Modified Files:
monetdb5/mal/Tests/tst163.maltest
sql/backends/monet5/Tests/simpleSQL.maltest
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
sql/benchmarks/tpch/Tests/one.test.in
sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.test
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.test.in
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.test
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.test
sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-6666.test
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.test
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
sql/test/BugTracker-2022/Tests/create_func_with_case_and_in.test
sql/test/BugTracker-2022/Tests/cudf-grouped-aggr.Bug-7285.test
sql/test/BugTracker-2022/Tests/date-calculations.Bug-7227.test
sql/test/BugTracker-2022/Tests/delete-update.Bug-7267.test
sql/test/BugTracker-2022/Tests/dump-table-data.Bug-7282.test
sql/test/BugTracker-2022/Tests/empty-MAL.Bug-7259.test
sql/test/BugTracker-2022/Tests/insert-not-null.Bug-7232.test
sql/test/BugTracker-2022/Tests/push-aggr-down-removes-distinct-on-union-all.Bug-7318.test
sql/test/BugTracker-2022/Tests/python-udf-inside-udf.Bug-7252.test
sql/test/BugTracker-2022/Tests/recreate-view.Bug-7241.test
sql/test/BugTracker-2022/Tests/single_row_in_rel_order_by_column.Bug-7306.test
sql/test/BugTracker-2022/Tests/temp-table-create-index-drop-issue.test
sql/test/BugTracker-2022/Tests/transaction-conflict.Bug-7228.test
sql/test/SQLancer/Tests/sqlancer08.test
sql/test/SQLancer/Tests/sqlancer09.test
sql/test/SQLancer/Tests/sqlancer17.test
sql/test/SQLancer/Tests/sqlancer18.test
sql/test/SQLancer/Tests/sqlancer22.test
sql/test/SQLancer/Tests/sqlancer23.test
sql/test/SQLite_regress/sqllogictest/Tests/select2.test
sql/test/SQLite_regress/sqllogictest/Tests/select3.test
sql/test/Skyserver/Tests/Skyserver_constraints_v6.test
sql/test/Skyserver/Tests/Skyserver_dropConstraints_v6.test
sql/test/Skyserver/Tests/Skyserver_dropFunctions.test
sql/test/Skyserver/Tests/Skyserver_dropFunctions_v6.test
sql/test/Skyserver/Tests/Skyserver_dropTables_v6.test
sql/test/Skyserver/Tests/Skyserver_dropViews_v6.test
sql/test/Skyserver/Tests/Skyserver_functions.test
sql/test/Skyserver/Tests/Skyserver_functions_v6.test
sql/test/Skyserver/Tests/Skyserver_import.test.in
sql/test/Skyserver/Tests/Skyserver_import_v6.test.in
sql/test/Skyserver/Tests/Skyserver_tables_v6.test
sql/test/Skyserver/Tests/Skyserver_views.test
sql/test/Skyserver/Tests/Skyserver_views_v6.test
sql/test/Tests/comment-dump.test
sql/test/Tests/orderby-nulls-first-last.test
sql/test/Tests/savepoints2.test
sql/test/Tests/select_window_pushdown.test
sql/test/Triggers/Tests/trigger_action.test
sql/test/VOC/Tests/VOCmanual_examples.test
sql/test/VOC/Tests/VOCquery.test
sql/test/analytics/Tests/analytics00.test
sql/test/concurrent/Tests/smart-segment-merge.test
sql/test/dict/Tests/dict04.test
sql/test/mapi/Tests/mal_int128.maltest
sql/test/merge-partitions/Tests/mergepart28.test.in
sql/test/mergetables/Tests/mergedb_create.test
sql/test/mergetables/Tests/singlekeyconstraint.test
sql/test/mergetables/Tests/sqlsmith.Bug-6472.test
sql/test/miscellaneous/Tests/simple_plans.test
sql/test/miscellaneous/Tests/simple_selects.test
sql/test/miscellaneous/Tests/with_update_stmts.test
sql/test/pg_regress/Tests/date.test
sql/test/scripts/Tests/copy-into-lz4.test.in
sql/test/sys-schema/Tests/webExamplesMathematicalFunctionsOperators.test
sql/test/sys-schema/Tests/webExamplesUrlFunctions.test
sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
sql/test/sysmon/timeout/Tests/timeout_join.maltest
sql/test/sysmon/timeout/Tests/timeout_select.maltest
sql/test/sysmon/vacuum/Tests/test_vacuum_mal.maltest
testing/Mtest.py.in
testing/sqllogictest.py
Branch: Sep2022
Log Message:
Normalized test files; Mtest.py --approve keeps comments.
Also, two tests that were disabled due to errors are now enabled.
diffs (truncated from 2308 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst163.maltest
b/monetdb5/mal/Tests/tst163.maltest
--- a/monetdb5/mal/Tests/tst163.maltest
+++ b/monetdb5/mal/Tests/tst163.maltest
@@ -19,3 +19,4 @@ statement error
io.print(j)
----
nil
+
diff --git a/sql/backends/monet5/Tests/simpleSQL.maltest
b/sql/backends/monet5/Tests/simpleSQL.maltest
--- a/sql/backends/monet5/Tests/simpleSQL.maltest
+++ b/sql/backends/monet5/Tests/simpleSQL.maltest
@@ -20,4 +20,3 @@ user.foo()
% 1 # length
1
-
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
@@ -58,7 +58,6 @@ SELECT pyapi_timestamp(d) FROM timestamp
----
2000-01-01 12:00:00.000001
-
statement ok
CREATE TABLE decimal_table(d DECIMAL(10, 3))
diff --git a/sql/benchmarks/tpch/Tests/one.test.in
b/sql/benchmarks/tpch/Tests/one.test.in
--- a/sql/benchmarks/tpch/Tests/one.test.in
+++ b/sql/benchmarks/tpch/Tests/one.test.in
@@ -200,100 +200,100 @@ select count(*) from lineitem
60175
statement ok
-create procedure sys.dict_compress( sname string, tname string, cname string,
ordered_values bool) external name dict.compress;
+create procedure sys.dict_compress( sname string, tname string, cname string,
ordered_values bool) external name dict.compress
statement ok
-create procedure sys.for_compress( sname string, tname string, cname string)
external name "for".compress;
+create procedure sys.for_compress( sname string, tname string, cname string)
external name "for".compress
statement ok
-call dict_compress('sys', 'region', 'r_regionkey', true);
+call dict_compress('sys', 'region', 'r_regionkey', true)
statement ok
-call dict_compress('sys', 'nation', 'n_nationkey', true);
+call dict_compress('sys', 'nation', 'n_nationkey', true)
statement ok
-call dict_compress('sys', 'nation', 'n_regionkey', true);
+call dict_compress('sys', 'nation', 'n_regionkey', true)
statement ok
-call dict_compress('sys', 'supplier', 's_nationkey', true);
+call dict_compress('sys', 'supplier', 's_nationkey', true)
statement ok
-call dict_compress('sys', 'customer', 'c_nationkey', true);
+call dict_compress('sys', 'customer', 'c_nationkey', true)
statement ok
-call dict_compress('sys', 'customer', 'c_mktsegment', true);
+call dict_compress('sys', 'customer', 'c_mktsegment', true)
statement ok
-call dict_compress('sys', 'part', 'p_mfgr', true);
+call dict_compress('sys', 'part', 'p_mfgr', true)
statement ok
-call dict_compress('sys', 'part', 'p_brand', true);
+call dict_compress('sys', 'part', 'p_brand', true)
statement ok
-call dict_compress('sys', 'part', 'p_type', true);
+call dict_compress('sys', 'part', 'p_type', true)
statement ok
-call dict_compress('sys', 'part', 'p_size', true);
+call dict_compress('sys', 'part', 'p_size', true)
statement ok
-call dict_compress('sys', 'part', 'p_container', true);
+call dict_compress('sys', 'part', 'p_container', true)
statement ok
-call dict_compress('sys', 'part', 'p_retailprice', true);
+call dict_compress('sys', 'part', 'p_retailprice', true)
statement ok
-call dict_compress('sys', 'partsupp', 'ps_availqty', true);
+call dict_compress('sys', 'partsupp', 'ps_availqty', true)
statement ok
-call dict_compress('sys', 'orders', 'o_orderstatus', true);
+call dict_compress('sys', 'orders', 'o_orderstatus', true)
statement ok
-call dict_compress('sys', 'orders', 'o_orderdate', true);
+call dict_compress('sys', 'orders', 'o_orderdate', true)
statement ok
-call dict_compress('sys', 'orders', 'o_orderpriority', true);
+call dict_compress('sys', 'orders', 'o_orderpriority', true)
statement ok
-call dict_compress('sys', 'orders', 'o_clerk', true);
+call dict_compress('sys', 'orders', 'o_clerk', true)
statement ok
-call dict_compress('sys', 'orders', 'o_shippriority', true);
+call dict_compress('sys', 'orders', 'o_shippriority', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_linenumber', true);
+call dict_compress('sys', 'lineitem', 'l_linenumber', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_quantity', true);
+call dict_compress('sys', 'lineitem', 'l_quantity', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_discount', true);
+call dict_compress('sys', 'lineitem', 'l_discount', true)
# testing l_tax now with for compression.
# not dict call dict_compress('sys', 'lineitem', 'l_tax', true);
#
statement ok
-call for_compress('sys', 'lineitem', 'l_tax');
+call for_compress('sys', 'lineitem', 'l_tax')
statement ok
-call dict_compress('sys', 'lineitem', 'l_returnflag', true);
+call dict_compress('sys', 'lineitem', 'l_returnflag', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_linestatus', true);
+call dict_compress('sys', 'lineitem', 'l_linestatus', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_shipdate', true);
+call dict_compress('sys', 'lineitem', 'l_shipdate', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_commitdate', true);
+call dict_compress('sys', 'lineitem', 'l_commitdate', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_shipinstruct', true);
+call dict_compress('sys', 'lineitem', 'l_shipinstruct', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_receiptdate', true);
+call dict_compress('sys', 'lineitem', 'l_receiptdate', true)
statement ok
-call dict_compress('sys', 'lineitem', 'l_shipmode', true);
+call dict_compress('sys', 'lineitem', 'l_shipmode', true)
query ITT rowsort
select * from region order by r_regionkey limit 9
diff --git
a/sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.test
b/sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.test
---
a/sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.test
+++
b/sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.test
@@ -3,8 +3,8 @@ select ((4.4054292 - 4.40572025343667)^2
----
4
-query I nosort
+query R nosort
select cast((4.4054292 - 4.40572025343667)^2 as double) + cast((52.0903881 -
52.091375762174)^2 as double)
----
-4
+4.000
diff --git a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.test.in
b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.test.in
--- a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.test.in
+++ b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.test.in
@@ -129,7 +129,7 @@ statement ok
create table t2972(u url)
statement ok
-insert into t2972 values ('$UTSTSRCDIR/url_script_test.Bug-2972.txt')
+insert into t2972 values ('$QUTSTSRCDIR/url_script_test.Bug-2972.txt')
statement error
select getContent(u) from t2972
diff --git
a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
---
a/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
+++
b/sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
@@ -1,4 +1,5 @@
hash-threshold 110
+
statement ok
CREATE TABLE "sys"."myt" (
"column_id" INTEGER,
diff --git
a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.test
b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.test
---
a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.test
+++
b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.test
@@ -71,3 +71,4 @@ NULL
statement ok
ROLLBACK
+
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.test
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.test
---
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.test
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.test
@@ -31,3 +31,4 @@ DROP TABLE tab0
statement ok
ROLLBACK
+
diff --git a/sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-6666.test
b/sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-6666.test
--- a/sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-6666.test
+++ b/sql/test/BugTracker-2018/Tests/copy-into-doubled.Bug-6666.test
@@ -13,10 +13,10 @@ copy 1 records into "t1" from stdin
1
query I rowsort
-select count(*) from "t1";
+select count(*) from "t1"
----
1
statement ok
-drop table "t1";
+drop table "t1"
diff --git
a/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.test
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.test
--- a/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.test
+++ b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.test
@@ -10,10 +10,10 @@ copy 1 records into t (a) from stdin (id
100,
query I rowsort
-select count(a) from t;
+select count(a) from t
----
0
statement ok
-rollback;
+rollback
diff --git
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
---
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
+++
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
@@ -76,3 +76,4 @@ DROP TABLE sys.myfunctions
statement ok
ROLLBACK
+
diff --git
a/sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
b/sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
--- a/sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
+++ b/sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
@@ -19,7 +19,7 @@ 0,67
0,890
query IR nosort
-select * from tmpcopy;
+select * from tmpcopy
----
0
1.200
@@ -43,10 +43,10 @@ 0
890.000
statement error
-copy 1 records into tmpcopy from stdin delimiters ',','\n';
+copy 1 records into tmpcopy from stdin delimiters ',','\n'
<COPY_INTO_DATA>
0,12.3456
statement ok
-rollback;
+rollback
diff --git a/sql/test/BugTracker-2022/Tests/create_func_with_case_and_in.test
b/sql/test/BugTracker-2022/Tests/create_func_with_case_and_in.test
--- a/sql/test/BugTracker-2022/Tests/create_func_with_case_and_in.test
+++ b/sql/test/BugTracker-2022/Tests/create_func_with_case_and_in.test
@@ -1,19 +1,20 @@
statement ok
CREATE FUNCTION foo(t INT) RETURNS STRING BEGIN
RETURN CASE WHEN t IN (10, 20, 30) THEN 'YES' ELSE 'NO' END;
-END;
+END
query T rowsort
-select foo(10);
+select foo(10)
----
YES
statement ok
CREATE FUNCTION nfoo(t INT) RETURNS STRING BEGIN
RETURN CASE WHEN t NOT IN (10, 20, 30) THEN 'YES' ELSE 'NO' END;
-END;
+END
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
