Changeset: 5569e36542ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5569e36542ce
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/75_storagemodel.sql
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.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.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.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:
Use full name.
diffs (truncated from 762 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
@@ -2143,10 +2143,10 @@ sql_upgrade_2019_storagemodel(Client c,
"end;\n"
"create view sys.storagemodel as\n"
"select \"schema\", \"table\", \"column\", \"type\",
\"count\",\n"
- " columnsize(\"type\", \"count\") as columnsize,\n"
- " heapsize(\"type\", \"count\", \"distinct\",
\"atomwidth\") as heapsize,\n"
- " hashsize(\"reference\", \"count\") as hashsize,\n"
- " case when isacolumn then imprintsize(\"type\",
\"count\") else 0 end as imprintsize,\n"
+ " sys.columnsize(\"type\", \"count\") as columnsize,\n"
+ " sys.heapsize(\"type\", \"count\", \"distinct\",
\"atomwidth\") as heapsize,\n"
+ " sys.hashsize(\"reference\", \"count\") as hashsize,\n"
+ " case when isacolumn then sys.imprintsize(\"type\",
\"count\") else 0 end as imprintsize,\n"
" case when (isacolumn and not sorted) then cast(8 *
\"count\" as bigint) else 0 end as orderidxsize,\n"
" sorted, \"unique\", isacolumn\n"
" from sys.storagemodelinput\n"
@@ -2155,10 +2155,10 @@ sql_upgrade_2019_storagemodel(Client c,
"select \"schema\", \"table\",\n"
" max(\"count\") as \"rowcount\",\n"
" count(*) as \"storages\",\n"
- " sum(columnsize(\"type\", \"count\")) as columnsize,\n"
- " sum(heapsize(\"type\", \"count\", \"distinct\",
\"atomwidth\")) as heapsize,\n"
- " sum(hashsize(\"reference\", \"count\")) as hashsize,\n"
- " sum(case when isacolumn then imprintsize(\"type\",
\"count\") else 0 end) as imprintsize,\n"
+ " sum(sys.columnsize(\"type\", \"count\")) as
columnsize,\n"
+ " sum(sys.heapsize(\"type\", \"count\", \"distinct\",
\"atomwidth\")) as heapsize,\n"
+ " sum(sys.hashsize(\"reference\", \"count\")) as
hashsize,\n"
+ " sum(case when isacolumn then sys.imprintsize(\"type\",
\"count\") else 0 end) as imprintsize,\n"
" sum(case when (isacolumn and not sorted) then cast(8 *
\"count\" as bigint) else 0 end) as orderidxsize\n"
" from sys.storagemodelinput\n"
"group by \"schema\", \"table\"\n"
diff --git a/sql/scripts/75_storagemodel.sql b/sql/scripts/75_storagemodel.sql
--- a/sql/scripts/75_storagemodel.sql
+++ b/sql/scripts/75_storagemodel.sql
@@ -293,10 +293,10 @@ end;
-- The computed maximum column storage requirements (estimates) view.
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -307,10 +307,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
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
@@ -284,10 +284,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -296,10 +296,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
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
@@ -280,10 +280,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -292,10 +292,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -280,10 +280,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -292,10 +292,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
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
@@ -6137,10 +6137,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -6149,10 +6149,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -6137,10 +6137,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -6149,10 +6149,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
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
@@ -284,10 +284,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -296,10 +296,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
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
@@ -284,10 +284,10 @@ begin
end;
create view sys.storagemodel as
select "schema", "table", "column", "type", "count",
- columnsize("type", "count") as columnsize,
- heapsize("type", "count", "distinct", "atomwidth") as heapsize,
- hashsize("reference", "count") as hashsize,
- case when isacolumn then imprintsize("type", "count") else 0 end as
imprintsize,
+ sys.columnsize("type", "count") as columnsize,
+ sys.heapsize("type", "count", "distinct", "atomwidth") as heapsize,
+ sys.hashsize("reference", "count") as hashsize,
+ case when isacolumn then sys.imprintsize("type", "count") else 0 end as
imprintsize,
case when (isacolumn and not sorted) then cast(8 * "count" as bigint)
else 0 end as orderidxsize,
sorted, "unique", isacolumn
from sys.storagemodelinput
@@ -296,10 +296,10 @@ create view sys.tablestoragemodel as
select "schema", "table",
max("count") as "rowcount",
count(*) as "storages",
- sum(columnsize("type", "count")) as columnsize,
- sum(heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
- sum(hashsize("reference", "count")) as hashsize,
- sum(case when isacolumn then imprintsize("type", "count") else 0 end)
as imprintsize,
+ sum(sys.columnsize("type", "count")) as columnsize,
+ sum(sys.heapsize("type", "count", "distinct", "atomwidth")) as heapsize,
+ sum(sys.hashsize("reference", "count")) as hashsize,
+ sum(case when isacolumn then sys.imprintsize("type", "count") else 0
end) as imprintsize,
sum(case when (isacolumn and not sorted) then cast(8 * "count" as
bigint) else 0 end) as orderidxsize
from sys.storagemodelinput
group by "schema", "table"
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
