Changeset: 881a7cff5500 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=881a7cff5500 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/trace_nogeom.stable.out Branch: default Log Message:
re-aligned _nogeom output with standard output diffs (176 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err @@ -32,8 +32,7 @@ stderr of test 'predicate_select.Bug-309 MAPI = (monetdb) /var/tmp/mtest-5096/.s.monetdb.39165 QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; - - +ERROR = !conversion of string 'systemfunctions' to type bit failed. # 18:53:13 > # 18:53:13 > "Done." diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err @@ -30,8 +30,8 @@ stderr of test 'predicate_select.Bug-309 # 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" # 18:53:13 > -MAPI = (monetdb) /var/tmp/mtest-30433/.s.monetdb.30902 -QUERY = select * from tables where name; +MAPI = (monetdb) /var/tmp/mtest-5096/.s.monetdb.39165 +QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; ERROR = !conversion of string 'systemfunctions' to type bit failed. # 18:53:13 > 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 @@ -23,50 +23,49 @@ Ready. # 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" # 18:53:13 > -#select * from tables where 1; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, readonly, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type -% 4, 17, 4, 496, 1, 5, 1, 5, 1 # length -[ 2001, "schemas", 2000, NULL, 0, true, 0, false, 0 ] -[ 2006, "types", 2000, NULL, 0, true, 0, false, 0 ] -[ 2015, "functions", 2000, NULL, 0, true, 0, false, 0 ] -[ 2024, "args", 2000, NULL, 0, true, 0, false, 0 ] -[ 2032, "sequences", 2000, NULL, 0, true, 0, false, 0 ] -[ 2042, "dependencies", 2000, NULL, 0, true, 0, false, 0 ] -[ 2046, "connections", 2000, NULL, 0, true, 0, false, 0 ] -[ 2055, "_tables", 2000, NULL, 0, true, 0, false, 0 ] -[ 2064, "_columns", 2000, NULL, 0, true, 0, false, 0 ] -[ 2075, "keys", 2000, NULL, 0, true, 0, false, 0 ] -[ 2082, "idxs", 2000, NULL, 0, true, 0, false, 0 ] -[ 2087, "triggers", 2000, NULL, 0, true, 0, false, 0 ] -[ 2098, "objects", 2000, NULL, 0, true, 0, false, 0 ] -[ 2103, "_tables", 2102, NULL, 0, true, 2, false, 0 ] -[ 2112, "_columns", 2102, NULL, 0, true, 2, false, 0 ] -[ 2123, "keys", 2102, NULL, 0, true, 2, false, 0 ] -[ 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 ] -[ 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 ] -[ 5288, "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] -[ 5300, "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] -[ 5318, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] -[ 5357, "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] -[ 5595, "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] -[ 5605, "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] -[ 5647, "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] -[ 5928, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] -[ 5940, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 5983, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] -[ 5992, "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 ] -[ 6014, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 6123, "r", 2000, NULL, 0, false, 0, false, 0 ] +#select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where 1; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, readonly, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type +% 17, 4, 496, 1, 5, 1, 5, 1 # length +[ "schemas", 2000, NULL, 0, true, 0, false, 0 ] +[ "types", 2000, NULL, 0, true, 0, false, 0 ] +[ "functions", 2000, NULL, 0, true, 0, false, 0 ] +[ "args", 2000, NULL, 0, true, 0, false, 0 ] +[ "sequences", 2000, NULL, 0, true, 0, false, 0 ] +[ "dependencies", 2000, NULL, 0, true, 0, false, 0 ] +[ "connections", 2000, NULL, 0, true, 0, false, 0 ] +[ "_tables", 2000, NULL, 0, true, 0, false, 0 ] +[ "_columns", 2000, NULL, 0, true, 0, false, 0 ] +[ "keys", 2000, NULL, 0, true, 0, false, 0 ] +[ "idxs", 2000, NULL, 0, true, 0, false, 0 ] +[ "triggers", 2000, NULL, 0, true, 0, false, 0 ] +[ "objects", 2000, NULL, 0, true, 0, false, 0 ] +[ "_tables", 2102, NULL, 0, true, 2, false, 0 ] +[ "_columns", 2102, NULL, 0, true, 2, false, 0 ] +[ "keys", 2102, NULL, 0, true, 2, false, 0 ] +[ "idxs", 2102, NULL, 0, true, 2, false, 0 ] +[ "triggers", 2102, NULL, 0, true, 2, false, 0 ] +[ "objects", 2102, NULL, 0, true, 2, false, 0 ] +[ "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 ] +[ "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 ] +[ "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ "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 ] +[ "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] +[ "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] +[ "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] +[ "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] +[ "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] +[ "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] +[ "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] +[ "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ "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 ] +[ "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." diff --git a/sql/test/Tests/systemfunctions_nogeom.stable.out b/sql/test/Tests/systemfunctions_nogeom.stable.out --- a/sql/test/Tests/systemfunctions_nogeom.stable.out +++ b/sql/test/Tests/systemfunctions_nogeom.stable.out @@ -174,6 +174,28 @@ Ready. [ "sys", "indexsize", 2, "bigint", "" ] [ "sys", "isaurl", 0, "boolean", "create function isaurl(theurl url) returns bool\n\texternal name url.\"isaURL\";" ] [ "sys", "isaurl", 1, "url", "" ] +[ "sys", "isauuid", 0, "uuid", "create function sys.isauuid(u uuid)\nreturns uuid external name uuid.\"isaUUID\";" ] +[ "sys", "isauuid", 1, "uuid", "" ] +[ "sys", "json_filter", 0, "json", "-- access the top level key by name, return its value\ncreate function sys.json_filter(js json, name string)\nreturns json external name json.filter;" ] +[ "sys", "json_filter", 1, "json", "" ] +[ "sys", "json_filter", 2, "clob", "" ] +[ "sys", "json_filter_all", 0, "json", "create function sys.json_filter_all(js json, name string)\nreturns json external name json.filterall;" ] +[ "sys", "json_filter_all", 1, "json", "" ] +[ "sys", "json_filter_all", 2, "clob", "" ] +[ "sys", "json_isvalid", 0, "boolean", "-- test string for JSON compliancy\ncreate function sys.json_isvalid(js string)\nreturns bool external name json.isvalid;" ] +[ "sys", "json_isvalid", 1, "clob", "" ] +[ "sys", "json_isvalidarray", 0, "boolean", "create function sys.json_isvalidarray(js string)\nreturns bool external name json.isvalidarray;" ] +[ "sys", "json_isvalidarray", 1, "clob", "" ] +[ "sys", "json_isvalidobject", 0, "boolean", "create function sys.json_isvalidobject(js string)\nreturns bool external name json.isvalidobject;" ] +[ "sys", "json_isvalidobject", 1, "clob", "" ] +[ "sys", "json_length", 0, "int", "-- return the number of primary components\ncreate function sys.json_length(js json)\nreturns integer external name json.length;" ] +[ "sys", "json_length", 1, "json", "" ] +[ "sys", "json_path", 0, "json", "-- a simple path extractor\ncreate function sys.json_path(js json, e string)\nreturns json external name json.path;" ] +[ "sys", "json_path", 1, "json", "" ] +[ "sys", "json_path", 2, "clob", "" ] +[ "sys", "json_text", 0, "clob", "-- a simple path extractor as plain text\ncreate function sys.json_text(js json, e string)\nreturns string external name json.text;" ] +[ "sys", "json_text", 1, "json", "" ] +[ "sys", "json_text", 2, "clob", "" ] [ "sys", "like", 0, "clob", "create filter function \"like\"(val string, pat string, esc string) external name algebra.likesubselect;" ] [ "sys", "like", 1, "clob", "" ] [ "sys", "like", 2, "clob", "" ] @@ -305,6 +327,7 @@ Ready. [ "sys", "text", 0, "clob", "create function \"text\" (p inet) returns clob\n\texternal name inet.\"text\";" ] [ "sys", "text", 1, "inet", "" ] [ "sys", "tracelog", 0, "table", "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Copyright August 2008-2013 MonetDB B.V.\n-- All Rights Reserved.\n\n-- make the offline tracing table available for inspection\ncreate function sys.tracelog() \n\treturns table (\n\t\tevent integer,\t\t-- event counter\n\t\tclk varchar(20), \t-- wallclock, no mtime in kernel\n\t\tpc varchar(50), \t-- module.function[nr]\n\t\tthre ad int, \t\t-- thread identifier\n\t\t\"user\" int, \t\t-- user identifier\n\t\tticks bigint, \t\t-- time in microseconds\n\t\treads bigint, \t\t-- number of blocks read\n\t\twrites bigint, \t-- number of blocks written\n\t\trbytes bigint,\t\t-- amount of bytes touched\n\t\twbytes bigint,\t\t-- amount of bytes written\n\t\ttype string,\t\t-- return types\n\t\tstmt string\t\t\t-- actual statement executed\n\t)\n\texternal name sql.dump_trace;" ] +[ "sys", "uuid", 0, "uuid", "-- generate a new uuid\ncreate function sys.uuid()\nreturns uuid external name uuid.\"new\";" ] [ "sys", "vacuum", 0, "clob", "create procedure vacuum(sys string, tab string)\n\texternal name sql.vacuum;" ] [ "sys", "vacuum", 1, "clob", "" ] [ "sys", "var", 0, "table", "CREATE FUNCTION var() RETURNS TABLE( name varchar(1024)) EXTERNAL NAME sql.sql_variables;" ] diff --git a/sql/test/Tests/trace_nogeom.stable.out b/sql/test/Tests/trace_nogeom.stable.out --- a/sql/test/Tests/trace_nogeom.stable.out +++ b/sql/test/Tests/trace_nogeom.stable.out @@ -36,7 +36,7 @@ Ready. % L1 # name % wrd # type % 2 # length -[ 29 ] +[ 31 ] #SELECT COUNT(*) FROM tracelog(); % .L1 # table_name % L1 # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
