Changeset: acc92e827b2a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acc92e827b2a Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message:
approved nogeom output diffs (truncated from 391 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out @@ -47,20 +47,20 @@ Ready. [ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] [ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] [ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] -[ 5060, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;", 1, true, 0, false, 0 ] -[ 5070, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] -[ 5090, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] -[ 5098, "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] -[ 5102, "user_role", 2000, NULL, 0, true, 0, false, 0 ] -[ 5105, "auths", 2000, NULL, 0, true, 0, false, 0 ] -[ 5109, "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ 5262, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5276, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5293, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] -[ 5834, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 5875, "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 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 storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] -[ 5897, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 6006, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5062, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;", 1, true, 0, false, 0 ] +[ 5072, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ 5092, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ 5100, "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] +[ 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 ] +[ 5264, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5278, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5295, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] +[ 5836, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 5877, "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 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 storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] +[ 5899, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 6008, "r", 2000, NULL, 0, false, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out b/sql/test/leaks/Tests/check0_nogeom.stable.out --- a/sql/test/leaks/Tests/check0_nogeom.stable.out +++ b/sql/test/leaks/Tests/check0_nogeom.stable.out @@ -54,20 +54,20 @@ Ready. [ "oid", "int", 8 ] [ "oid", "int", 8 ] [ "oid", "int", 155 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] [ "oid", "lng", 1 ] [ "oid", "lng", 2 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 155 ] -[ "oid", "str", 3207 ] -[ "oid", "str", 3207 ] +[ "oid", "str", 3209 ] +[ "oid", "str", 3209 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .bbp # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 326 ] -[ "oid", "bit", 1166 ] -[ "oid", "bit", 1166 ] +[ "oid", "bit", 1167 ] +[ "oid", "bit", 1167 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 326 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 326 ] [ "oid", "str", 326 ] [ "oid", "str", 326 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 3207 ] -[ "oid", "str", 3207 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 3209 ] +[ "oid", "str", 3209 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check2_nogeom.stable.out b/sql/test/leaks/Tests/check2_nogeom.stable.out --- a/sql/test/leaks/Tests/check2_nogeom.stable.out +++ b/sql/test/leaks/Tests/check2_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 326 ] -[ "oid", "bit", 1166 ] -[ "oid", "bit", 1166 ] +[ "oid", "bit", 1167 ] +[ "oid", "bit", 1167 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 326 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 326 ] [ "oid", "str", 326 ] [ "oid", "str", 326 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 3207 ] -[ "oid", "str", 3207 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 3209 ] +[ "oid", "str", 3209 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check3_nogeom.stable.out b/sql/test/leaks/Tests/check3_nogeom.stable.out --- a/sql/test/leaks/Tests/check3_nogeom.stable.out +++ b/sql/test/leaks/Tests/check3_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 62 ] [ "oid", "bit", 62 ] [ "oid", "bit", 328 ] -[ "oid", "bit", 1166 ] -[ "oid", "bit", 1166 ] +[ "oid", "bit", 1167 ] +[ "oid", "bit", 1167 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 328 ] [ "oid", "int", 328 ] [ "oid", "int", 328 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 328 ] [ "oid", "str", 328 ] [ "oid", "str", 328 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 3207 ] -[ "oid", "str", 3207 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 3209 ] +[ "oid", "str", 3209 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check4_nogeom.stable.out b/sql/test/leaks/Tests/check4_nogeom.stable.out --- a/sql/test/leaks/Tests/check4_nogeom.stable.out +++ b/sql/test/leaks/Tests/check4_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 63 ] [ "oid", "bit", 63 ] [ "oid", "bit", 330 ] -[ "oid", "bit", 1166 ] -[ "oid", "bit", 1166 ] +[ "oid", "bit", 1167 ] +[ "oid", "bit", 1167 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 330 ] [ "oid", "int", 330 ] [ "oid", "int", 330 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 1166 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] -[ "oid", "int", 3207 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 1167 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] +[ "oid", "int", 3209 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 330 ] [ "oid", "str", 330 ] [ "oid", "str", 330 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 1166 ] -[ "oid", "str", 3207 ] -[ "oid", "str", 3207 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 1167 ] +[ "oid", "str", 3209 ] +[ "oid", "str", 3209 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check5_nogeom.stable.out b/sql/test/leaks/Tests/check5_nogeom.stable.out --- a/sql/test/leaks/Tests/check5_nogeom.stable.out +++ b/sql/test/leaks/Tests/check5_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 63 ] [ "oid", "bit", 63 ] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
