Changeset: 5d6727ff2c5c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d6727ff2c5c
Branch: octbugs
Log Message:
Merged with Oct2020
diffs (155 lines):
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -82,10 +82,12 @@ MTIMEcurrent_timestamp(timestamp *ret)
#define INIT_ITER(VAR, VAR_BAT) VAR = bat_iterator(VAR_BAT)
#define APPEND_STR(MALFUNC) \
- if (BUNappend(bn, res, false) != GDK_SUCCEED) { \
+ if (tfastins_nocheckVAR(bn, i, res, Tsize(bn)) != GDK_SUCCEED) { \
+ GDKfree(res); \
msg = createException(SQL, "batmtime." MALFUNC, SQLSTATE(HY013)
MAL_MALLOC_FAIL); \
break; \
- }
+ } \
+ GDKfree(res); \
#define GET_NEXT_ITER(VAR) BUNtvar(VAR, i)
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -56,5 +56,5 @@ cast-interval.Bug-6793
could-not-allocate-space.Bug-6795
HAVE_LIBPY3?python3-udf-modules.Bug-6797
json-text-empty-separator.Bug-6798
-KNOWNFAIL&FEATURE?orderby-alias-expr.Bug-6799
+orderby-alias-expr.Bug-6799
drop-table-cascade.Bug-6805
diff --git
a/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err
b/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err
--- a/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err
+++ b/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err
@@ -5,19 +5,18 @@ stderr of test 'orderby-alias-expr.Bug-6
# 12:58:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38731" "--set"
"mapi_usock=/var/tmp/mtest-5660/.s.monetdb.38731" "--forcemito"
"--dbpath=/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
# 12:58:24 >
-# builtin opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/monetdb5/dbfarm/demo
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_ipv6 = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38731
-# cmdline opt mapi_usock = /var/tmp/mtest-5660/.s.monetdb.38731
-# cmdline opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2019
-# cmdline opt embedded_c = true
+MAPI = (monetdb) /var/tmp/mtest-2637315/.s.monetdb.37168
+QUERY = SELECT nm as alias1 FROM obale ORDER BY upper(alias1);
+ERROR = !SELECT: identifier 'alias1' unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-2637315/.s.monetdb.37168
+QUERY = SELECT nm as alias1 FROM obale ORDER BY nm || alias1;
+ERROR = !SELECT: identifier 'alias1' unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-2637315/.s.monetdb.37168
+QUERY = SELECT nm, COUNT(nm) countnm, COUNT(DISTINCT nm) countdnm FROM obale
GROUP BY nm ORDER BY countdnm - countnm;
+ERROR = !SELECT: identifier 'countdnm' unknown
+CODE = 42000
# 12:58:24 >
# 12:58:24 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5660" "--port=38731"
diff --git
a/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out
b/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out
--- a/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out
+++ b/sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out
@@ -53,25 +53,7 @@ stdout of test 'orderby-alias-expr.Bug-6
[ "b" ]
[ "b" ]
#SELECT nm as alias1 FROM obale ORDER BY alias1, nm; -- no problemo
-% sys.L1 # table_name
-% alias1 # name
-% varchar # type
-% 1 # length
-[ NULL ]
-[ "a" ]
-[ "b" ]
-[ "b" ]
-#SELECT nm as alias1 FROM obale ORDER BY upper(alias1);
-% sys.L1 # table_name
-% alias1 # name
-% varchar # type
-% 1 # length
-[ NULL ]
-[ "a" ]
-[ "b" ]
-[ "b" ]
-#SELECT nm as alias1 FROM obale ORDER BY nm || alias1;
-% sys.L1 # table_name
+% sys. # table_name
% alias1 # name
% varchar # type
% 1 # length
@@ -80,7 +62,7 @@ stdout of test 'orderby-alias-expr.Bug-6
[ "b" ]
[ "b" ]
#SELECT nm, upper(nm) as alias1 FROM obale ORDER BY alias1; -- no problemo
-% sys.obale, sys.L1 # table_name
+% sys.obale, sys. # table_name
% nm, alias1 # name
% varchar, varchar # type
% 1, 1 # length
@@ -89,7 +71,7 @@ stdout of test 'orderby-alias-expr.Bug-6
[ "b", "B" ]
[ "b", "B" ]
#SELECT nm, nm||nm as alias1 FROM obale ORDER BY alias1; -- no problemo
-% sys.obale, sys.L1 # table_name
+% sys.obale, sys. # table_name
% nm, alias1 # name
% varchar, varchar # type
% 1, 2 # length
@@ -98,15 +80,7 @@ stdout of test 'orderby-alias-expr.Bug-6
[ "b", "bb" ]
[ "b", "bb" ]
#SELECT nm, COUNT(nm) countnm, COUNT(DISTINCT nm) countdnm FROM obale GROUP BY
nm ORDER BY countnm desc, countdnm; -- no problemo
-% sys.obale, sys.L2, sys.L4 # table_name
-% nm, countnm, countdnm # name
-% varchar, bigint, bigint # type
-% 1, 1, 1 # length
-[ "b", 2, 1 ]
-[ "a", 1, 1 ]
-[ NULL, 0, 0 ]
-#SELECT nm, COUNT(nm) countnm, COUNT(DISTINCT nm) countdnm FROM obale GROUP BY
nm ORDER BY countdnm - countnm;
-% sys.obale, sys.L2, sys.L4 # table_name
+% sys.obale, sys., sys. # table_name
% nm, countnm, countdnm # name
% varchar, bigint, bigint # type
% 1, 1, 1 # length
diff --git a/sql/test/miscellaneous/Tests/simple_selects.sql
b/sql/test/miscellaneous/Tests/simple_selects.sql
--- a/sql/test/miscellaneous/Tests/simple_selects.sql
+++ b/sql/test/miscellaneous/Tests/simple_selects.sql
@@ -205,3 +205,5 @@ select cast(interval '3' second as clob)
-- 3.000
select cast(13121 as varchar(2147483647)) || cast(231231 as
varchar(2147483647)); --error, too big
+
+select date_to_str(a,'%y/%m/%d') from (values (date '2012-02-11'), (date
'2012-02-12'),(date '2012-02-13')) as a(a);
diff --git a/sql/test/miscellaneous/Tests/simple_selects.stable.out
b/sql/test/miscellaneous/Tests/simple_selects.stable.out
--- a/sql/test/miscellaneous/Tests/simple_selects.stable.out
+++ b/sql/test/miscellaneous/Tests/simple_selects.stable.out
@@ -392,6 +392,14 @@ stdout of test 'simple_selects` in direc
% clob # type
% 5 # length
[ "3.000" ]
+#select date_to_str(a,'%y/%m/%d') from (values (date '2012-02-11'), (date
'2012-02-12'),(date '2012-02-13')) as a(a);
+% .%5 # table_name
+% %5 # name
+% clob # type
+% 8 # length
+[ "12/02/11" ]
+[ "12/02/12" ]
+[ "12/02/13" ]
# 17:31:38 >
# 17:31:38 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
