Changeset: 26f32a7b4321 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26f32a7b4321
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
more clean-up after changeset 2663022e4670: approve new test output
diffs (91 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2019,7 +2019,7 @@ str PropertyOperatorString(prop_op_t op)
str QLOGcall(int *ret, oid *idx, lng *tick1, lng *tick2, str *arg, wrd
*tuples, lng *xtime, lng *rtime, int *cpu, int *iowait, lng *space);
void QLOGcalls(BAT **r);
void QLOGcatalog(BAT **r);
-str QLOGdefine(oid *ret, oid *idx, str *q, str *pipe, lng *optimize, str *usr,
lng *tick);
+str QLOGdefine(oid *ret, oid *idx, str *q, str *pipe, lng *optimize, str *usr,
lng *tick, int *mal);
str QLOGdone(int *ret);
str QLOGinit(int *ret);
str QLOGinitThreshold(int *ret, int *threshold);
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -54,11 +54,11 @@ Ready.
[ 5104, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
[ 5107, "auths", 2000, NULL, 0, true, 0, false,
0 ]
[ 5111, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5296, "history", 5255, "create view querylog.history
as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run,
ql.ship, ql.cpu, ql.space, ql.io \nfrom querylog.catalog() qd, querylog.calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, false, 0,
false, 0 ]
-[ 6026, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6067, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
-[ 6089, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6198, "r", 2000, NULL, 0, false, 0, false, 0
]
+[ 5298, "history", 5255, "create view querylog.history
as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run,
ql.ship, ql.cpu, ql.space, ql.io \nfrom querylog.catalog() qd, querylog.calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, false, 0,
false, 0 ]
+[ 6028, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6069, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
+[ 6091, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6200, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -85,7 +85,7 @@ QUERY = select * from env() as env where
ERROR = !cardinality violation (21>1)
MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (326>1)
+ERROR = !cardinality violation (328>1)
# 21:00:43 >
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
---
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
+++
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
@@ -85,7 +85,7 @@ QUERY = select * from env() as env where
ERROR = !cardinality violation (20>1)
MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (326>1)
+ERROR = !cardinality violation (328>1)
# 21:00:43 >
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -51,7 +51,7 @@ Ready.
% varchar, varchar, int, varchar, varchar # type
% 8, 35, 1, 15, 1582 # length
[ "querylog", "calls", 0, "table", "-- Each query call is
stored in the table calls\n-- At regular intervals the query history table
should be cleaned.\n-- This can be done manually on the SQL console, or be
integrated\n-- in the keepQuery and keepCall upon need.\n-- The parameters are
geared at understanding the resource claims\n-- They reflect the effect of the
total workload mix during execution.\n-- The 'cpu' gives the average cpu load
percentage over all cores on the \n-- server during execution phase. \n--
increasing cpu load indicates better use of multi-cores.\n-- The 'io' indicate
IOs during complete query run.\n-- The 'space' is the total amount of
intermediates created in MB.\n-- Reducing the space component improves
performance/\n-- All timing in usec and all storage in bytes.\n\ncreate
function querylog.calls()\nreturns table(\n\tid oid,\t\t\t\t -- references
query plan\n\t\"start\" timestamp,\t-- time the statement was
started\n\t\"stop\" timestamp,\t-- time th
e statement was completely finished\n\targuments string,\t-- actual call
structure\n\ttuples wrd,\t\t\t-- number of tuples in the result set\n\trun
bigint,\t\t-- time spent (in usec) until the result export\n\tship
bigint,\t\t-- time spent (in usec) to ship the result set\n\tcpu int, \t\t--
average cpu load percentage during execution\n\tio int,\t\t\t-- percentage time
waiting for IO to finish \n\tspace bigint\t\t-- total storage size of
intermediates created (in MB)\n)\nexternal name sql.querylog_calls;" ]
-[ "querylog", "catalog", 0, "table", "create function
querylog.catalog()\nreturns table(\n\tid oid,\n\towner string,\n\tdefined
timestamp,\n\tquery string,\n\tpipe string,\n\toptimize bigint \t-- time in
usec\n)\nexternal name sql.querylog_catalog;" ]
+[ "querylog", "catalog", 0, "table", "create function
querylog.catalog()\nreturns table(\n\tid oid,\n\towner string,\n\tdefined
timestamp,\n\tquery string,\n\tpipe string,\n\tmal int,\t\t\t-- size of MAL
plan\n\toptimize bigint \t-- time in usec\n)\nexternal name
sql.querylog_catalog;" ]
[ "querylog", "init", 0, "smallint", "create procedure
querylog.init(threshold smallint)\nexternal name sql.querylog_init_threshold;"
]
[ "sys", "Intersect", 0, "boolean", "create function
\"Intersect\"(a geometry, b geometry) returns boolean external name
geom.\"Intersect\";" ]
[ "sys", "Intersect", 1, "geometry", "" ]
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -86,12 +86,12 @@ 5100 users 2000 SELECT u."name" AS "name
5104 user_role 2000 0 true 0 false 0
5107 auths 2000 0 true 0 false 0
5111 privileges 2000 0 true 0 false 0
-5296 history 5255 create view querylog.history asnselect qd.*,
ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu,
ql.space, ql.io nfrom querylog.catalog() qd, querylog.calls() qlnwhere qd.id =
ql.id and qd.owner = user; 1 false 0 false 0
-6026 storagemodelinput 2000 0 true 0 false
0
-6067 tablestoragemodel 2000 -- A summary of the table storage
requirement is is available as a table view.n-- The auxillary column denotes
the maximum space if all non-sorted columnsn-- would be augmented with a hash
(rare situation)ncreate view sys.tablestoragemodelnas select
"schema","table",max(count) as "count",ntsum(columnsize) as
columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case
when sorted = false then 8 * count else 0 end) as auxillarynfrom
sys.storagemodel() group by "schema","table"; 1 true 0
false 0
-6089 systemfunctions 2000 0 true 0 false 0
+5298 history 5255 create view querylog.history asnselect qd.*,
ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu,
ql.space, ql.io nfrom querylog.catalog() qd, querylog.calls() qlnwhere qd.id =
ql.id and qd.owner = user; 1 false 0 false 0
+6028 storagemodelinput 2000 0 true 0 false
0
+6069 tablestoragemodel 2000 -- A summary of the table storage
requirement is is available as a table view.n-- The auxillary column denotes
the maximum space if all non-sorted columnsn-- would be augmented with a hash
(rare situation)ncreate view sys.tablestoragemodelnas select
"schema","table",max(count) as "count",ntsum(columnsize) as
columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case
when sorted = false then 8 * count else 0 end) as auxillarynfrom
sys.storagemodel() group by "schema","table"; 1 true 0
false 0
+6091 systemfunctions 2000 0 true 0 false 0
-# 18:07:34 >
-# 18:07:34 > "Done."
-# 18:07:34 >
+# 01:21:10 >
+# 01:21:10 > "Done."
+# 01:21:10 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
