Changeset: 6e52ae798112 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e52ae798112 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out Branch: default Log Message:
Merge with Feb2013 branch. diffs (158 lines): 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 @@ -61,12 +61,11 @@ Ready. [ 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 ] -[ 6103, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] -[ 6115, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 6158, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] -[ 6167, "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 ] -[ 6189, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 6298, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 6128, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ 6140, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 6183, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ 6192, "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 ] +[ 6214, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." 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 @@ -61,12 +61,11 @@ Ready. [ 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 ] -[ 5903, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] -[ 5915, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 5958, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] -[ 5967, "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 ] -[ 5989, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 6098, "r", 2000, NULL, 0, false, 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 ] # 18:53:13 > # 18:53:13 > "Done." 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 @@ -95,6 +95,9 @@ Ready. [ "sys", "corr", 0, "int", "create aggregate corr(e1 integer, e2 integer) returns integer\n\texternal name \"aggr\".\"corr\";" ] [ "sys", "corr", 1, "int", "" ] [ "sys", "corr", 2, "int", "" ] +[ "sys", "corr", 0, "wrd", "create aggregate corr(e1 wrd, e2 wrd) returns wrd\n\texternal name \"aggr\".\"corr\";" ] +[ "sys", "corr", 1, "wrd", "" ] +[ "sys", "corr", 2, "wrd", "" ] [ "sys", "corr", 0, "bigint", "create aggregate corr(e1 bigint, e2 bigint) returns bigint\n\texternal name \"aggr\".\"corr\";" ] [ "sys", "corr", 1, "bigint", "" ] [ "sys", "corr", 2, "bigint", "" ] @@ -247,6 +250,8 @@ Ready. [ "sys", "median", 1, "smallint", "" ] [ "sys", "median", 0, "int", "create aggregate median(val integer) returns integer\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "int", "" ] +[ "sys", "median", 0, "wrd", "create aggregate median(val wrd) returns wrd\n\texternal name \"aggr\".\"median\";" ] +[ "sys", "median", 1, "wrd", "" ] [ "sys", "median", 0, "bigint", "create aggregate median(val bigint) returns bigint\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "bigint", "" ] [ "sys", "median", 0, "real", "create aggregate median(val real) returns real\n\texternal name \"aggr\".\"median\";" ] @@ -351,6 +356,8 @@ Ready. [ "sys", "stddev_pop", 1, "smallint", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val integer) returns double\n\texternal name \"aggr\".\"stdevp\";" ] [ "sys", "stddev_pop", 1, "int", "" ] +[ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val wrd) returns double\n\texternal name \"aggr\".\"stdevp\";" ] +[ "sys", "stddev_pop", 1, "wrd", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val bigint) returns double\n\texternal name \"aggr\".\"stdevp\";" ] [ "sys", "stddev_pop", 1, "bigint", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val real) returns double\n\texternal name \"aggr\".\"stdevp\";" ] @@ -369,6 +376,8 @@ Ready. [ "sys", "stddev_samp", 1, "smallint", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val integer) returns double\n\texternal name \"aggr\".\"stdev\";" ] [ "sys", "stddev_samp", 1, "int", "" ] +[ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val wrd) returns double\n\texternal name \"aggr\".\"stdev\";" ] +[ "sys", "stddev_samp", 1, "wrd", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val bigint) returns double\n\texternal name \"aggr\".\"stdev\";" ] [ "sys", "stddev_samp", 1, "bigint", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val real) returns double\n\texternal name \"aggr\".\"stdev\";" ] @@ -406,6 +415,8 @@ Ready. [ "sys", "var_pop", 1, "smallint", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val integer) returns double\n\texternal name \"aggr\".\"variancep\";" ] [ "sys", "var_pop", 1, "int", "" ] +[ "sys", "var_pop", 0, "double", "create aggregate var_pop(val wrd) returns double\n\texternal name \"aggr\".\"variancep\";" ] +[ "sys", "var_pop", 1, "wrd", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val bigint) returns double\n\texternal name \"aggr\".\"variancep\";" ] [ "sys", "var_pop", 1, "bigint", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val real) returns double\n\texternal name \"aggr\".\"variancep\";" ] @@ -424,6 +435,8 @@ Ready. [ "sys", "var_samp", 1, "smallint", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val integer) returns double\n\texternal name \"aggr\".\"variance\";" ] [ "sys", "var_samp", 1, "int", "" ] +[ "sys", "var_samp", 0, "double", "create aggregate var_samp(val wrd) returns double\n\texternal name \"aggr\".\"variance\";" ] +[ "sys", "var_samp", 1, "wrd", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val bigint) returns double\n\texternal name \"aggr\".\"variance\";" ] [ "sys", "var_samp", 1, "bigint", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val real) returns double\n\texternal name \"aggr\".\"variance\";" ] 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 @@ -74,6 +74,9 @@ Ready. [ "sys", "corr", 0, "int", "create aggregate corr(e1 integer, e2 integer) returns integer\n\texternal name \"aggr\".\"corr\";" ] [ "sys", "corr", 1, "int", "" ] [ "sys", "corr", 2, "int", "" ] +[ "sys", "corr", 0, "wrd", "create aggregate corr(e1 wrd, e2 wrd) returns wrd\n\texternal name \"aggr\".\"corr\";" ] +[ "sys", "corr", 1, "wrd", "" ] +[ "sys", "corr", 2, "wrd", "" ] [ "sys", "corr", 0, "bigint", "create aggregate corr(e1 bigint, e2 bigint) returns bigint\n\texternal name \"aggr\".\"corr\";" ] [ "sys", "corr", 1, "bigint", "" ] [ "sys", "corr", 2, "bigint", "" ] @@ -182,6 +185,8 @@ Ready. [ "sys", "median", 1, "smallint", "" ] [ "sys", "median", 0, "int", "create aggregate median(val integer) returns integer\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "int", "" ] +[ "sys", "median", 0, "wrd", "create aggregate median(val wrd) returns wrd\n\texternal name \"aggr\".\"median\";" ] +[ "sys", "median", 1, "wrd", "" ] [ "sys", "median", 0, "bigint", "create aggregate median(val bigint) returns bigint\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "bigint", "" ] [ "sys", "median", 0, "real", "create aggregate median(val real) returns real\n\texternal name \"aggr\".\"median\";" ] @@ -256,6 +261,8 @@ Ready. [ "sys", "stddev_pop", 1, "smallint", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val integer) returns double\n\texternal name \"aggr\".\"stdevp\";" ] [ "sys", "stddev_pop", 1, "int", "" ] +[ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val wrd) returns double\n\texternal name \"aggr\".\"stdevp\";" ] +[ "sys", "stddev_pop", 1, "wrd", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val bigint) returns double\n\texternal name \"aggr\".\"stdevp\";" ] [ "sys", "stddev_pop", 1, "bigint", "" ] [ "sys", "stddev_pop", 0, "double", "create aggregate stddev_pop(val real) returns double\n\texternal name \"aggr\".\"stdevp\";" ] @@ -274,6 +281,8 @@ Ready. [ "sys", "stddev_samp", 1, "smallint", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val integer) returns double\n\texternal name \"aggr\".\"stdev\";" ] [ "sys", "stddev_samp", 1, "int", "" ] +[ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val wrd) returns double\n\texternal name \"aggr\".\"stdev\";" ] +[ "sys", "stddev_samp", 1, "wrd", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val bigint) returns double\n\texternal name \"aggr\".\"stdev\";" ] [ "sys", "stddev_samp", 1, "bigint", "" ] [ "sys", "stddev_samp", 0, "double", "create aggregate stddev_samp(val real) returns double\n\texternal name \"aggr\".\"stdev\";" ] @@ -305,6 +314,8 @@ Ready. [ "sys", "var_pop", 1, "smallint", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val integer) returns double\n\texternal name \"aggr\".\"variancep\";" ] [ "sys", "var_pop", 1, "int", "" ] +[ "sys", "var_pop", 0, "double", "create aggregate var_pop(val wrd) returns double\n\texternal name \"aggr\".\"variancep\";" ] +[ "sys", "var_pop", 1, "wrd", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val bigint) returns double\n\texternal name \"aggr\".\"variancep\";" ] [ "sys", "var_pop", 1, "bigint", "" ] [ "sys", "var_pop", 0, "double", "create aggregate var_pop(val real) returns double\n\texternal name \"aggr\".\"variancep\";" ] @@ -323,6 +334,8 @@ Ready. [ "sys", "var_samp", 1, "smallint", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val integer) returns double\n\texternal name \"aggr\".\"variance\";" ] [ "sys", "var_samp", 1, "int", "" ] +[ "sys", "var_samp", 0, "double", "create aggregate var_samp(val wrd) returns double\n\texternal name \"aggr\".\"variance\";" ] +[ "sys", "var_samp", 1, "wrd", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val bigint) returns double\n\texternal name \"aggr\".\"variance\";" ] [ "sys", "var_samp", 1, "bigint", "" ] [ "sys", "var_samp", 0, "double", "create aggregate var_samp(val real) returns double\n\texternal name \"aggr\".\"variance\";" ] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
