Changeset: 4c129eb95903 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c129eb95903
Added Files:
sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in
sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err
sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out
sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in
sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err
sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out
Modified Files:
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_none.stable.out
clients/mapiclient/mclient.1
monetdb5/optimizer/opt_dataflow.c
sql/ChangeLog.Oct2014
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
sql/scripts/75_storagemodel.sql
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in
sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/bugs/Tests/crash_order_by.sql
sql/test/bugs/Tests/simple_view.sql
sql/test/bugs/insert_delete-bug-sf-904025.sql
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 1041 to 300 lines):
diff --git a/clients/Tests/SQL-dump_all.stable.out
b/clients/Tests/SQL-dump_all.stable.out
--- a/clients/Tests/SQL-dump_all.stable.out
+++ b/clients/Tests/SQL-dump_all.stable.out
@@ -427,7 +427,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -435,7 +435,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1830,7 +1830,7 @@ 6458 "columnsize" "bigint" 64 0
6463 NUL
6459 "heapsize" "bigint" 64 0 6463 NULL true
4 NULL
6460 "hashes" "bigint" 64 0 6463 NULL true
5 NULL
6461 "imprints" "bigint" 64 0 6463 NULL true
6 NULL
-6462 "auxillary" "bigint" 53 0 6463 NULL true
7 NULL
+6462 "auxiliary" "bigint" 53 0 6463 NULL true
7 NULL
6465 "column_id" "int" 32 0 6476 NULL true 0
NULL
6466 "type" "clob" 0 0 6476 NULL true 1 NULL
6467 "width" "int" 32 0 6476 NULL true 2 NULL
@@ -1936,7 +1936,7 @@ 5737 "queue" 2000 "create view sys.queue
6393 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6405 "storagemodelinput" 2000 NULL 0 true 0 false
6453 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6463 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6463 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6476 "statistics" 2000 NULL 0 true 0 false
6579 "files" 6528 NULL 0 true 0 false
6592 "sq" 6528 NULL 0 true 0 false
diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32
b/clients/Tests/SQL-dump_all.stable.out.oid32
--- a/clients/Tests/SQL-dump_all.stable.out.oid32
+++ b/clients/Tests/SQL-dump_all.stable.out.oid32
@@ -427,7 +427,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -435,7 +435,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1830,7 +1830,7 @@ 6458 "columnsize" "bigint" 64 0
6463 NUL
6459 "heapsize" "bigint" 64 0 6463 NULL true
4 NULL
6460 "hashes" "bigint" 64 0 6463 NULL true
5 NULL
6461 "imprints" "bigint" 64 0 6463 NULL true
6 NULL
-6462 "auxillary" "bigint" 53 0 6463 NULL true
7 NULL
+6462 "auxiliary" "bigint" 53 0 6463 NULL true
7 NULL
6465 "column_id" "int" 32 0 6476 NULL true 0
NULL
6466 "type" "clob" 0 0 6476 NULL true 1 NULL
6467 "width" "int" 32 0 6476 NULL true 2 NULL
@@ -1936,7 +1936,7 @@ 5737 "queue" 2000 "create view sys.queue
6393 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6405 "storagemodelinput" 2000 NULL 0 true 0 false
6453 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6463 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6463 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6476 "statistics" 2000 NULL 0 true 0 false
6579 "files" 6528 NULL 0 true 0 false
6592 "sq" 6528 NULL 0 true 0 false
diff --git a/clients/Tests/SQL-dump_geom.stable.out
b/clients/Tests/SQL-dump_geom.stable.out
--- a/clients/Tests/SQL-dump_geom.stable.out
+++ b/clients/Tests/SQL-dump_geom.stable.out
@@ -424,7 +424,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -432,7 +432,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1804,7 +1804,7 @@ 6453 "columnsize" "bigint" 64 0
6458 NUL
6454 "heapsize" "bigint" 64 0 6458 NULL true
4 NULL
6455 "hashes" "bigint" 64 0 6458 NULL true
5 NULL
6456 "imprints" "bigint" 64 0 6458 NULL true
6 NULL
-6457 "auxillary" "bigint" 53 0 6458 NULL true
7 NULL
+6457 "auxiliary" "bigint" 53 0 6458 NULL true
7 NULL
6460 "column_id" "int" 32 0 6471 NULL true 0
NULL
6461 "type" "clob" 0 0 6471 NULL true 1 NULL
6462 "width" "int" 32 0 6471 NULL true 2 NULL
@@ -1867,7 +1867,7 @@ 5737 "queue" 2000 "create view sys.queue
6388 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6400 "storagemodelinput" 2000 NULL 0 true 0 false
6448 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6458 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6458 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6471 "statistics" 2000 NULL 0 true 0 false
6593 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
diff --git a/clients/Tests/SQL-dump_geom.stable.out.32bit
b/clients/Tests/SQL-dump_geom.stable.out.32bit
--- a/clients/Tests/SQL-dump_geom.stable.out.32bit
+++ b/clients/Tests/SQL-dump_geom.stable.out.32bit
@@ -420,7 +420,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -428,7 +428,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1798,7 +1798,7 @@ 6453 "columnsize" "bigint" 64 0
6458 NUL
6454 "heapsize" "bigint" 64 0 6458 NULL true
4 NULL
6455 "hashes" "bigint" 64 0 6458 NULL true
5 NULL
6456 "imprints" "bigint" 64 0 6458 NULL true
6 NULL
-6457 "auxillary" "bigint" 53 0 6458 NULL true
7 NULL
+6457 "auxiliary" "bigint" 53 0 6458 NULL true
7 NULL
6460 "column_id" "int" 32 0 6471 NULL true 0
NULL
6461 "type" "clob" 0 0 6471 NULL true 1 NULL
6462 "width" "int" 32 0 6471 NULL true 2 NULL
@@ -1861,7 +1861,7 @@ 5737 "queue" 2000 "create view sys.queue
6388 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6400 "storagemodelinput" 2000 NULL 0 true 0 false
6448 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6458 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6458 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6471 "statistics" 2000 NULL 0 true 0 false
6593 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
diff --git a/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
b/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
--- a/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
+++ b/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
@@ -424,7 +424,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -432,7 +432,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1804,7 +1804,7 @@ 6453 "columnsize" "bigint" 64 0
6458 NUL
6454 "heapsize" "bigint" 64 0 6458 NULL true
4 NULL
6455 "hashes" "bigint" 64 0 6458 NULL true
5 NULL
6456 "imprints" "bigint" 64 0 6458 NULL true
6 NULL
-6457 "auxillary" "bigint" 53 0 6458 NULL true
7 NULL
+6457 "auxiliary" "bigint" 53 0 6458 NULL true
7 NULL
6460 "column_id" "int" 32 0 6471 NULL true 0
NULL
6461 "type" "clob" 0 0 6471 NULL true 1 NULL
6462 "width" "int" 32 0 6471 NULL true 2 NULL
@@ -1867,7 +1867,7 @@ 5737 "queue" 2000 "create view sys.queue
6388 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6400 "storagemodelinput" 2000 NULL 0 true 0 false
6448 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6458 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6458 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6471 "statistics" 2000 NULL 0 true 0 false
6593 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
diff --git a/clients/Tests/SQL-dump_none.stable.out
b/clients/Tests/SQL-dump_none.stable.out
--- a/clients/Tests/SQL-dump_none.stable.out
+++ b/clients/Tests/SQL-dump_none.stable.out
@@ -384,7 +384,7 @@ create view sys.storage as select * from
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
-- A summary of the table storage requirement is is available as a table view.
--- The auxillary column denotes the maximum space if all non-sorted columns
+-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
@@ -392,7 +392,7 @@ as select "schema","table",max(count) as
sum(heapsize) as heapsize,
sum(hashes) as hashes,
sum(imprints) as imprints,
- sum(case when sorted = false then 8 * count else 0 end) as auxillary
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
@@ -1710,7 +1710,7 @@ 6253 "columnsize" "bigint" 64 0
6258 NUL
6254 "heapsize" "bigint" 64 0 6258 NULL true
4 NULL
6255 "hashes" "bigint" 64 0 6258 NULL true
5 NULL
6256 "imprints" "bigint" 64 0 6258 NULL true
6 NULL
-6257 "auxillary" "bigint" 53 0 6258 NULL true
7 NULL
+6257 "auxiliary" "bigint" 53 0 6258 NULL true
7 NULL
6260 "column_id" "int" 32 0 6271 NULL true 0
NULL
6261 "type" "clob" 0 0 6271 NULL true 1 NULL
6262 "width" "int" 32 0 6271 NULL true 2 NULL
@@ -1773,7 +1773,7 @@ 5737 "queue" 2000 "create view sys.queue
6188 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
6200 "storagemodelinput" 2000 NULL 0 true 0 false
6248 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6258 "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(hashes) as
hashes,\n\tsum(imprints) as imprints,\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
+6258 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary 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(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6271 "statistics" 2000 NULL 0 true 0 false
6393 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -370,7 +370,7 @@ The specifiers \fIS\fP, \fIt\fP, \fIv\fP
stand for System, table, view, sequence, function and schema
respectively.
Note that \fIS\fP simply switches on viewing system catalog objects,
-which is orthogonal on the other specifiers.
+which is orthogonal to the other specifiers.
.TP
\fB\ed[Stvsfn]+\fP \fIobject\fP
Describe the given
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -126,7 +126,7 @@ void removeDataflow(MalBlkPtr mb)
}
}
/* remove the superflous variable initializations */
- /* when there are no auxillary barrier blocks */
+ /* when there are no auxiliary barrier blocks */
for (i = 0; i<limit; i++)
if ( delete[i] == 0 )
pushInstruction(mb,old[i]);
diff --git a/sql/ChangeLog.Oct2014 b/sql/ChangeLog.Oct2014
--- a/sql/ChangeLog.Oct2014
+++ b/sql/ChangeLog.Oct2014
@@ -1,3 +1,7 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Jan 19 2015 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a typo in a column name of the sys.tablestoragemodel view
+ (auxillary changed to auxiliary).
+
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
@@ -218,7 +218,7 @@ as select \"schema\",\"table\",max(count
sum(columnsize) as columnsize,\n\
sum(heapsize) as heapsize,\n\
sum(indices) as indices,\n\
- sum(case when sorted = false then 8 * count else 0 end) as auxillary\n\
+ sum(case when sorted = false then 8 * count else 0 end) as auxiliary\n\
from sys.storagemodel() group by \"schema\",\"table\";\n\
update sys._tables\n\
set system = true\n\
@@ -893,7 +893,7 @@ create aggregate json.tojsonarray( x dou
" sum(heapsize) as heapsize,"
" sum(hashes) as hashes,"
" sum(imprints) as imprints,"
-" sum(case when sorted = false then 8 * count else 0 end) as auxillary"
+" sum(case when sorted = false then 8 * count else 0 end) as auxiliary"
" from sys.storagemodel() group by \"schema\",\"table\";\n");
pos += snprintf(buf + pos, bufsize - pos, "create view sys.storagemodel
as select * from sys.storagemodel();\n");
pos += snprintf(buf + pos, bufsize - pos, "update sys._tables set
system = true where name in ('storage','storagemodel','tablestoragemodel') and
schema_id = (select id from sys.schemas where name = 'sys');\n");
@@ -1010,6 +1010,60 @@ sql_update_oct2014_sp1(Client c)
return err; /* usually MAL_SUCCEED */
}
+static str
+sql_update_oct2014_sp2(Client c)
+{
+ size_t bufsize = 8192, pos = 0;
+ char *buf = GDKmalloc(bufsize), *err = NULL;
+ mvc *sql = ((backend*) c->sqlcontext)->mvc;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
