Changeset: 76b75b17dad1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76b75b17dad1
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_upgrades.c
Branch: mosaic
Log Message:
Fixing storagemodel
diffs (143 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4895,7 +4895,7 @@ sql_storage(Client cntxt, MalBlkPtr mb,
bat *rimprints = getArgReference_bat(stk, pci, 12);
bat *rsort = getArgReference_bat(stk, pci, 13);
bat *roidx = getArgReference_bat(stk, pci, 14);
- bat *rcompressed = getArgReference_bat(stk, pci, 14);
+ bat *rcompressed = getArgReference_bat(stk, pci, 15);
str sname = 0;
str tname = 0;
str cname = 0;
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -504,7 +504,7 @@ pattern storage()(
imprints:bat[:lng],
sorted:bat[:bit],
orderidx:bat[:lng],
- compress:bat[:bit])
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information ";
@@ -523,7 +523,8 @@ pattern storage(sname:str)(
phash:bat[:bit],
imprints:bat[:lng],
sorted:bat[:bit],
- orderidx:bat[:lng])
+ orderidx:bat[:lng],
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular schema ";
@@ -543,7 +544,7 @@ pattern storage(sname:str, tname:str)(
imprints:bat[:lng],
sorted:bat[:bit],
orderidx:bat[:lng],
- compress:bat[:bit])
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular table";
@@ -563,7 +564,7 @@ pattern storage(sname:str, tname:str, cn
imprints:bat[:lng],
sorted:bat[:bit],
orderidx:bat[:lng],
- compress:bat[:bit])
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular column";
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -192,6 +192,8 @@ SQLrun(Client c, mvc *m){
if( m->emod & mod_debug)
msg = runMALDebugger(c, c->curprg->def);
else{
+ if( c->curprg->def->errors)
+ throw(SQL,"sql.run","Program contains errors");
if( m->emod & mod_trace){
c->curprg->def = copyMalBlk(old = c->curprg->def);
SQLsetTrace(c);
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
@@ -897,7 +897,8 @@ sql_update_jul2015(Client c, mvc *sql)
" phash boolean,\n"
" imprints bigint,\n"
" sorted boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,\n"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
@@ -1541,7 +1542,8 @@ sql_update_default(Client c, mvc *sql)
" phash boolean,\n"
" \"imprints\" bigint,\n"
" sorted 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"
@@ -1561,7 +1563,8 @@ sql_update_default(Client c, mvc *sql)
" phash boolean,\n"
" \"imprints\" bigint,\n"
" sorted 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"
@@ -1580,7 +1583,8 @@ sql_update_default(Client c, mvc *sql)
" phash boolean,\n"
" \"imprints\" bigint,\n"
" sorted boolean,\n"
- " orderidx bigint\n"
+ " orderidx bigint,"
+ " compressed boolean\n"
")\n"
"external name sql.\"storage\";\n"
"create function sys.\"storage\"( sname string, tname
string, cname string)\n"
@@ -1599,14 +1603,15 @@ sql_update_default(Client c, mvc *sql)
" phash boolean,\n"
" \"imprints\" bigint,\n"
" sorted 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.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.orderidx,
X.compressed from sys.\"storage\"() X;\n"
" update sys.storagemodelinput\n"
" set reference = true\n"
" where concat(concat(\"schema\",\"table\"),
\"column\") in (\n"
@@ -1635,14 +1640,15 @@ sql_update_default(Client c, mvc *sql)
" hashes bigint,\n"
" \"imprints\" bigint,\n"
" sorted boolean,\n"
- " orderidx bigint)\n"
+ " orderidx bigint,"
+ "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.orderidx\n"
+ " I.sorted, I.orderidx, I.compressed\n"
" from sys.storagemodelinput I;\n"
"end;\n"
"create view sys.storagemodel as select * from
sys.storagemodel();\n"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
