Changeset: f7ff246b90e2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7ff246b90e2 Added Files: gdk/gdk_hash.c gdk/gdk_hash.h sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat sql/server/rel_rel.c sql/server/rel_rel.h sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out sql/test/mergetables/Tests/part-elim.sql sql/test/mergetables/Tests/part-elim.stable.err sql/test/mergetables/Tests/part-elim.stable.out tools/merovingian/daemon/monetdbd.service.in Removed Files: gdk/gdk_search.h sql/test/Users/Tests/util.py Modified Files: MonetDB.spec buildtools/ChangeLog clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out configure.ag gdk/Makefile.ag gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_delta.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_project.c gdk/gdk_search.c gdk/gdk_storage.c java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/tests/Test_Dobjects.java java/tests/build.xml monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/mal/Tests/dynamicload.malC monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/mal_listing.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/remote03.stable.err monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/JPexample.malC monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/manifold2.stable.out.single monetdb5/optimizer/Tests/projectionchain.malC monetdb5/optimizer/Tests/projectionchain.stable.err monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_volcano.c sql/backends/monet5/generator/Tests/joins00.sql sql/backends/monet5/generator/Tests/joins01.sql sql/backends/monet5/generator/Tests/joins01.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_rdf_jgraph.c sql/backends/monet5/sql_rdf_rel.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/common/sql_changeset.c sql/include/sql_relation.h sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/jdbc/tests/Tests/Test_Rmetadata.stable.out sql/jdbc/tests/Tests/Test_Rsqldata.stable.out sql/server/Makefile.ag sql/server/rel_distribute.c sql/server/rel_distribute.h sql/server/rel_dump.c sql/server/rel_dump.h sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_planner.c sql/server/rel_planner.h sql/server/rel_prop.c sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_rdfscan.c sql/server/rel_remote.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_semantic.h sql/server/rel_sequence.c sql/server/rel_trans.c sql/server/rel_updates.c sql/server/rel_updates.h sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_scan.c sql/server/sql_scan.h sql/server/sql_semantic.h sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out sql/test/Tests/median_stdev.sql sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Users/Tests/changePasswordUser.SQL.py sql/test/Users/Tests/changeSchemaUser.SQL.py sql/test/Users/Tests/columnRights.SQL.py sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py sql/test/Users/Tests/grantMonetdb.SQL.py sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.SQL.py sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py sql/test/Users/Tests/grantRole.Bug-3772.SQL.py sql/test/Users/Tests/renameUser.SQL.py sql/test/Users/Tests/role.SQL.py sql/test/Users/Tests/schemaRights.SQL.py sql/test/Users/Tests/withGrantOption.SQL.py sql/test/mergetables/Tests/All sql/test/pg_regress/Tests/int8.sql sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/int8.stable.out.int128 testing/Mfilter.py testing/Mtest.py.in tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/connections.c tools/merovingian/daemon/connections.h tools/merovingian/daemon/merovingian.c Branch: rdf Log Message:
Merge with default branch (All benchmarks verified) diffs (truncated from 21625 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -776,6 +776,7 @@ systemd-tmpfiles --create %{_sysconfdir} %exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf %endif %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties +%{_unitdir}/monetdbd.service %{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql @@ -913,9 +914,6 @@ developer, but if you do want to test, t %files testing-python %defattr(-,root,root) -# at least F12 doesn't produce these -# %exclude %{_bindir}/*.pyc -# %exclude %{_bindir}/*.pyo %{_bindir}/Mapprove.py %{_bindir}/Mtest.py %dir %{python_sitelib}/MonetDBtesting diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog --- a/buildtools/ChangeLog +++ b/buildtools/ChangeLog @@ -1,3 +1,7 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Sat Jan 23 2016 Sjoerd Mullender <sjo...@acm.org> +- Implemented a systemd configuration file for a monetdbd.service + on Fedora. + diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -447,7 +447,6 @@ SELECT * FROM (SELECT p.* FROM "sys"."_c create view sys.environment as select * from sys.environment(); create view sys.optimizers as select * from sys.optimizers(); create view sys.querylog_calls as select * from sys.querylog_calls(); --- create table views for convenience create view sys.querylog_catalog as select * from sys.querylog_catalog(); create view sys.querylog_history as select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.io @@ -458,9 +457,6 @@ create view sys.sessions as select * fro create view sys."storage" as select * from sys."storage"(); create view sys.storagemodel as select * from sys.storagemodel(); SELECT "id", "name", "schema_id", "query", CAST(CASE WHEN "system" THEN "type" + 10 /* system table/view */ ELSE (CASE WHEN "commit_action" = 0 THEN "type" /* table/view */ ELSE "type" + 20 /* global temp table */ END) END AS SMALLINT) AS "type", "system", "commit_action", "access", CASE WHEN (NOT "system" AND "commit_action" > 0) THEN 1 ELSE 0 END AS "temporary" FROM "sys"."_tables" WHERE "type" <> 2 UNION ALL SELECT "id", "name", "schema_id", "query", CAST("type" + 30 /* local temp table */ AS SMALLINT) AS "type", "system", "commit_action", "access", 1 AS "temporary" FROM "tmp"."_tables"; --- A summary of the table storage requirement is is available as a table view. --- 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", sum(columnsize) as columnsize, @@ -483,11 +479,8 @@ create procedure sys.analyze(minmax int, external name sql.analyze; create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; --- ogc Spatial Analysis methods - create function area(g geometry) returns float external name geom."Area"; create function astext(g geometry) returns string external name geom."AsText"; --- The BAT buffer pool overview create function sys.bbp () returns table (id int, name string, ttype string, count bigint, refcnt int, lrefcnt int, @@ -498,25 +491,10 @@ create function boundary(g geometry) ret create function "broadcast" (p inet) returns inet external name inet."broadcast"; create function buffer(a geometry, distance float) returns geometry external name geom."Buffer"; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - --- (co) Arjen de Rijke, Bart Scheers --- Use statistical functions from gsl library - --- Calculate Chi squared probability create function sys.chi2prob(chi2 double, datapoints double) returns double external name gsl."chi2prob"; create procedure sys.clearrejects() external name sql.copy_rejects_clear; --- The predicted storage footprint of the complete database --- determines the amount of diskspace needed for persistent storage --- and the upperbound when all possible index structures are created. --- The storage requirement for foreign key joins is split amongst the participants. - create function sys.columnsize(nme string, i bigint, d bigint) returns bigint begin @@ -559,114 +537,69 @@ create function crosses(a geometry, b ge create function date_to_str(d date, format string) returns string external name mtime."date_to_str"; CREATE FUNCTION db_users () RETURNS TABLE( name varchar(2048)) EXTERNAL NAME sql.db_users; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - create function degrees(r double) returns double return r*180/pi(); ---Column c has a dependency on function f create function dependencies_columns_on_functions() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Column c has a dependency on index i create function dependencies_columns_on_indexes() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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)); ---Column c has a dependency on key k create function dependencies_columns_on_keys() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Column c has a dependency on trigger tri create function dependencies_columns_on_triggers() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Column c has a dependency on view v create function dependencies_columns_on_views() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Function f1 has a dependency on function f2 create function dependencies_functions_on_functions() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Function f1 has a dependency on trigger tri create function dependencies_functions_os_triggers() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Key k has a dependency on foreign key fk create function dependencies_keys_on_foreignkeys() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return table (select k.name, fk.name, 'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id); ---User (owner) has a dependency in schema s create function dependencies_owners_on_schemas() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return table (select a.name, s.name, 'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id); --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - ---Schema s has a dependency on user u create function dependencies_schemas_on_users() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return table (select s.name, u.name, 'DEP_USER' from schemas as s, users u where u.default_schema = s.id); ---Table t has a dependency on foreign key k create function dependencies_tables_on_foreignkeys() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Table t has a dependency on function f create function dependencies_tables_on_functions() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Table t has a dependency on index i create function dependencies_tables_on_indexes() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---Table t has a dependency on trigger tri - create function dependencies_tables_on_triggers() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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)); ---Table t has a dependency on view v create function dependencies_tables_on_views() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---View v has a dependency on function f create function dependencies_views_on_functions() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); ---View v has a dependency on trigger tri create function dependencies_views_on_triggers() returns table (sch varchar(100), usr varchar(100), dep_type varchar(32)) return 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); create function difference(a geometry, b geometry) returns geometry external name geom."Difference"; --- CREATE FUNCTION Point(g Geometry) RETURNS Point external name geom.point; --- CREATE FUNCTION Curve(g Geometry) RETURNS Curve external name geom.curve; --- CREATE FUNCTION LineString(g Geometry) RETURNS LineString external name geom.linestring; --- CREATE FUNCTION Surface(g Geometry) RETURNS Surface external name geom.surface; --- CREATE FUNCTION Polygon(g Geometry) RETURNS Polygon external name geom.polygon; - --- ogc basic methods 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 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 create function sys.environment() returns table ("name" string, value string) external name sql.sql_environment; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - --- assume milliseconds when converted to TIMESTAMP create function sys."epoch"(sec bigint) returns timestamp external name timestamp."epoch"; create function sys."epoch"(sec int) returns timestamp @@ -675,29 +608,17 @@ create function sys."epoch"(ts timestamp external name timestamp."epoch"; create function sys."epoch"(ts timestamp with time zone) returns int external name timestamp."epoch"; --- ogc spatial relation methods create function equals(a geometry, b geometry) returns boolean external name geom."Equals"; create procedure sys.evalalgebra( ra_stmt string, opt bool) external name sql."evalAlgebra"; create procedure fitsattach(fname string) external name fits.attach; create procedure fitsload(tname string) external name fits.load; --- fuse two (1-byte) tinyint values into one (2-byte) smallint value create function fuse(one tinyint, two tinyint) returns smallint external name udf.fuse; --- fuse two (2-byte) smallint values into one (4-byte) integer value create function fuse(one smallint, two smallint) returns integer external name udf.fuse; --- fuse two (4-byte) integer values into one (8-byte) bigint value create function fuse(one integer, two integer) returns bigint external name udf.fuse; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - --- (c) Author M.Kersten - create function sys.generate_series(first tinyint, last tinyint) returns table (value tinyint) external name generator.series; @@ -736,7 +657,6 @@ returns table (value timestamp) external name generator.series; create function geomcollectionfromtext(wkt string, srid smallint) returns multipolygon external name geom."GeomCollectionFromText"; create function geometrytypeid(g geometry) returns integer external name geom."GeometryTypeId"; --- The srid in the *FromText Functions is currently not used create function geomfromtext(wkt string, srid smallint) returns geometry external name geom."GeomFromText"; create function getanchor( theurl url ) returns string external name url."getAnchor"; @@ -767,7 +687,7 @@ create function getuser(theurl url) retu create function sys.hashsize(b boolean, i bigint) returns bigint begin - -- assume non-compound keys + if b = true then return 8 * i; @@ -822,12 +742,6 @@ create function "left_shift"(i1 inet, i2 create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; create function length(g geometry) returns float external name geom."Length"; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; create function linefromtext(wkt string, srid smallint) returns linestring external name geom."LineFromText"; @@ -837,20 +751,8 @@ create procedure listdir(dirname string) create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; create function "masklen" (p inet) returns int external name inet."masklen"; --- currently we only use mbr instead of --- Envelope():Geometry --- as that returns Geometry objects, and we prefer the explicit mbr's --- minimum bounding rectangle (mbr) create function mbr (g geometry) returns mbr external name geom.mbr; create function mbroverlaps(a mbr, b mbr) returns boolean external name geom."mbroverlaps"; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - --- (co) Arjen de Rijke - create function sys.md5(v string) returns string external name clients.md5sum; create aggregate median(val tinyint) returns tinyint @@ -891,12 +793,6 @@ returns string begin return cast(num as string); end; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - create function ms_stuff( s1 varchar(32), st int, len int, s3 varchar(32)) returns varchar(32) begin _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list