Changeset: c2c65743088c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2c65743088c
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/tests/gdkTests/Tests/bat_insert.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
Branch: default
Log Message:
Approved after recent changes.
diffs (truncated from 702 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1736,7 +1736,6 @@ str OPTmultiplexSimple(Client cntxt);
int OPToctopusImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-int OPToriginImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
str OPTpeers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int OPTprejoinImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTpushrangesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
@@ -2431,7 +2430,6 @@ str finishRef;
void finishSessionProfiler(Client cntxt);
Module fixModule(Module scope, str nme);
int fndConstant(MalBlkPtr mb, const ValRecord *cst, int depth);
-void formatVolume(str buf, int len, lng vol);
void freeInstruction(InstrPtr p);
void freeMalBlk(MalBlkPtr mb);
void freeModule(Module cur);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI = (monetdb) /var/tmp/mtest-14346/.s.monetdb.37187
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI = (monetdb) /var/tmp/mtest-14346/.s.monetdb.37187
QUERY = explain copy into ttt from 'a:\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI = (monetdb) /var/tmp/mtest-14346/.s.monetdb.37187
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI = (monetdb) /var/tmp/mtest-14346/.s.monetdb.37187
QUERY = explain copy into ttt from 'Z:/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 467 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();"
]
+% 448 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -89,8 +89,8 @@ end s4_1;
% .L # table_name
% def # name
% clob # type
-% 490 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 471 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/monetdb5/tests/gdkTests/Tests/bat_insert.stable.out
b/monetdb5/tests/gdkTests/Tests/bat_insert.stable.out
--- a/monetdb5/tests/gdkTests/Tests/bat_insert.stable.out
+++ b/monetdb5/tests/gdkTests/Tests/bat_insert.stable.out
@@ -37,13 +37,13 @@ function user.main():void;
i := calc.*(ci,3);
barrier go := calc.>(i,0);
o := calc.oid(i);
- bat.insert(b,o,o);
+ bat.append(b,o);
i := calc.-(i,1);
redo go := calc.>(i,0);
exit go;
transaction.commit();
i := calc.*(ci,2);
-barrier go := calc.>(i,0);
+barrier go := calc.>=(i,0);
o := calc.oid(i);
bat.delete(b,o);
i := calc.-(i,1);
@@ -53,7 +53,7 @@ exit go;
i := calc.*(ci,2);
barrier go := calc.>(i,0);
o := calc.oid(i);
- bat.insert(c,o,o);
+ bat.append(c,o);
i := calc.-(i,1);
redo go := calc.>(i,0);
exit go;
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -110,7 +110,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"; null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys tracelog SYSTEM VIEW create view
sys.tracelog as select * from sys.tracelog(); null null null
rowid SYSTEM
diff --git a/sql/test/Tests/systemfunctions_gsl.stable.out
b/sql/test/Tests/systemfunctions_gsl.stable.out
--- a/sql/test/Tests/systemfunctions_gsl.stable.out
+++ b/sql/test/Tests/systemfunctions_gsl.stable.out
@@ -58,7 +58,7 @@ Ready.
% sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name
% schema, function, argno, argtype, definition # name
% varchar, varchar, int, varchar, varchar # type
-% 4, 35, 1, 15, 1646 # length
+% 4, 35, 2, 15, 1662 # length
[ "json", "filter", 0, "json", "-- access the top level key by
name, return its value\ncreate function json.filter(js json, pathexpr
string)\nreturns json external name json.filter;" ]
[ "json", "filter", 1, "json", "" ]
[ "json", "filter", 2, "clob", "" ]
@@ -71,6 +71,8 @@ Ready.
[ "json", "filter", 0, "json", "create function json.filter(js
json, name bigint)\nreturns json external name json.filter;" ]
[ "json", "filter", 1, "json", "" ]
[ "json", "filter", 2, "bigint", "" ]
+[ "json", "integer", 0, "bigint", "create function
json.\"integer\"(js json)\nreturns bigint external name json.\"integer\";" ]
+[ "json", "integer", 1, "json", "" ]
[ "json", "isarray", 0, "boolean", "create function
json.isarray(js string)\nreturns bool external name json.isarray;" ]
[ "json", "isarray", 1, "clob", "" ]
[ "json", "isarray", 0, "boolean", "create function
json.isarray(js json)\nreturns bool external name json.isarray;" ]
@@ -87,6 +89,8 @@ Ready.
[ "json", "keyarray", 1, "json", "" ]
[ "json", "length", 0, "int", "-- return the number of
primary components\ncreate function json.length(js json)\nreturns integer
external name json.length;" ]
[ "json", "length", 1, "json", "" ]
+[ "json", "number", 0, "double", "create function
json.number(js json)\nreturns float external name json.number;" ]
+[ "json", "number", 1, "json", "" ]
[ "json", "text", 0, "clob", "create function json.text(js json, e
string)\nreturns string external name json.text;" ]
[ "json", "text", 1, "json", "" ]
[ "json", "text", 2, "clob", "" ]
@@ -125,7 +129,18 @@ Ready.
[ "sys", "area", 1, "geometry", "" ]
[ "sys", "astext", 0, "clob", "create function astext(g
geometry) returns string external name geom.\"AsText\";" ]
[ "sys", "astext", 1, "geometry", "" ]
-[ "sys", "bbp", 0, "table", "-- The BAT buffer pool
overview\ncreate function sys.bbp () \n\treturns table (id int, name string,
htype string, \n\t\tttype string, count bigint, refcnt int, lrefcnt int,
\n\t\tlocation string, heat int, dirty string, \n\t\tstatus string, kind
string) \n\texternal name sql.bbp;" ]
+[ "sys", "bbp", 0, "int", "-- The BAT buffer pool
overview\ncreate function sys.bbp () \n\treturns table (id int, name string,
htype string, \n\t\tttype string, count bigint, refcnt int, lrefcnt int,
\n\t\tlocation string, heat int, dirty string, \n\t\tstatus string, kind
string) \n\texternal name bbp.get;" ]
+[ "sys", "bbp", 1, "clob", "" ]
+[ "sys", "bbp", 2, "clob", "" ]
+[ "sys", "bbp", 3, "clob", "" ]
+[ "sys", "bbp", 4, "bigint", "" ]
+[ "sys", "bbp", 5, "int", "" ]
+[ "sys", "bbp", 6, "int", "" ]
+[ "sys", "bbp", 7, "clob", "" ]
+[ "sys", "bbp", 8, "int", "" ]
+[ "sys", "bbp", 9, "clob", "" ]
+[ "sys", "bbp", 10, "clob", "" ]
+[ "sys", "bbp", 11, "clob", "" ]
[ "sys", "boundary", 0, "geometry", "create function
boundary(g geometry) returns geometry external name geom.\"Boundary\";" ]
[ "sys", "boundary", 1, "geometry", "" ]
[ "sys", "broadcast", 0, "inet", "create function \"broadcast\"
(p inet) returns inet \n\texternal name inet.\"broadcast\";" ]
@@ -176,26 +191,60 @@ Ready.
[ "sys", "date_to_str", 0, "clob", "create function date_to_str(d
date, format string) returns string\n\texternal name mtime.\"date_to_str\";"
]
[ "sys", "date_to_str", 1, "date", "" ]
[ "sys", "date_to_str", 2, "clob", "" ]
-[ "sys", "db_users", 0, "table", "CREATE FUNCTION
db_users () RETURNS TABLE( name varchar(2048)) EXTERNAL NAME sql.db_users;" ]
+[ "sys", "db_users", 0, "varchar", "CREATE FUNCTION
db_users () RETURNS TABLE( name varchar(2048)) EXTERNAL NAME sql.db_users;" ]
[ "sys", "degrees", 0, "double", "-- The contents of
this file are subject to the MonetDB Public License\n-- Version 1.1 (the
\"License\"); you may not use this file except in\n-- compliance with the
License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\ncreate function degrees(r double) \nreturns double\n\treturn
r*180/pi();" ]
[ "sys", "degrees", 1, "double", "" ]
-[ "sys", "dependencies_columns_on_functions", 0, "table",
"--Column c has a dependency on function f\ncreate function
dependencies_columns_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, f.name,
'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7);" ]
-[ "sys", "dependencies_columns_on_indexes", 0, "table",
"--Column c has a dependency on index i \ncreate function
dependencies_columns_on_indexes()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, i.name,
'DEP_INDEX' from columns as c, objects as kc, idxs as i where kc.\"name\" =
c.name and kc.id = i.id and c.table_id = i.table_id and i.name not in (select
name from keys));" ]
-[ "sys", "dependencies_columns_on_keys", 0, "table",
"--Column c has a dependency on key k\ncreate function
dependencies_columns_on_keys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, k.name,
'DEP_KEY' from columns as c, objects as kc, keys as k where kc.\"name\" =
c.name and kc.id = k.id and k.table_id = c.table_id and k.rkey = -1);" ]
-[ "sys", "dependencies_columns_on_triggers", 0, "table",
"--Column c has a dependency on trigger tri\ncreate function
dependencies_columns_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, tri.name,
'DEP_TRIGGER' from columns as c, triggers as tri, dependencies as dep where
dep.id = c.id and dep.depend_id =tri.id and dep.depend_type = 8);" ]
-[ "sys", "dependencies_columns_on_views", 0, "table",
"--Column c has a dependency on view v\ncreate function
dependencies_columns_on_views()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, v.name,
'DEP_VIEW' from columns as c, tables as v, dependencies as dep where c.id =
dep.id and v.id = dep.depend_id and dep.depend_type = 5 and v.type = 1);" ]
-[ "sys", "dependencies_functions_on_functions", 0, "table",
"--Function f1 has a dependency on function f2\ncreate function
dependencies_functions_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select f1.name, f2.name,
'DEP_FUNC' from functions as f1, functions as f2, dependencies as dep where
f1.id = dep.id and f2.id = dep.depend_id and dep.depend_type = 7);" ]
-[ "sys", "dependencies_functions_os_triggers", 0, "table",
"--Function f1 has a dependency on trigger tri\ncreate function
dependencies_functions_os_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select f.name, tri.name,
'DEP_TRIGGER' from functions as f, triggers as tri, dependencies as dep where
dep.id = f.id and dep.depend_id =tri.id and dep.depend_type = 8);" ]
-[ "sys", "dependencies_keys_on_foreignkeys", 0, "table",
"--Key k has a dependency on foreign key fk\ncreate function
dependencies_keys_on_foreignkeys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select k.name, fk.name,
'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id);" ]
-[ "sys", "dependencies_owners_on_schemas", 0, "table",
"--User (owner) has a dependency in schema s\ncreate function
dependencies_owners_on_schemas()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select a.name, s.name,
'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id);" ]
-[ "sys", "dependencies_schemas_on_users", 0, "table",
"-- The contents of this file are subject to the MonetDB Public License\n--
Version 1.1 (the \"License\"); you may not use this file except in\n--
compliance with the License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\n--Schema s has a dependency on user u\ncreate function
dependencies_schemas_on_users()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (
select s.name, u.name, 'DEP_USER' from schemas as s, users u where
u.default_schema = s.id);" ]
-[ "sys", "dependencies_tables_on_foreignkeys", 0, "table",
"--Table t has a dependency on foreign key k\ncreate function
dependencies_tables_on_foreignkeys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, fk.name,
'DEP_FKEY' from tables as t, keys as k, keys as fk where fk.rkey = k.id and
k.table_id = t.id);" ]
-[ "sys", "dependencies_tables_on_functions", 0, "table",
"--Table t has a dependency on function f\ncreate function
dependencies_tables_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, f.name,
'DEP_FUNC' from functions as f, tables as t, dependencies as dep where t.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7 and t.type = 0);" ]
-[ "sys", "dependencies_tables_on_indexes", 0, "table",
"--Table t has a dependency on index i\ncreate function
dependencies_tables_on_indexes()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, i.name,
'DEP_INDEX' from tables as t, idxs as i where i.table_id = t.id and i.name not
in (select name from keys) and t.type = 0);" ]
-[ "sys", "dependencies_tables_on_triggers", 0, "table",
"--Table t has a dependency on trigger tri\n\ncreate function
dependencies_tables_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table ((select t.name, tri.name,
'DEP_TRIGGER' from tables as t, triggers as tri where tri.table_id = t.id)
union (select t.name, tri.name, 'DEP_TRIGGER' from triggers tri, tables t,
dependencies dep where dep.id = t.id and dep.depend_id =tri.id and
dep.depend_type = 8));" ]
-[ "sys", "dependencies_tables_on_views", 0, "table",
"--Table t has a dependency on view v\ncreate function
dependencies_tables_on_views()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, v.name,
'DEP_VIEW' from tables as t, tables as v, dependencies as dep where t.id =
dep.id and v.id = dep.depend_id and dep.depend_type = 5 and v.type = 1);" ]
-[ "sys", "dependencies_views_on_functions", 0, "table",
"--View v has a dependency on function f\ncreate function
dependencies_views_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select v.name, f.name,
'DEP_FUNC' from functions as f, tables as v, dependencies as dep where v.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7 and v.type = 1);" ]
-[ "sys", "dependencies_views_on_triggers", 0, "table",
"--View v has a dependency on trigger tri\ncreate function
dependencies_views_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select v.name, tri.name,
'DEP_TRIGGER' from tables as v, triggers as tri, dependencies as dep where
dep.id = v.id and dep.depend_id =tri.id and dep.depend_type = 8 and v.type =
1);" ]
+[ "sys", "dependencies_columns_on_functions", 0, "varchar",
"--Column c has a dependency on function f\ncreate function
dependencies_columns_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, f.name,
'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7);" ]
+[ "sys", "dependencies_columns_on_functions", 1, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_functions", 2, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_indexes", 0, "varchar",
"--Column c has a dependency on index i \ncreate function
dependencies_columns_on_indexes()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, i.name,
'DEP_INDEX' from columns as c, objects as kc, idxs as i where kc.\"name\" =
c.name and kc.id = i.id and c.table_id = i.table_id and i.name not in (select
name from keys));" ]
+[ "sys", "dependencies_columns_on_indexes", 1, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_indexes", 2, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_keys", 0, "varchar",
"--Column c has a dependency on key k\ncreate function
dependencies_columns_on_keys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, k.name,
'DEP_KEY' from columns as c, objects as kc, keys as k where kc.\"name\" =
c.name and kc.id = k.id and k.table_id = c.table_id and k.rkey = -1);" ]
+[ "sys", "dependencies_columns_on_keys", 1, "varchar", ""
]
+[ "sys", "dependencies_columns_on_keys", 2, "varchar", ""
]
+[ "sys", "dependencies_columns_on_triggers", 0, "varchar",
"--Column c has a dependency on trigger tri\ncreate function
dependencies_columns_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, tri.name,
'DEP_TRIGGER' from columns as c, triggers as tri, dependencies as dep where
dep.id = c.id and dep.depend_id =tri.id and dep.depend_type = 8);" ]
+[ "sys", "dependencies_columns_on_triggers", 1, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_triggers", 2, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_views", 0, "varchar",
"--Column c has a dependency on view v\ncreate function
dependencies_columns_on_views()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select c.name, v.name,
'DEP_VIEW' from columns as c, tables as v, dependencies as dep where c.id =
dep.id and v.id = dep.depend_id and dep.depend_type = 5 and v.type = 1);" ]
+[ "sys", "dependencies_columns_on_views", 1, "varchar",
"" ]
+[ "sys", "dependencies_columns_on_views", 2, "varchar",
"" ]
+[ "sys", "dependencies_functions_on_functions", 0, "varchar",
"--Function f1 has a dependency on function f2\ncreate function
dependencies_functions_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select f1.name, f2.name,
'DEP_FUNC' from functions as f1, functions as f2, dependencies as dep where
f1.id = dep.id and f2.id = dep.depend_id and dep.depend_type = 7);" ]
+[ "sys", "dependencies_functions_on_functions", 1, "varchar",
"" ]
+[ "sys", "dependencies_functions_on_functions", 2, "varchar",
"" ]
+[ "sys", "dependencies_functions_os_triggers", 0, "varchar",
"--Function f1 has a dependency on trigger tri\ncreate function
dependencies_functions_os_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select f.name, tri.name,
'DEP_TRIGGER' from functions as f, triggers as tri, dependencies as dep where
dep.id = f.id and dep.depend_id =tri.id and dep.depend_type = 8);" ]
+[ "sys", "dependencies_functions_os_triggers", 1, "varchar",
"" ]
+[ "sys", "dependencies_functions_os_triggers", 2, "varchar",
"" ]
+[ "sys", "dependencies_keys_on_foreignkeys", 0, "varchar",
"--Key k has a dependency on foreign key fk\ncreate function
dependencies_keys_on_foreignkeys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select k.name, fk.name,
'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id);" ]
+[ "sys", "dependencies_keys_on_foreignkeys", 1, "varchar",
"" ]
+[ "sys", "dependencies_keys_on_foreignkeys", 2, "varchar",
"" ]
+[ "sys", "dependencies_owners_on_schemas", 0, "varchar",
"--User (owner) has a dependency in schema s\ncreate function
dependencies_owners_on_schemas()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select a.name, s.name,
'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id);" ]
+[ "sys", "dependencies_owners_on_schemas", 1, "varchar",
"" ]
+[ "sys", "dependencies_owners_on_schemas", 2, "varchar",
"" ]
+[ "sys", "dependencies_schemas_on_users", 0, "varchar",
"-- The contents of this file are subject to the MonetDB Public License\n--
Version 1.1 (the \"License\"); you may not use this file except in\n--
compliance with the License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\n--Schema s has a dependency on user u\ncreate function
dependencies_schemas_on_users()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table
(select s.name, u.name, 'DEP_USER' from schemas as s, users u where
u.default_schema = s.id);" ]
+[ "sys", "dependencies_schemas_on_users", 1, "varchar",
"" ]
+[ "sys", "dependencies_schemas_on_users", 2, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_foreignkeys", 0, "varchar",
"--Table t has a dependency on foreign key k\ncreate function
dependencies_tables_on_foreignkeys()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, fk.name,
'DEP_FKEY' from tables as t, keys as k, keys as fk where fk.rkey = k.id and
k.table_id = t.id);" ]
+[ "sys", "dependencies_tables_on_foreignkeys", 1, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_foreignkeys", 2, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_functions", 0, "varchar",
"--Table t has a dependency on function f\ncreate function
dependencies_tables_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, f.name,
'DEP_FUNC' from functions as f, tables as t, dependencies as dep where t.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7 and t.type = 0);" ]
+[ "sys", "dependencies_tables_on_functions", 1, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_functions", 2, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_indexes", 0, "varchar",
"--Table t has a dependency on index i\ncreate function
dependencies_tables_on_indexes()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, i.name,
'DEP_INDEX' from tables as t, idxs as i where i.table_id = t.id and i.name not
in (select name from keys) and t.type = 0);" ]
+[ "sys", "dependencies_tables_on_indexes", 1, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_indexes", 2, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_triggers", 0, "varchar",
"--Table t has a dependency on trigger tri\n\ncreate function
dependencies_tables_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table ((select t.name, tri.name,
'DEP_TRIGGER' from tables as t, triggers as tri where tri.table_id = t.id)
union (select t.name, tri.name, 'DEP_TRIGGER' from triggers tri, tables t,
dependencies dep where dep.id = t.id and dep.depend_id =tri.id and
dep.depend_type = 8));" ]
+[ "sys", "dependencies_tables_on_triggers", 1, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_triggers", 2, "varchar",
"" ]
+[ "sys", "dependencies_tables_on_views", 0, "varchar",
"--Table t has a dependency on view v\ncreate function
dependencies_tables_on_views()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select t.name, v.name,
'DEP_VIEW' from tables as t, tables as v, dependencies as dep where t.id =
dep.id and v.id = dep.depend_id and dep.depend_type = 5 and v.type = 1);" ]
+[ "sys", "dependencies_tables_on_views", 1, "varchar", ""
]
+[ "sys", "dependencies_tables_on_views", 2, "varchar", ""
]
+[ "sys", "dependencies_views_on_functions", 0, "varchar",
"--View v has a dependency on function f\ncreate function
dependencies_views_on_functions()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select v.name, f.name,
'DEP_FUNC' from functions as f, tables as v, dependencies as dep where v.id =
dep.id and f.id = dep.depend_id and dep.depend_type = 7 and v.type = 1);" ]
+[ "sys", "dependencies_views_on_functions", 1, "varchar",
"" ]
+[ "sys", "dependencies_views_on_functions", 2, "varchar",
"" ]
+[ "sys", "dependencies_views_on_triggers", 0, "varchar",
"--View v has a dependency on trigger tri\ncreate function
dependencies_views_on_triggers()\nreturns table (sch varchar(100), usr
varchar(100), dep_type varchar(32))\nreturn table (select v.name, tri.name,
'DEP_TRIGGER' from tables as v, triggers as tri, dependencies as dep where
dep.id = v.id and dep.depend_id =tri.id and dep.depend_type = 8 and v.type =
1);" ]
+[ "sys", "dependencies_views_on_triggers", 1, "varchar",
"" ]
+[ "sys", "dependencies_views_on_triggers", 2, "varchar",
"" ]
[ "sys", "difference", 0, "geometry", "create function
difference(a geometry, b geometry) returns geometry external name
geom.\"Difference\";" ]
[ "sys", "difference", 1, "geometry", "" ]
[ "sys", "difference", 2, "geometry", "" ]
@@ -207,12 +256,12 @@ Ready.
[ "sys", "distance", 0, "double", "create function
distance(a geometry, b geometry) returns float external name
geom.\"Distance\";" ]
[ "sys", "distance", 1, "geometry", "" ]
[ "sys", "distance", 2, "geometry", "" ]
-[ "sys", "dropdictionary", 0, "clob", "create procedure
dropdictionary (s string, t string)\n external name sql.dropdictionary;" ]
-[ "sys", "dropdictionary", 1, "clob", "" ]
-[ "sys", "env", 0, "table", "CREATE FUNCTION env () RETURNS
TABLE( name varchar(1024), value varchar(2048)) EXTERNAL NAME
sql.sql_environment;" ]
+[ "sys", "env", 0, "varchar", "CREATE FUNCTION env () RETURNS
TABLE( name varchar(1024), value varchar(2048)) EXTERNAL NAME
sql.sql_environment;" ]
+[ "sys", "env", 1, "varchar", "" ]
[ "sys", "envelope", 0, "geometry", "create function
envelope(g geometry) returns geometry external name geom.\"Envelope\";" ]
[ "sys", "envelope", 1, "geometry", "" ]
-[ "sys", "environment", 0, "table", "-- The environment
table\ncreate function sys.environment()\n\treturns table (\"name\" string,
value string)\n\texternal name sql.sql_environment;" ]
+[ "sys", "environment", 0, "clob", "-- The environment
table\ncreate function sys.environment()\n\treturns table (\"name\" string,
value string)\n\texternal name sql.sql_environment;" ]
+[ "sys", "environment", 1, "clob", "" ]
[ "sys", "equals", 0, "boolean", "-- ogc spatial
relation methods\ncreate function equals(a geometry, b geometry) returns
boolean external name geom.\"Equals\";" ]
[ "sys", "equals", 1, "geometry", "" ]
[ "sys", "equals", 2, "geometry", "" ]
@@ -269,6 +318,9 @@ Ready.
[ "sys", "gzexpand", 1, "clob", "" ]
[ "sys", "gztruncate", 0, "clob", "-- Truncate the storage for
columns with a compressed image\ncreate procedure gztruncate (s string, t
string)\n external name sql.gztruncate;" ]
[ "sys", "gztruncate", 1, "clob", "" ]
+[ "sys", "hashsize", 0, "bigint", "create function
sys.hashsize(b boolean, i bigint)\nreturns bigint\nbegin\n\t-- assume
non-compound keys\n\tif b = true\n\tthen\n\t\treturn 8 * i;\n\tend
if;\n\treturn 0;\nend;" ]
+[ "sys", "hashsize", 1, "boolean", "" ]
+[ "sys", "hashsize", 2, "bigint", "" ]
[ "sys", "heapsize", 0, "bigint", "create function
sys.heapsize(tpe string, i bigint, w int)\nreturns bigint\nbegin\n\tif tpe <>
'varchar' and tpe <> 'clob'\n\tthen\n\t\treturn 0;\n\tend if;\n\treturn 10240 +
i * w;\nend;" ]
[ "sys", "heapsize", 1, "clob", "" ]
[ "sys", "heapsize", 2, "bigint", "" ]
@@ -280,9 +332,9 @@ Ready.
[ "sys", "ilike", 0, "clob", "create filter function
\"ilike\"(val string, pat string, esc string) external name
algebra.ilikesubselect;" ]
[ "sys", "ilike", 1, "clob", "" ]
[ "sys", "ilike", 2, "clob", "" ]
-[ "sys", "indexsize", 0, "bigint", "create function
sys.indexsize(b boolean, i bigint)\nreturns bigint\nbegin\n\t-- assume
non-compound keys\n\tif b = true\n\tthen\n\t\treturn 8 * i;\n\tend
if;\n\treturn 0;\nend;" ]
-[ "sys", "indexsize", 1, "boolean", "" ]
-[ "sys", "indexsize", 2, "bigint", "" ]
+[ "sys", "imprintsize", 0, "bigint", "create function
sys.imprintsize(i bigint, nme string)\nreturns bigint\nbegin\n\tif nme =
'boolean'\n\t\tor nme = 'tinyint'\n\t\tor nme = 'smallint'\n\t\tor nme =
'int'\t\n\t\tor nme = 'bigint'\t\n\t\tor nme = 'decimal'\t\n\t\tor nme =
'date'\n\t\tor nme = 'timestamp'\n\t\tor nme = 'real'\n\t\tor nme =
'double'\n\tthen\n\t\treturn cast( i * 0.12 as bigint);\n\tend if ;\n\treturn
0;\nend;" ]
+[ "sys", "imprintsize", 1, "bigint", "" ]
+[ "sys", "imprintsize", 2, "clob", "" ]
[ "sys", "intersection", 0, "geometry", "create function
intersection(a geometry, b geometry) returns geometry external name
geom.\"Intersection\";" ]
[ "sys", "intersection", 1, "geometry", "" ]
[ "sys", "intersection", 2, "geometry", "" ]
@@ -362,8 +414,6 @@ Ready.
[ "sys", "netmask", 1, "inet", "" ]
[ "sys", "network", 0, "inet", "create function \"network\" (p
inet) returns inet\n\texternal name inet.\"network\";" ]
[ "sys", "network", 1, "inet", "" ]
-[ "sys", "newdictionary", 0, "clob", "-- The contents of
this file are subject to the MonetDB Public License\n-- Version 1.1 (the
\"License\"); you may not use this file except in\n-- compliance with the
License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\ncreate procedure newdictionary (s string, t string)\n external
name sql.newdictionary;" ]
-[ "sys", "newdictionary", 1, "clob", "" ]
[ "sys", "newurl", 0, "url", "create function
newurl(protocol string, hostname string, \"port\" int, file string) \n\treturns
url \n\texternal name url.\"new\";" ]
[ "sys", "newurl", 1, "clob", "" ]
[ "sys", "newurl", 2, "clob", "" ]
@@ -373,8 +423,11 @@ Ready.
[ "sys", "newurl", 1, "clob", "" ]
[ "sys", "newurl", 2, "clob", "" ]
[ "sys", "newurl", 3, "clob", "" ]
-[ "sys", "optimizer_stats", 0, "table", "-- The
contents of this file are subject to the MonetDB Public License\n-- Version 1.1
(the \"License\"); you may not use this file except in\n-- compliance with the
License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\n-- show the optimizer statistics maintained by the SQL
frontend\ncreate function sys.optimizer_stats () \n\treturns table (rewrite
string, count int) \n\texternal name sql.dump_opt_stats;" ]
-[ "sys", "optimizers", 0, "table", "-- MONETDB KERNEL
SECTION\n-- optimizer pipe catalog\ncreate function sys.optimizers ()
\n\treturns table (name string, def string, status string)\n\texternal name
sql.optimizers;" ]
+[ "sys", "optimizer_stats", 0, "clob", "-- The contents of
this file are subject to the MonetDB Public License\n-- Version 1.1 (the
\"License\"); you may not use this file except in\n-- compliance with the
License. You may obtain a copy of the License at\n--
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under
the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY
KIND, either express or implied. See the\n-- License for the specific language
governing rights and limitations\n-- under the License.\n--\n-- The Original
Code is the MonetDB Database System.\n--\n-- The Initial Developer of the
Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July
2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights
Reserved.\n\n-- show the optimizer statistics maintained by the SQL
frontend\ncreate function sys.optimizer_stats () \n\treturns table (rewrite
string, count int) \n\texternal name sql.dump_opt_stats;" ]
+[ "sys", "optimizer_stats", 1, "int", "" ]
+[ "sys", "optimizers", 0, "clob", "-- MONETDB KERNEL SECTION\n--
optimizer pipe catalog\ncreate function sys.optimizers () \n\treturns table
(name string, def string, status string)\n\texternal name sql.optimizers;" ]
+[ "sys", "optimizers", 1, "clob", "" ]
+[ "sys", "optimizers", 2, "clob", "" ]
[ "sys", "overlaps", 0, "boolean", "create function
overlaps(a geometry, b geometry) returns boolean external name
geom.\"Overlaps\";" ]
[ "sys", "overlaps", 1, "geometry", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
