Changeset: 679a700a275a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=679a700a275a
Removed Files:
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Modified Files:
sql/test/BugTracker-2009/Tests/All
sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Via-m/Tests/event_s03.stable.out
sql/test/Via-m/Tests/event_s05.stable.out
sql/test/Via-m/Tests/event_s07.stable.out
sql/test/Via-m/Tests/event_s09.stable.out
sql/test/Via-m/Tests/event_s11.stable.err
sql/test/Via-m/Tests/event_s11.stable.out
sql/test/Via-m/Tests/file_s04.stable.out
sql/test/Via-m/Tests/file_s05.stable.out
sql/test/Via-m/Tests/file_s06.stable.out
sql/test/Via-m/Tests/file_s08.stable.out
sql/test/Via-m/Tests/file_s10.stable.out
sql/test/Via-m/Tests/file_s12.stable.out
sql/test/Via-m/Tests/file_s15.stable.out
sql/test/Via-m/Tests/media_s04.stable.out
sql/test/Via-m/Tests/media_s06.stable.out
sql/test/Via-m/Tests/media_s08.stable.out
sql/test/Via-m/Tests/media_s10.stable.out
sql/test/Via-m/Tests/media_s12.stable.out
sql/test/Via-m/Tests/media_s14.stable.out
sql/test/Via-m/Tests/media_s16.stable.out
sql/test/Via-m/Tests/media_s18.stable.out
sql/test/Via-m/Tests/media_s19.stable.out
Branch: gdk_tracer
Log Message:
approved some output (as done in default)
diffs (truncated from 997 to 300 lines):
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -54,7 +54,6 @@ AVG_of_SQRT.SF-2757642
missing_column_name.SF-2776100
dumping_tables.SF-2776908
dumping_tables.SF-2776908--performance
-dumping_tables.SF-2776908--optimizers
name_clash_with_dump.SF-2780395
temporary_table_leftover.SF-2779437
temporary_table_leftover.SF-2734713
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5
+++ /dev/null
@@ -1,1 +0,0 @@
---optimizers
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-\d
-\d triggers
-\d args
-create table node_tags (id integer);
-select * from node_tags;
-insert into node_tags values (1);
-select * from node_tags;
-drop table node_tags;
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err
+++ /dev/null
@@ -1,85 +0,0 @@
-stderr of test 'dumping_tables.SF-2776908--optimizers` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 12:59:51 >
-# 12:59:51 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=t
rue --set mapi_port=33577 --set xrpc_port=49080 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 12:59:51 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.28.4
-# builtin opt monet_pid = 17744
-# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib64/MonetDB:${exec_prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 33577
-# cmdline opt xrpc_port = 49080
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
-
-# 12:59:51 >
-# 12:59:51 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
-# 12:59:51 >
-
-
-# 12:59:51 >
-# 12:59:51 > Done.
-# 12:59:51 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
+++ /dev/null
@@ -1,62 +0,0 @@
-stdout of test 'dumping_tables.SF-2776908--optimizers` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 12:59:51 >
-# 12:59:51 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=t
rue --set mapi_port=33577 --set xrpc_port=49080 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 12:59:51 >
-
-# MonetDB server v5.10.4, based on kernel v1.28.4
-# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:33577/
-# MonetDB/SQL module v2.28.4 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 12:59:51 >
-# 12:59:51 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
-# 12:59:51 >
-
-CREATE TABLE "sys"."triggers" (
- "id" INTEGER,
- "name" VARCHAR(1024),
- "table_id" INTEGER,
- "time" SMALLINT,
- "orientation" SMALLINT,
- "event" SMALLINT,
- "old_name" VARCHAR(1024),
- "new_name" VARCHAR(1024),
- "condition" VARCHAR(2048),
- "statement" VARCHAR(2048)
-);
-CREATE TABLE "sys"."args" (
- "id" INTEGER,
- "func_id" INTEGER,
- "name" VARCHAR(256),
- "type" VARCHAR(1024),
- "type_digits" INTEGER,
- "type_scale" INTEGER,
- "inout" TINYINT,
- "number" INTEGER
-);
-% sys.node_tags # table_name
-% id # name
-% int # type
-% 1 # length
-[ 1 ]
-% sys.node_tags # table_name
-% id # name
-% int # type
-% 1 # length
-[ 1 ]
-
-# 12:59:51 >
-# 12:59:51 > Done.
-# 12:59:51 >
-
diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
--- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
+++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
@@ -64,11 +64,6 @@ stderr of test 'new-readonly-db.Bug-2695
# cmdline opt mal_listing = 2
# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010-2695
# cmdline opt gdk_readonly = yes
-#warning: please don't forget to set your vault key!
-#(see /ufs/sjoerd/Monet-candidate/etc/monetdb5.conf)
-!mvc_init: unable to create system tables
-Fatal error during initialization:
-SQLException:SQLinit:42000!Catalogue initialization failed
# 12:51:24 >
# 12:51:24 > Done.
diff --git a/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
b/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
--- a/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
+++ b/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql
@@ -36,9 +36,9 @@ set t = now();
set t = current_timestamp;
set t = current_time;
rollback;
-set tt = now();
-set tt = current_time;
-set tt = current_timestamp;
+set tt = now(); --error, tt is no longer in the scope
+set tt = current_time; --error, tt is no longer in the scope
+set tt = current_timestamp; --error, tt is no longer in the scope
create table d(t timestamp default current_time, i integer);
create table d(t time default current_timestamp, i integer);
diff --git
a/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
b/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
--- a/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
+++ b/sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err
@@ -32,7 +32,19 @@ MAPI = (monetdb) /var/tmp/mtest-27483/.
QUERY = set t = current_time;
ERROR = !types timetz(7,0) and timestamp(7,0) are not equal
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-219658/.s.monetdb.32926
+QUERY = set tt = now(); --error, tt is no longer in the scope
+ERROR = !Variable tt unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-219658/.s.monetdb.32926
+QUERY = set tt = current_time; --error, tt is no longer in the scope
+ERROR = !Variable tt unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-219658/.s.monetdb.32926
+QUERY = set tt = current_timestamp; --error, tt is no longer in the scope
+ERROR = !Variable tt unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-219658/.s.monetdb.32926
QUERY = create table d(t timestamp default current_time, i integer);
ERROR = !types timetz(7,0) and timestamp(7,0) are not equal
CODE = 42000
diff --git
a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
---
a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
+++
b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
@@ -74,7 +74,7 @@ stdout of test 'crash_correlated_subquer
[ "sys", 2000, "dependency_args_on_types", true, 8 ]
[ "sys", 2000, "sessions", true, 9 ]
[ "sys", 2000, "prepared_statements", true, 5 ]
-[ "sys", 2000, "prepared_statements_args", true, 8 ]
+[ "sys", 2000, "prepared_statements_args", true, 9 ]
[ "sys", 2000, "optimizers", true, 3 ]
[ "sys", 2000, "environment", true, 2 ]
[ "sys", 2000, "queue", true, 9 ]
@@ -129,7 +129,7 @@ stdout of test 'crash_correlated_subquer
[ "sys", 2000, "dependency_args_on_types", true, 8 ]
[ "sys", 2000, "sessions", true, 9 ]
[ "sys", 2000, "prepared_statements", true, 5 ]
-[ "sys", 2000, "prepared_statements_args", true, 8 ]
+[ "sys", 2000, "prepared_statements_args", true, 9 ]
[ "sys", 2000, "optimizers", true, 3 ]
[ "sys", 2000, "environment", true, 2 ]
[ "sys", 2000, "queue", true, 9 ]
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -88,6 +88,7 @@ Dependencies between database objects
% 7, 8, 10 # length
[ "monetdb", "bam", "DEP_SCHEMA" ]
[ "monetdb", "json", "DEP_SCHEMA" ]
+[ "monetdb", "logging", "DEP_SCHEMA" ]
[ "monetdb", "profiler", "DEP_SCHEMA" ]
[ "monetdb", "sys", "DEP_SCHEMA" ]
[ "monetdb", "test", "DEP_SCHEMA" ]
@@ -95,21 +96,21 @@ Dependencies between database objects
[ "monetdb", "wlc", "DEP_SCHEMA" ]
[ "monetdb", "wlr", "DEP_SCHEMA" ]
#SELECT t.name, v.name, 'DEP_VIEW' from tables as t, tables as v, dependencies
as dep where t.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND
v.type = 1 order by t.name, v.name;
-% .t, .v, .%20 # table_name
-% name, name, %20 # name
+% .t, .v, .%14 # table_name
+% name, name, %14 # name
% varchar, varchar, char # type
% 2, 2, 8 # length
[ "t1", "v1", "DEP_VIEW" ]
[ "v1", "v2", "DEP_VIEW" ]
#SELECT t.name, i.name, 'DEP_INDEX' from tables as t, idxs as i where
i.table_id = t.id and i.name not in (select name from keys) and t.type = 0
order by t.name, i.name;
-% .t, .i, .%12 # table_name
-% name, name, %12 # name
+% .t, .i, .%10 # table_name
+% name, name, %10 # name
% varchar, varchar, char # type
% 2, 8, 9 # length
[ "t1", "id_index", "DEP_INDEX" ]
#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from tables as t,
triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name,
tri.name as trigname, 'DEP_TRIGGER' from triggers tri, tables t, dependencies
dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8)
order by name, trigname;
-% .%25, .%25, .%25 # table_name
-% name, trigname, %20 # name
+% .%21, .%21, .%21 # table_name
+% name, trigname, %14 # name
% varchar, varchar, char # type
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
