Changeset: 61b44d1fea38 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61b44d1fea38 Modified Files: sql/backends/monet5/UDF/udf/80_udf.sql sql/backends/monet5/UDF/udf/80_udf_hge.sql sql/backends/monet5/vaults/bam/85_bam.sql sql/backends/monet5/vaults/fits/72_fits.sql sql/backends/monet5/vaults/lidar/75_lidar.sql sql/backends/monet5/vaults/netcdf/74_netcdf.sql sql/backends/monet5/vaults/shp/75_shp.sql Branch: system-functions Log Message:
system function diffs (146 lines): diff --git a/sql/backends/monet5/UDF/udf/80_udf.sql b/sql/backends/monet5/UDF/udf/80_udf.sql --- a/sql/backends/monet5/UDF/udf/80_udf.sql +++ b/sql/backends/monet5/UDF/udf/80_udf.sql @@ -8,18 +8,18 @@ -- Reverse a string -create function reverse(src string) +create system function reverse(src string) returns string external name udf.reverse; -- fuse two (1-byte) tinyint values into one (2-byte) smallint value -create function fuse(one tinyint, two tinyint) +create system 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) +create system 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) +create system function fuse(one integer, two integer) returns bigint external name udf.fuse; diff --git a/sql/backends/monet5/UDF/udf/80_udf_hge.sql b/sql/backends/monet5/UDF/udf/80_udf_hge.sql --- a/sql/backends/monet5/UDF/udf/80_udf_hge.sql +++ b/sql/backends/monet5/UDF/udf/80_udf_hge.sql @@ -8,5 +8,5 @@ -- fuse two (8-byte) integer values into one (16-byte) bigint value -create function fuse(one bigint, two bigint) +create system function fuse(one bigint, two bigint) returns hugeint external name udf.fuse; diff --git a/sql/backends/monet5/vaults/bam/85_bam.sql b/sql/backends/monet5/vaults/bam/85_bam.sql --- a/sql/backends/monet5/vaults/bam/85_bam.sql +++ b/sql/backends/monet5/vaults/bam/85_bam.sql @@ -6,39 +6,39 @@ CREATE SCHEMA bam; -CREATE PROCEDURE bam.bam_loader_repos(bam_repos STRING, dbschema SMALLINT) +CREATE SYSTEM PROCEDURE bam.bam_loader_repos(bam_repos STRING, dbschema SMALLINT) EXTERNAL NAME bam.bam_loader_repos; -CREATE PROCEDURE bam.bam_loader_files(bam_files STRING, dbschema SMALLINT) +CREATE SYSTEM PROCEDURE bam.bam_loader_files(bam_files STRING, dbschema SMALLINT) EXTERNAL NAME bam.bam_loader_files; -CREATE PROCEDURE bam.bam_loader_file(bam_file STRING, dbschema SMALLINT) +CREATE SYSTEM PROCEDURE bam.bam_loader_file(bam_file STRING, dbschema SMALLINT) EXTERNAL NAME bam.bam_loader_file; -CREATE PROCEDURE bam.bam_drop_file(file_id BIGINT, dbschema SMALLINT) +CREATE SYSTEM PROCEDURE bam.bam_drop_file(file_id BIGINT, dbschema SMALLINT) EXTERNAL NAME bam.bam_drop_file; -CREATE FUNCTION bam.bam_flag(flag SMALLINT, name STRING) +CREATE SYSTEM FUNCTION bam.bam_flag(flag SMALLINT, name STRING) RETURNS BOOLEAN EXTERNAL NAME bam.bam_flag; -CREATE FUNCTION bam.reverse_seq(seq STRING) +CREATE SYSTEM FUNCTION bam.reverse_seq(seq STRING) RETURNS STRING EXTERNAL NAME bam.reverse_seq; -CREATE FUNCTION bam.reverse_qual(qual STRING) +CREATE SYSTEM FUNCTION bam.reverse_qual(qual STRING) RETURNS STRING EXTERNAL NAME bam.reverse_qual; -CREATE FUNCTION bam.seq_length(cigar STRING) +CREATE SYSTEM FUNCTION bam.seq_length(cigar STRING) RETURNS INT EXTERNAL NAME bam.seq_length; -CREATE FUNCTION bam.seq_char(ref_pos INT, alg_seq STRING, alg_pos INT, alg_cigar STRING) +CREATE SYSTEM FUNCTION bam.seq_char(ref_pos INT, alg_seq STRING, alg_pos INT, alg_cigar STRING) RETURNS CHAR(1) EXTERNAL NAME bam.seq_char; -CREATE PROCEDURE bam.sam_export(output_path STRING) +CREATE SYSTEM PROCEDURE bam.sam_export(output_path STRING) EXTERNAL NAME bam.sam_export; -CREATE PROCEDURE bam.bam_export(output_path STRING) +CREATE SYSTEM PROCEDURE bam.bam_export(output_path STRING) EXTERNAL NAME bam.bam_export; diff --git a/sql/backends/monet5/vaults/fits/72_fits.sql b/sql/backends/monet5/vaults/fits/72_fits.sql --- a/sql/backends/monet5/vaults/fits/72_fits.sql +++ b/sql/backends/monet5/vaults/fits/72_fits.sql @@ -1,6 +1,6 @@ -create procedure listdir(dirname string) external name fits.listdir; -create procedure fitsattach(fname string) external name fits.attach; -create procedure fitsload(tname string) external name fits.load; -create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; +create system procedure listdir(dirname string) external name fits.listdir; +create system procedure fitsattach(fname string) external name fits.attach; +create system procedure fitsload(tname string) external name fits.load; +create system procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; diff --git a/sql/backends/monet5/vaults/lidar/75_lidar.sql b/sql/backends/monet5/vaults/lidar/75_lidar.sql --- a/sql/backends/monet5/vaults/lidar/75_lidar.sql +++ b/sql/backends/monet5/vaults/lidar/75_lidar.sql @@ -1,3 +1,3 @@ -create procedure lidarattach(fname string) external name lidar.attach; -create procedure lidarload(tname string) external name lidar.load; -create procedure lidarexport(tname string, fname string, format string) external name lidar.export; +create system procedure lidarattach(fname string) external name lidar.attach; +create system procedure lidarload(tname string) external name lidar.load; +create system procedure lidarexport(tname string, fname string, format string) external name lidar.export; diff --git a/sql/backends/monet5/vaults/netcdf/74_netcdf.sql b/sql/backends/monet5/vaults/netcdf/74_netcdf.sql --- a/sql/backends/monet5/vaults/netcdf/74_netcdf.sql +++ b/sql/backends/monet5/vaults/netcdf/74_netcdf.sql @@ -41,12 +41,12 @@ create table netcdf_attrs( -- used for groups in HDF5 files -- global attributes have obj_name="" --- create function netcdfvar (fname varchar(256)) +-- create system function netcdfvar (fname varchar(256)) -- returns int external name netcdf.test; -create procedure netcdf_attach(fname varchar(256)) +create system procedure netcdf_attach(fname varchar(256)) external name netcdf.attach; -create procedure netcdf_importvar(fid integer, varnname varchar(256)) +create system procedure netcdf_importvar(fid integer, varnname varchar(256)) external name netcdf.importvariable; grant select on netcdf_files to public; diff --git a/sql/backends/monet5/vaults/shp/75_shp.sql b/sql/backends/monet5/vaults/shp/75_shp.sql --- a/sql/backends/monet5/vaults/shp/75_shp.sql +++ b/sql/backends/monet5/vaults/shp/75_shp.sql @@ -4,6 +4,6 @@ -- -- Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. -create procedure SHPattach(fname string) external name shp.attach; -create procedure SHPload(fid integer) external name shp.import; -create procedure SHPload(fid integer, filter geometry) external name shp.import; +create system procedure SHPattach(fname string) external name shp.attach; +create system procedure SHPload(fid integer) external name shp.import; +create system procedure SHPload(fid integer, filter geometry) external name shp.import; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list