Changeset: 984ccafb386d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=984ccafb386d
Modified Files:
sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out
sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
sql/src/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/src/test/BugTracker-2009/Tests/reorder.SF-2770608.stable.out
sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
sql/src/test/BugTracker/Tests/bat_descriptor_problem.SF-1997643.sql
sql/src/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/src/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/src/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/src/test/BugTracker/Tests/union_order.stable.err
sql/src/test/BugTracker/Tests/union_order.stable.out
sql/src/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/src/test/DropCascade/Tests/drop_columns_cascade.stable.out
sql/src/test/DropCascade/Tests/drop_pkey_cascade.stable.out
sql/src/test/Dump/Tests/dump.stable.out
sql/src/test/Tests/All
sql/src/test/Tests/keys.stable.out
sql/src/test/Tests/math.sql.src
sql/src/test/Tests/math.stable.err
sql/src/test/Tests/math.stable.out
sql/src/test/Tests/trace.stable.out
sql/src/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/src/test/bugs/Tests/simple_view.stable.out
sql/src/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
sql/src/test/copy/Tests/overflow_error.stable.err
sql/src/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
approved output after database gets loaded with extra set of functions/tables
etc.
diffs (truncated from 1453 to 300 lines):
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out
--- a/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out
Sun May 16 10:08:15 2010 +0200
+++ b/sql/src/test/BugConstraints/Tests/add_constraint_1643522.stable.out
Sun May 16 11:47:07 2010 +0200
@@ -22,14 +22,18 @@
% sys.keys # table_name
% name # name
% varchar # type
-% 4 # length
+% 20 # length
+[ "queryhistory_id_pkey" ]
+[ "callhistory_id_fkey" ]
[ "id_p" ]
% sys.keys # table_name
% name # name
% varchar # type
-% 0 # length
+% 20 # length
+[ "queryhistory_id_pkey" ]
+[ "callhistory_id_fkey" ]
-# 16:28:34 >
-# 16:28:34 > Done.
-# 16:28:34 >
+# 11:09:09 >
+# 11:09:09 > Done.
+# 11:09:09 >
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
---
a/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
Sun May 16 10:08:15 2010 +0200
+++
b/sql/src/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
Sun May 16 11:47:07 2010 +0200
@@ -29,12 +29,14 @@
% sys.keys, sys.keys, sys.keys, sys.keys, sys.keys,
sys.keys, sys.keycolumns, sys.keycolumns, sys.keycolumns, sys.keycolumns,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, sys.schemas,
sys.schemas, sys.schemas, sys.schemas # table_name
% id, table_id, type, name, rkey, action, id, column, trunc,
nr, id, name, schema_id, query, type, system, commit_action,
readonly, temporary, id, name, authorization, owner # name
% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, tinyint, int,
varchar, int, int # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 5, 1, 1,
0, 1, 1 # length
+% 4, 4, 1, 20, 2, 2, 4, 2, 1, 1,
4, 12, 4, 0, 1, 5, 1, 5, 1, 4,
3, 1, 1 # length
+[ 5222, 5229, 0, "queryhistory_id_pkey", -1, -1, 5222,
"id", 0, 0, 5229, "queryhistory", 2000, NULL, 0, false,
0, false, 0, 2000, "sys", 2, 3 ]
#SELECT *
% sys.keys, sys.keys, sys.keys, sys.keys, sys.keys,
sys.keys, sys.keycolumns, sys.keycolumns, sys.keycolumns, sys.keycolumns,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, sys.schemas,
sys.schemas, sys.schemas, sys.schemas # table_name
% id, table_id, type, name, rkey, action, id, column, trunc,
nr, id, name, schema_id, query, type, system, commit_action,
readonly, temporary, id, name, authorization, owner # name
% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, tinyint, int,
varchar, int, int # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 5, 1, 1,
0, 1, 1 # length
+% 4, 4, 1, 20, 2, 2, 4, 2, 1, 1,
4, 12, 4, 0, 1, 5, 1, 5, 1, 4,
3, 1, 1 # length
+[ 5222, 5229, 0, "queryhistory_id_pkey", -1, -1, 5222,
"id", 0, 0, 5229, "queryhistory", 2000, NULL, 0, false,
0, false, 0, 2000, "sys", 2, 3 ]
# 19:37:26 >
# 19:37:26 > Done.
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
---
a/sql/src/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
Sun May 16 10:08:15 2010 +0200
+++
b/sql/src/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
Sun May 16 11:47:07 2010 +0200
@@ -84,7 +84,7 @@
MAPI = mone...@eir:36862
QUERY = insert into t1 values ((select id, name from tables));
-ERROR = !SQLException:zero_or_one:cardinality violation (27>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (31>1)
# 16:15:09 >
# 16:15:09 > Done.
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Sun May 16 10:08:15 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Sun May 16 11:47:07 2010 +0200
@@ -21,30 +21,12 @@
Over..
-# 22:33:48 >
-# 22:33:48 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
-# 22:33:48 >
+# 11:17:13 >
+# 11:17:13 > mclient -lsql -ftest -i -e --host=alf --port=39432
+# 11:17:13 >
-TABLE sys._columns
-TABLE sys._tables
-TABLE sys.args
-TABLE sys.auths
-VIEW sys.columns
-TABLE sys.connections
-TABLE sys.db_user_info
-TABLE sys.dependencies
-TABLE sys.functions
-TABLE sys.idxs
-TABLE sys.keycolumns
-TABLE sys.keys
-TABLE sys.privileges
-TABLE sys.schemas
-TABLE sys.sequences
-VIEW sys.tables
-TABLE sys.triggers
-TABLE sys.types
-TABLE sys.user_role
-VIEW sys.users
+TABLE sys.queryhistory
+TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Sun May 16 10:08:15 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Sun May 16 11:47:07 2010 +0200
@@ -21,30 +21,17 @@
Over..
-# 10:46:58 >
-# 10:46:58 > mclient -lsql -umonetdb -Pmonetdb --host=pegasus --port=36889
-# 10:46:58 >
+# 11:17:12 >
+# 11:17:12 > ./dumping_tables.SF-2776908.SQL.sh dumping_tables.SF-2776908
+# 11:17:12 >
-TABLE sys._columns
-TABLE sys._tables
-TABLE sys.args
-TABLE sys.auths
-VIEW sys.columns
-TABLE sys.connections
-TABLE sys.db_user_info
-TABLE sys.dependencies
-TABLE sys.functions
-TABLE sys.idxs
-TABLE sys.keycolumns
-TABLE sys.keys
-TABLE sys.privileges
-TABLE sys.schemas
-TABLE sys.sequences
-VIEW sys.tables
-TABLE sys.triggers
-TABLE sys.types
-TABLE sys.user_role
-VIEW sys.users
+
+# 11:17:12 >
+# 11:17:12 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=39432 -i <
/net/alf.ins.cwi.nl/export/scratch1/niels/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
+# 11:17:12 >
+
+TABLE sys.queryhistory
+TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
Sun May 16 10:08:15 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
Sun May 16 11:47:07 2010 +0200
@@ -28,91 +28,64 @@
#~BeginVariableOutput~#
function user.s1_1{autoCommit=true}():void;
_2 := sql.mvc();
-" sql.catalog(28\,\"sys\"\,140689640460344\,0);"
-barrier _47 := language.dataflow();
+" sql.catalog(28\,\"sys\"\,139907956489512\,0);"
+barrier _37 := language.dataflow();
" _7:bat[:oid\,:int] := sql.bind(_2\,\"sys\"\,\"blabla\"\,\"id\"\,0);"
_10 := algebra.selectNotNil(_7);
-" _7:bat[:oid\,:int] := nil:BAT;"
" _11:bat[:oid\,:oid] := sql.bind_dbat(_2\,\"sys\"\,\"blabla\"\,1);"
_13 := bat.reverse(_11);
-" _11:bat[:oid\,:oid] := nil:BAT;"
" _14 := algebra.kdifference(_10\,_13);"
- _10 := nil:BAT;
- _13 := nil:BAT;
" (ext21\,grp19) := group.done(_14);"
- _14 := nil:BAT;
_17 := bat.mirror(ext21);
- ext21 := nil:BAT;
" _18:bat[:oid\,:wrd] := aggr.count(grp19\,grp19\,_17);"
- grp19 := nil:BAT;
- _17 := nil:BAT;
_19 := aggr.count(_18);
_20:wrd := aggr.sum(_18);
-" _18:bat[:oid\,:wrd] := nil:BAT;"
_21 := calc.isnil(_20);
" _23 := calc.ifthenelse(_21\,0:wrd\,_20);"
" _24 := calc.!=(_19\,_23);"
-exit _47;
+exit _37;
" sql.assert(_24\,\"UPDATE: UNIQUE constraint 'blabla.dada' violated\");"
end s1_1;
function user.s2_1{autoCommit=true}():void;
_2 := sql.mvc();
-" sql.catalog(28\,\"sys\"\,140689640733800\,0);"
-barrier _47 := language.dataflow();
+" sql.catalog(28\,\"sys\"\,139907956762856\,0);"
+barrier _37 := language.dataflow();
" _7:bat[:oid\,:int] := sql.bind(_2\,\"sys\"\,\"blabla\"\,\"id\"\,0);"
_10 := algebra.selectNotNil(_7);
-" _7:bat[:oid\,:int] := nil:BAT;"
" _11:bat[:oid\,:oid] := sql.bind_dbat(_2\,\"sys\"\,\"blabla\"\,1);"
_13 := bat.reverse(_11);
-" _11:bat[:oid\,:oid] := nil:BAT;"
" _14 := algebra.kdifference(_10\,_13);"
- _10 := nil:BAT;
- _13 := nil:BAT;
" (ext21\,grp19) := group.done(_14);"
- _14 := nil:BAT;
_17 := bat.mirror(ext21);
- ext21 := nil:BAT;
" _18:bat[:oid\,:wrd] := aggr.count(grp19\,grp19\,_17);"
- grp19 := nil:BAT;
- _17 := nil:BAT;
_19 := aggr.count(_18);
_20:wrd := aggr.sum(_18);
-" _18:bat[:oid\,:wrd] := nil:BAT;"
_21 := calc.isnil(_20);
" _23 := calc.ifthenelse(_21\,0:wrd\,_20);"
" _24 := calc.!=(_19\,_23);"
-exit _47;
+exit _37;
" sql.assert(_24\,\"UPDATE: UNIQUE constraint 'blabla.dada' violated\");"
end s2_1;
#~EndVariableOutput~#
#~BeginVariableOutput~#
function user.s1_1{autoCommit=true}():void;
_2 := sql.mvc();
-" sql.catalog(28\,\"sys\"\,140689640460344\,0);"
-barrier _47 := language.dataflow();
+" sql.catalog(28\,\"sys\"\,139907956489512\,0);"
+barrier _37 := language.dataflow();
" _7:bat[:oid\,:int] := sql.bind(_2\,\"sys\"\,\"blabla\"\,\"id\"\,0);"
_10 := algebra.selectNotNil(_7);
-" _7:bat[:oid\,:int] := nil:BAT;"
" _11:bat[:oid\,:oid] := sql.bind_dbat(_2\,\"sys\"\,\"blabla\"\,1);"
_13 := bat.reverse(_11);
-" _11:bat[:oid\,:oid] := nil:BAT;"
" _14 := algebra.kdifference(_10\,_13);"
- _10 := nil:BAT;
- _13 := nil:BAT;
" (ext21\,grp19) := group.done(_14);"
- _14 := nil:BAT;
_17 := bat.mirror(ext21);
- ext21 := nil:BAT;
" _18:bat[:oid\,:wrd] := aggr.count(grp19\,grp19\,_17);"
- grp19 := nil:BAT;
- _17 := nil:BAT;
_19 := aggr.count(_18);
_20:wrd := aggr.sum(_18);
-" _18:bat[:oid\,:wrd] := nil:BAT;"
_21 := calc.isnil(_20);
" _23 := calc.ifthenelse(_21\,0:wrd\,_20);"
" _24 := calc.!=(_19\,_23);"
-exit _47;
+exit _37;
" sql.assert(_24\,\"UPDATE: UNIQUE constraint 'blabla.dada' violated\");"
end s1_1;
#~EndVariableOutput~#
diff -r 84422ee91c69 -r 984ccafb386d
sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out Sun May
16 10:08:15 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out Sun May
16 11:47:07 2010 +0200
@@ -32,6 +32,190 @@
START TRANSACTION;
SET SCHEMA "sys";
+create function degrees(r double)
+returns double
+ return r*180/pi();
+create function radians(d double)
+returns double
+ return d*pi()/180;
+CREATE TABLE "sys"."url_test" (
+ "theurl" url,
+ "name" CHARACTER LARGE OBJECT
+);
+CREATE TABLE "sys"."queryhistory" (
+ "id" bigint NOT NULL,
+ "defined" TIMESTAMP,
+ "name" CHARACTER LARGE OBJECT,
+ "query" CHARACTER LARGE OBJECT,
+ "parse" bigint,
+ "optimize" bigint,
+ CONSTRAINT "queryhistory_id_pkey" PRIMARY KEY ("id")
+);
+CREATE TABLE "sys"."callhistory" (
+ "id" bigint,
+ "ctime" TIMESTAMP,
+ "arguments" CHARACTER LARGE OBJECT,
+ "xtime" bigint,
+ "rtime" bigint,
+ "foot" bigint,
+ "memory" bigint,
+ "tuples" bigint,
+ "inblock" bigint,
+ "oublock" bigint
+);
+create view querylog as
+select qd.*, ql.ctime, ql.arguments, ql.xtime, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql
+where qd.id = ql.id;
+-- the signature is used in the kernel, don't change it
+create procedure keepquery(
+ i wrd,
+ query string,
+ parse bigint,
+ optimize bigint)
+begin
+ insert into queryhistory
+ values(i, now(), user, query, parse, optimize);
+end;
+-- the signature is used in the kernel, don't change it
+create procedure keepcall(
+ id wrd, -- references query plan
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
