Changeset: 32c01ed07c79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32c01ed07c79
Modified Files:
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out.oid32
Branch: default
Log Message:
SQL-dump is a maintenance nightmare.
diffs (truncated from 23122 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out.64bit.oid32
b/clients/Tests/SQL-dump.stable.out.64bit.oid32
--- a/clients/Tests/SQL-dump.stable.out.64bit.oid32
+++ b/clients/Tests/SQL-dump.stable.out.64bit.oid32
@@ -135,7 +135,6 @@ SYSTEM FUNCTION sys.difference
SYSTEM FUNCTION sys.dimension
SYSTEM FUNCTION sys.disjoint
SYSTEM FUNCTION sys.distance
-SYSTEM FUNCTION sys.dropdictionary
SYSTEM FUNCTION sys.env
SYSTEM FUNCTION sys.envelope
SYSTEM FUNCTION sys.environment
@@ -158,16 +157,12 @@ SYSTEM FUNCTION sys.getprotocol
SYSTEM FUNCTION sys.getquery
SYSTEM FUNCTION sys.getroboturl
SYSTEM FUNCTION sys.getuser
-SYSTEM FUNCTION sys.gzcompress
-SYSTEM FUNCTION sys.gzdecompress
-SYSTEM FUNCTION sys.gzexpand
-SYSTEM FUNCTION sys.gztruncate
+SYSTEM FUNCTION sys.hashsize
SYSTEM FUNCTION sys.heapsize
SYSTEM FUNCTION sys.host
SYSTEM FUNCTION sys.hostmask
SYSTEM FUNCTION sys.ilike
-SYSTEM FUNCTION sys.indexsize
-SYSTEM FUNCTION sys.initializedictionary
+SYSTEM FUNCTION sys.imprintsize
SYSTEM FUNCTION sys.intersection
SYSTEM FUNCTION sys.isaurl
SYSTEM FUNCTION sys.isauuid
@@ -190,7 +185,6 @@ SYSTEM FUNCTION sys.ms_stuff
SYSTEM FUNCTION sys.ms_trunc
SYSTEM FUNCTION sys.netmask
SYSTEM FUNCTION sys.network
-SYSTEM FUNCTION sys.newdictionary
SYSTEM FUNCTION sys.newurl
SYSTEM FUNCTION sys.optimizer_stats
SYSTEM FUNCTION sys.optimizers
@@ -276,6 +270,7 @@ CREATE TABLE "sys"."args" (
"type" VARCHAR(1024),
"type_digits" INTEGER,
"type_scale" INTEGER,
+ "inout" TINYINT,
"number" INTEGER
);
CREATE TABLE "sys"."auths" (
@@ -311,6 +306,8 @@ CREATE TABLE "sys"."functions" (
"sql" BOOLEAN,
"type" INTEGER,
"side_effect" BOOLEAN,
+ "varres" BOOLEAN,
+ "vararg" BOOLEAN,
"schema_id" INTEGER
);
CREATE TABLE "sys"."idxs" (
@@ -435,7 +432,8 @@ create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
sum(columnsize) as columnsize,
sum(heapsize) as heapsize,
- sum(indices) as indices,
+ sum(hashes) as hashes,
+ sum(imprints) as imprints,
sum(case when sorted = false then 8 * count else 0 end) as auxillary
from sys.storagemodel() group by "schema","table";
create view sys.tracelog as select * from sys.tracelog();
@@ -471,7 +469,7 @@ create function sys.bbp ()
ttype string, count bigint, refcnt int, lrefcnt int,
location string, heat int, dirty string,
status string, kind string)
- external name sql.bbp;
+ external name bbp.get;
create function boundary(g geometry) returns geometry external name
geom."Boundary";
create function "broadcast" (p inet) returns inet
external name inet."broadcast";
@@ -666,8 +664,6 @@ create function difference(a geometry, b
create function dimension(g geometry) returns integer external name
geom."Dimension";
create function disjoint(a geometry, b geometry) returns boolean external name
geom."Disjoint";
create function distance(a geometry, b geometry) returns float external name
geom."Distance";
-create procedure dropdictionary (s string, t string)
- external name sql.dropdictionary;
CREATE FUNCTION env () RETURNS TABLE( name varchar(1024), value varchar(2048))
EXTERNAL NAME sql.sql_environment;
create function envelope(g geometry) returns geometry external name
geom."Envelope";
-- The environment table
@@ -717,34 +713,6 @@ create function getroboturl(theurl url)
external name url."getRobotURL";
create function getuser(theurl url) returns string
external name url."getUser";
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
---
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
--- Copyright August 2008-2014 MonetDB B.V.
--- All Rights Reserved.
-
--- Perform LZ-compression over a specific table;
-create procedure gzcompress (s string, t string)
- external name sql.gzcompress;
-create procedure gzdecompress (s string, t string)
- external name sql.gzdecompress;
--- Remove the compressed images
-create procedure gzexpand (s string, t string)
- external name sql.gzexpand;
--- Truncate the storage for columns with a compressed image
-create procedure gztruncate (s string, t string)
- external name sql.gztruncate;
create function sys.heapsize(tpe string, i bigint, w int)
returns bigint
begin
@@ -759,23 +727,13 @@ create function "host" (p inet) returns
create function "hostmask" (p inet) returns inet
external name inet."hostmask";
create filter function "ilike"(val string, pat string, esc string) external
name algebra.ilikesubselect;
-create function sys.indexsize(b boolean, i bigint)
-returns bigint
-begin
- -- assume non-compound keys
- if b = true
- then
- return 8 * i;
- end if;
- return 0;
-end;
-create procedure initializedictionary ()
- external name dictionary.initialize;
create function intersection(a geometry, b geometry) returns geometry external
name geom."Intersection";
create function isaurl(theurl url) returns bool
external name url."isaURL";
create function sys.isauuid(u uuid)
returns uuid external name uuid."isaUUID";
+create function sys.isauuid(u string)
+returns uuid external name uuid."isaUUID";
create function isempty(g geometry) returns boolean external name
geom."IsEmpty";
create function issimple(g geometry) returns boolean external name
geom."IsSimple";
create function length(g geometry) returns float external name geom."Length";
@@ -908,25 +866,6 @@ create function "netmask" (p inet) retur
external name inet."netmask";
create function "network" (p inet) returns inet
external name inet."network";
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
---
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
--- Copyright August 2008-2014 MonetDB B.V.
--- All Rights Reserved.
-
-create procedure newdictionary (s string, t string)
- external name sql.newdictionary;
create function newurl(protocol string, hostname string, "port" int, file
string)
returns url
external name url."new";
@@ -1293,7 +1232,7 @@ external name sql.sysmon_stop;
-- For strings we take a sample to determine their average length.
create function sys.storage()
-returns table ("schema" string, "table" string, "column" string, "type"
string, location string, "count" bigint, typewidth int, columnsize bigint,
heapsize bigint, indices bigint, sorted boolean)
+returns table ("schema" string, "table" string, "column" string, "type"
string, location string, "count" bigint, typewidth int, columnsize bigint,
heapsize bigint, hashes bigint, imprints bigint, sorted boolean)
external name sql.storage;
create function sys.storagemodel()
returns table (
@@ -1304,13 +1243,15 @@ returns table (
"count" bigint,
columnsize bigint,
heapsize bigint,
- indices bigint,
+ hashes bigint,
+ imprints bigint,
sorted boolean)
begin
return select i."schema", i."table", i."column", i."type", i."count",
columnsize(i."type", i.count, i."distinct"),
heapsize(i."type", i."distinct", i."atomwidth"),
- indexsize(i."reference", i."count"),
+ hashsize(i."reference", i."count"),
+ imprintsize(i."count",i."type"),
i.sorted
from sys.storagemodelinput i;
end;
@@ -1506,7 +1447,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 419 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 286 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
@@ -1527,405 +1468,272 @@ 2020 "mod" "varchar" 8196 0 2016
NULL tr
2021 "sql" "boolean" 1 0 2016 NULL true 4
NULL
2022 "type" "int" 32 0 2016 NULL true 5 NULL
2023 "side_effect" "boolean" 1 0 2016 NULL true
6 NULL
-2024 "schema_id" "int" 32 0 2016 NULL true 7
NULL
-2026 "id" "int" 32 0 2025 NULL true 0 NULL
-2027 "func_id" "int" 32 0 2025 NULL true 1
NULL
-2028 "name" "varchar" 256 0 2025 NULL true 2
NULL
-2029 "type" "varchar" 1024 0 2025 NULL true 3
NULL
-2030 "type_digits" "int" 32 0 2025 NULL true 4
NULL
-2031 "type_scale" "int" 32 0 2025 NULL true 5
NULL
-2032 "number" "int" 32 0 2025 NULL true 6
NULL
-2034 "id" "int" 32 0 2033 NULL true 0 NULL
-2035 "schema_id" "int" 32 0 2033 NULL true 1
NULL
-2036 "name" "varchar" 256 0 2033 NULL true 2
NULL
-2037 "start" "bigint" 64 0 2033 NULL true 3
NULL
-2038 "minvalue" "bigint" 64 0 2033 NULL true
4 NULL
-2039 "maxvalue" "bigint" 64 0 2033 NULL true
5 NULL
-2040 "increment" "bigint" 64 0 2033 NULL true
6 NULL
-2041 "cacheinc" "bigint" 64 0 2033 NULL true
7 NULL
-2042 "cycle" "boolean" 1 0 2033 NULL true 8
NULL
-2044 "id" "int" 32 0 2043 NULL true 0 NULL
-2045 "depend_id" "int" 32 0 2043 NULL true 1
NULL
-2046 "depend_type" "smallint" 16 0 2043 NULL true
2 NULL
-2048 "id" "int" 32 0 2047 NULL true 0 NULL
-2049 "server" "char" 1024 0 2047 NULL true 1
NULL
-2050 "port" "int" 32 0 2047 NULL true 2 NULL
-2051 "db" "char" 64 0 2047 NULL true 3 NULL
-2052 "db_alias" "char" 1024 0 2047 NULL true 4
NULL
-2053 "user" "char" 1024 0 2047 NULL true 5 NULL
-2054 "password" "char" 1024 0 2047 NULL true 6
NULL
-2055 "language" "char" 1024 0 2047 NULL true 7
NULL
-2057 "id" "int" 32 0 2056 NULL true 0 NULL
-2058 "name" "varchar" 1024 0 2056 NULL true 1
NULL
-2059 "schema_id" "int" 32 0 2056 NULL true 2
NULL
-2060 "query" "varchar" 2048 0 2056 NULL true 3
NULL
-2061 "type" "smallint" 16 0 2056 NULL true 4
NULL
-2062 "system" "boolean" 1 0 2056 NULL true
5 NULL
-2063 "commit_action" "smallint" 16 0 2056 NULL true
6 NULL
-2064 "readonly" "boolean" 1 0 2056 NULL true
7 NULL
-2066 "id" "int" 32 0 2065 NULL true 0 NULL
-2067 "name" "varchar" 1024 0 2065 NULL true 1
NULL
-2068 "type" "varchar" 1024 0 2065 NULL true 2
NULL
-2069 "type_digits" "int" 32 0 2065 NULL true 3
NULL
-2070 "type_scale" "int" 32 0 2065 NULL true 4
NULL
-2071 "table_id" "int" 32 0 2065 NULL true 5
NULL
-2072 "default" "varchar" 2048 0 2065 NULL true
6 NULL
-2073 "null" "boolean" 1 0 2065 NULL true 7
NULL
-2074 "number" "int" 32 0 2065 NULL true 8
NULL
-2075 "storage" "varchar" 2048 0 2065 NULL true
9 NULL
-2077 "id" "int" 32 0 2076 NULL true 0 NULL
-2078 "table_id" "int" 32 0 2076 NULL true 1
NULL
-2079 "type" "int" 32 0 2076 NULL true 2 NULL
-2080 "name" "varchar" 1024 0 2076 NULL true 3
NULL
-2081 "rkey" "int" 32 0 2076 NULL true 4 NULL
-2082 "action" "int" 32 0 2076 NULL true 5
NULL
-2084 "id" "int" 32 0 2083 NULL true 0 NULL
-2085 "table_id" "int" 32 0 2083 NULL true 1
NULL
-2086 "type" "int" 32 0 2083 NULL true 2 NULL
-2087 "name" "varchar" 1024 0 2083 NULL true 3
NULL
-2089 "id" "int" 32 0 2088 NULL true 0 NULL
-2090 "name" "varchar" 1024 0 2088 NULL true 1
NULL
-2091 "table_id" "int" 32 0 2088 NULL true 2
NULL
-2092 "time" "smallint" 16 0 2088 NULL true 3
NULL
-2093 "orientation" "smallint" 16 0 2088 NULL true
4 NULL
-2094 "event" "smallint" 16 0 2088 NULL true 5
NULL
-2095 "old_name" "varchar" 1024 0 2088 NULL true
6 NULL
-2096 "new_name" "varchar" 1024 0 2088 NULL true
7 NULL
-2097 "condition" "varchar" 2048 0 2088 NULL true
8 NULL
-2098 "statement" "varchar" 2048 0 2088 NULL true
9 NULL
-2100 "id" "int" 32 0 2099 NULL true 0 NULL
-2101 "name" "varchar" 1024 0 2099 NULL true 1
NULL
-2102 "nr" "int" 32 0 2099 NULL true 2 NULL
-2105 "id" "int" 32 0 2104 NULL true 0 NULL
-2106 "name" "varchar" 1024 0 2104 NULL true 1
NULL
-2107 "schema_id" "int" 32 0 2104 NULL true 2
NULL
-2108 "query" "varchar" 2048 0 2104 NULL true 3
NULL
-2109 "type" "smallint" 16 0 2104 NULL true 4
NULL
-2110 "system" "boolean" 1 0 2104 NULL true
5 NULL
-2111 "commit_action" "smallint" 16 0 2104 NULL true
6 NULL
-2112 "readonly" "boolean" 1 0 2104 NULL true
7 NULL
-2114 "id" "int" 32 0 2113 NULL true 0 NULL
-2115 "name" "varchar" 1024 0 2113 NULL true 1
NULL
-2116 "type" "varchar" 1024 0 2113 NULL true 2
NULL
-2117 "type_digits" "int" 32 0 2113 NULL true 3
NULL
-2118 "type_scale" "int" 32 0 2113 NULL true 4
NULL
-2119 "table_id" "int" 32 0 2113 NULL true 5
NULL
-2120 "default" "varchar" 2048 0 2113 NULL true
6 NULL
-2121 "null" "boolean" 1 0 2113 NULL true 7
NULL
-2122 "number" "int" 32 0 2113 NULL true 8
NULL
-2123 "storage" "varchar" 2048 0 2113 NULL true
9 NULL
-2125 "id" "int" 32 0 2124 NULL true 0 NULL
-2126 "table_id" "int" 32 0 2124 NULL true 1
NULL
-2127 "type" "int" 32 0 2124 NULL true 2 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
