Changeset: 6a25097e6364 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a25097e6364
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Jun2016
Log Message:
Upgrade fixes so that the emptydb-upgrade* check tests work better.
diffs (truncated from 414 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -644,7 +644,7 @@ sql_update_hugeint(Client c, mvc *sql)
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
pos += snprintf(buf + pos, bufsize - pos,
- "create function sys.fuse(one bigint, two bigint)\n"
+ "create function fuse(one bigint, two bigint)\n"
"returns hugeint\n"
"external name udf.fuse;\n");
@@ -660,19 +660,19 @@ sql_update_hugeint(Client c, mvc *sql)
/* 39_analytics_hge.sql */
pos += snprintf(buf + pos, bufsize - pos,
- "create aggregate sys.stddev_samp(val HUGEINT) returns
DOUBLE\n"
+ "create aggregate stddev_samp(val HUGEINT) returns
DOUBLE\n"
" external name \"aggr\".\"stdev\";\n"
- "create aggregate sys.stddev_pop(val HUGEINT) returns
DOUBLE\n"
+ "create aggregate stddev_pop(val HUGEINT) returns
DOUBLE\n"
" external name \"aggr\".\"stdevp\";\n"
- "create aggregate sys.var_samp(val HUGEINT) returns
DOUBLE\n"
+ "create aggregate var_samp(val HUGEINT) returns
DOUBLE\n"
" external name \"aggr\".\"variance\";\n"
- "create aggregate sys.var_pop(val HUGEINT) returns
DOUBLE\n"
+ "create aggregate var_pop(val HUGEINT) returns DOUBLE\n"
" external name \"aggr\".\"variancep\";\n"
- "create aggregate sys.median(val HUGEINT) returns
HUGEINT\n"
+ "create aggregate median(val HUGEINT) returns HUGEINT\n"
" external name \"aggr\".\"median\";\n"
- "create aggregate sys.quantile(val HUGEINT, q DOUBLE)
returns HUGEINT\n"
+ "create aggregate quantile(val HUGEINT, q DOUBLE)
returns HUGEINT\n"
" external name \"aggr\".\"quantile\";\n"
- "create aggregate sys.corr(e1 HUGEINT, e2 HUGEINT)
returns HUGEINT\n"
+ "create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns
HUGEINT\n"
" external name \"aggr\".\"corr\";\n");
/* 40_json_hge.sql */
@@ -1256,10 +1256,11 @@ sql_update_jun2016(Client c, mvc *sql)
/* 25_debug.sql */
pos += snprintf(buf + pos, bufsize - pos, "drop function sys.bbp();\n");
pos += snprintf(buf + pos, bufsize - pos,
- "create function sys.bbp()\n"
+ "create function sys.bbp ()\n"
"returns table (id int, name string,\n"
- "ttype string, count bigint, refcnt int, lrefcnt int,\n"
- "location string, kind string)\n"
+ "ttype string, count BIGINT, refcnt int, lrefcnt int,\n"
+ "location string, heat int, dirty string,\n"
+ "status string, kind string)\n"
"external name bbp.get;\n");
pos += snprintf(buf + pos, bufsize - pos,
"create function sys.malfunctions()\n"
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5601,10 +5601,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -4903,10 +4903,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -26,7 +26,7 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
-create function sys.fuse(one bigint, two bigint)
+create function fuse(one bigint, two bigint)
returns hugeint
external name udf.fuse;
create function sys.generate_series(first hugeint, last hugeint)
@@ -35,19 +35,19 @@ external name generator.series;
create function sys.generate_series(first hugeint, last hugeint, stepsize
hugeint)
returns table (value hugeint)
external name generator.series;
-create aggregate sys.stddev_samp(val HUGEINT) returns DOUBLE
+create aggregate stddev_samp(val HUGEINT) returns DOUBLE
external name "aggr"."stdev";
-create aggregate sys.stddev_pop(val HUGEINT) returns DOUBLE
+create aggregate stddev_pop(val HUGEINT) returns DOUBLE
external name "aggr"."stdevp";
-create aggregate sys.var_samp(val HUGEINT) returns DOUBLE
+create aggregate var_samp(val HUGEINT) returns DOUBLE
external name "aggr"."variance";
-create aggregate sys.var_pop(val HUGEINT) returns DOUBLE
+create aggregate var_pop(val HUGEINT) returns DOUBLE
external name "aggr"."variancep";
-create aggregate sys.median(val HUGEINT) returns HUGEINT
+create aggregate median(val HUGEINT) returns HUGEINT
external name "aggr"."median";
-create aggregate sys.quantile(val HUGEINT, q DOUBLE) returns HUGEINT
+create aggregate quantile(val HUGEINT, q DOUBLE) returns HUGEINT
external name "aggr"."quantile";
-create aggregate sys.corr(e1 HUGEINT, e2 HUGEINT) returns HUGEINT
+create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns HUGEINT
external name "aggr"."corr";
create function json.filter(js json, name hugeint)
returns json
@@ -5645,10 +5645,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5601,10 +5601,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -4903,10 +4903,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -26,7 +26,7 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
-create function sys.fuse(one bigint, two bigint)
+create function fuse(one bigint, two bigint)
returns hugeint
external name udf.fuse;
create function sys.generate_series(first hugeint, last hugeint)
@@ -35,19 +35,19 @@ external name generator.series;
create function sys.generate_series(first hugeint, last hugeint, stepsize
hugeint)
returns table (value hugeint)
external name generator.series;
-create aggregate sys.stddev_samp(val HUGEINT) returns DOUBLE
+create aggregate stddev_samp(val HUGEINT) returns DOUBLE
external name "aggr"."stdev";
-create aggregate sys.stddev_pop(val HUGEINT) returns DOUBLE
+create aggregate stddev_pop(val HUGEINT) returns DOUBLE
external name "aggr"."stdevp";
-create aggregate sys.var_samp(val HUGEINT) returns DOUBLE
+create aggregate var_samp(val HUGEINT) returns DOUBLE
external name "aggr"."variance";
-create aggregate sys.var_pop(val HUGEINT) returns DOUBLE
+create aggregate var_pop(val HUGEINT) returns DOUBLE
external name "aggr"."variancep";
-create aggregate sys.median(val HUGEINT) returns HUGEINT
+create aggregate median(val HUGEINT) returns HUGEINT
external name "aggr"."median";
-create aggregate sys.quantile(val HUGEINT, q DOUBLE) returns HUGEINT
+create aggregate quantile(val HUGEINT, q DOUBLE) returns HUGEINT
external name "aggr"."quantile";
-create aggregate sys.corr(e1 HUGEINT, e2 HUGEINT) returns HUGEINT
+create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns HUGEINT
external name "aggr"."corr";
create function json.filter(js json, name hugeint)
returns json
@@ -5645,10 +5645,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
@@ -5599,10 +5599,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -4898,10 +4898,11 @@ grant execute on function md5 to public;
drop procedure sys.profiler_openstream(string, int);
drop procedure sys.profiler_stethoscope(int);
drop function sys.bbp();
-create function sys.bbp()
+create function sys.bbp ()
returns table (id int, name string,
-ttype string, count bigint, refcnt int, lrefcnt int,
-location string, kind string)
+ttype string, count BIGINT, refcnt int, lrefcnt int,
+location string, heat int, dirty string,
+status string, kind string)
external name bbp.get;
create function sys.malfunctions()
returns table("signature" string, "address" string, "comment" string)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -21,7 +21,7 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
-create function sys.fuse(one bigint, two bigint)
+create function fuse(one bigint, two bigint)
returns hugeint
external name udf.fuse;
create function sys.generate_series(first hugeint, last hugeint)
@@ -30,19 +30,19 @@ external name generator.series;
create function sys.generate_series(first hugeint, last hugeint, stepsize
hugeint)
returns table (value hugeint)
external name generator.series;
-create aggregate sys.stddev_samp(val HUGEINT) returns DOUBLE
+create aggregate stddev_samp(val HUGEINT) returns DOUBLE
external name "aggr"."stdev";
-create aggregate sys.stddev_pop(val HUGEINT) returns DOUBLE
+create aggregate stddev_pop(val HUGEINT) returns DOUBLE
external name "aggr"."stdevp";
-create aggregate sys.var_samp(val HUGEINT) returns DOUBLE
+create aggregate var_samp(val HUGEINT) returns DOUBLE
external name "aggr"."variance";
-create aggregate sys.var_pop(val HUGEINT) returns DOUBLE
+create aggregate var_pop(val HUGEINT) returns DOUBLE
external name "aggr"."variancep";
-create aggregate sys.median(val HUGEINT) returns HUGEINT
+create aggregate median(val HUGEINT) returns HUGEINT
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
