Changeset: 0d0292fa6bab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d0292fa6bab
Modified Files:
sql/backends/monet5/sql_upgrades.c
Branch: mosaic
Log Message:
Fix merge
diffs (77 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
@@ -593,7 +593,8 @@ sql_update_dec2016(Client c, mvc *sql)
" sorted boolean,\n"
" revsorted boolean,\n"
" \"unique\" boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,\n"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
"create view sys.\"storage\" as select * from
sys.\"storage\"();\n"
@@ -615,7 +616,8 @@ sql_update_dec2016(Client c, mvc *sql)
" sorted boolean,\n"
" revsorted boolean,\n"
" \"unique\" boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,\n"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
"create function sys.\"storage\"( sname string, tname
string)\n"
@@ -636,7 +638,8 @@ sql_update_dec2016(Client c, mvc *sql)
" sorted boolean,\n"
" revsorted boolean,\n"
" \"unique\" boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,\n"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
"create function sys.\"storage\"( sname string, tname
string, cname string)\n"
@@ -657,14 +660,15 @@ sql_update_dec2016(Client c, mvc *sql)
" sorted boolean,\n"
" revsorted boolean,\n"
" \"unique\" boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,\n"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
"create procedure sys.storagemodelinit()\n"
"begin\n"
" delete from sys.storagemodelinput;\n"
" insert into sys.storagemodelinput\n"
- " select X.\"schema\", X.\"table\", X.\"column\",
X.\"type\", X.typewidth, X.count, 0, X.typewidth, false, X.sorted, X.revsorted,
X.\"unique\", X.orderidx from sys.\"storage\"() X;\n"
+ " select X.\"schema\", X.\"table\", X.\"column\",
X.\"type\", X.typewidth, X.count, 0, X.typewidth, false, X.sorted, X.revsorted,
X.\"unique\", X.orderidx , X.compressed from sys.\"storage\"() X;\n"
" update sys.storagemodelinput\n"
" set reference = true\n"
" where concat(concat(\"schema\",\"table\"),
\"column\") in (\n"
@@ -695,14 +699,15 @@ sql_update_dec2016(Client c, mvc *sql)
" sorted boolean,\n"
" revsorted boolean,\n"
" \"unique\" boolean,\n"
- " orderidx bigint)\n"
+ " orderidx bigint,\n"
+ " compressed boolean)\n"
"begin\n"
" return select I.\"schema\", I.\"table\",
I.\"column\", I.\"type\", I.\"count\",\n"
" columnsize(I.\"type\", I.count, I.\"distinct\"),\n"
" heapsize(I.\"type\", I.\"distinct\",
I.\"atomwidth\"),\n"
" hashsize(I.\"reference\", I.\"count\"),\n"
" imprintsize(I.\"count\",I.\"type\"),\n"
- " I.sorted, I.revsorted, I.\"unique\", I.orderidx\n"
+ " I.sorted, I.revsorted, I.\"unique\", I.orderidx,
I.compressed\n"
" from sys.storagemodelinput I;\n"
"end;\n"
"create view sys.storagemodel as select * from
sys.storagemodel();\n"
@@ -1202,7 +1207,6 @@ sql_update_mosaic(Client c, mvc *sql)
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
/* 76_mosaic.sql */
- "update sys.args set
type_digits = 38 where type = 'decimal' and type_digits = 39;\n");
pos += snprintf(buf + pos, bufsize - pos,
"drop function mosaic_layout(sch string, tbl string,
col string,compression string);"
"drop function mosaic_layout(sch string, tbl string,
col string);"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
