Changeset: 0a8a327a33b5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a8a327a33b5 Modified Files: sql/test/Tests/systemfunctions_bam.stable.out.int128 Branch: default Log Message:
approved output diffs (127 lines): diff --git a/sql/test/Tests/systemfunctions_bam.stable.out.int128 b/sql/test/Tests/systemfunctions_bam.stable.out.int128 --- a/sql/test/Tests/systemfunctions_bam.stable.out.int128 +++ b/sql/test/Tests/systemfunctions_bam.stable.out.int128 @@ -135,6 +135,8 @@ Ready. [ "sys", "Intersect", 0, "boolean", "create function \"Intersect\"(a geometry, b geometry) returns boolean external name geom.\"Intersect\";" ] [ "sys", "Intersect", 1, "geometry", "" ] [ "sys", "Intersect", 2, "geometry", "" ] +[ "sys", "Intersect", 0, "geometry", "create filter function \"Intersect\"(a geometry, b geometry) external name geom.\"Intersect\";" ] +[ "sys", "Intersect", 1, "geometry", "" ] [ "sys", "Union", 0, "geometry", "create function \"Union\"(a geometry, b geometry) returns geometry external name geom.\"Union\";" ] [ "sys", "Union", 1, "geometry", "" ] [ "sys", "Union", 2, "geometry", "" ] @@ -196,6 +198,15 @@ Ready. [ "sys", "contains", 0, "boolean", "create function contains(a geometry, b geometry) returns boolean external name geom.\"Contains\";" ] [ "sys", "contains", 1, "geometry", "" ] [ "sys", "contains", 2, "geometry", "" ] +[ "sys", "contains", 0, "boolean", "create function contains(a geometry, x double, y double) returns boolean external name geom.\"Contains\";" ] +[ "sys", "contains", 1, "geometry", "" ] +[ "sys", "contains", 2, "double", "" ] +[ "sys", "contains", 3, "double", "" ] +[ "sys", "contains", 0, "geometry", "create filter function contains(a geometry, b geometry) external name geom.\"Contains\";" ] +[ "sys", "contains", 1, "geometry", "" ] +[ "sys", "contains", 0, "geometry", "create filter function contains(a geometry, x double, y double) external name geom.\"Contains\";" ] +[ "sys", "contains", 1, "double", "" ] +[ "sys", "contains", 2, "double", "" ] [ "sys", "convexhull", 0, "geometry", "create function convexhull(a geometry) returns geometry external name geom.\"ConvexHull\";" ] [ "sys", "convexhull", 1, "geometry", "" ] [ "sys", "corr", 0, "tinyint", "create aggregate corr(e1 tinyint, e2 tinyint) returns tinyint\n\texternal name \"aggr\".\"corr\";" ] @@ -225,6 +236,8 @@ Ready. [ "sys", "crosses", 0, "boolean", "create function crosses(a geometry, b geometry) returns boolean external name geom.\"Crosses\";" ] [ "sys", "crosses", 1, "geometry", "" ] [ "sys", "crosses", 2, "geometry", "" ] +[ "sys", "crosses", 0, "geometry", "create filter function crosses(a geometry, b geometry) external name geom.\"Crosses\";" ] +[ "sys", "crosses", 1, "geometry", "" ] [ "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", "" ] @@ -290,6 +303,8 @@ Ready. [ "sys", "disjoint", 0, "boolean", "create function disjoint(a geometry, b geometry) returns boolean external name geom.\"Disjoint\";" ] [ "sys", "disjoint", 1, "geometry", "" ] [ "sys", "disjoint", 2, "geometry", "" ] +[ "sys", "disjoint", 0, "geometry", "create filter function disjoint(a geometry, b geometry) external name geom.\"Disjoint\";" ] +[ "sys", "disjoint", 1, "geometry", "" ] [ "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", "" ] @@ -299,9 +314,17 @@ Ready. [ "sys", "envelope", 1, "geometry", "" ] [ "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", "epoch", 0, "timestamp", "-- 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-2015 MonetDB B.V.\n-- All Rights Reserved.\n\n-- assume milliseconds when converted to TIMESTAMP\ncreate function \"epoch\"(sec bigint) returns timestamp\n external name timestamp.\"epoch\";" ] +[ "sys", "epoch", 1, "bigint", "" ] +[ "sys", "epoch", 0, "timestamp", "create function \"epoch\"(sec int) returns timestamp\n\texternal name timestamp.\"epoch\";" ] +[ "sys", "epoch", 1, "int", "" ] +[ "sys", "epoch", 0, "int", "create function \"epoch\"(ts timestamp) returns int\n\texternal name timestamp.\"epoch\";" ] +[ "sys", "epoch", 1, "timestamp", "" ] [ "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", "" ] +[ "sys", "equals", 0, "geometry", "create filter function equals(a geometry, b geometry) external name geom.\"Equals\";" ] +[ "sys", "equals", 1, "geometry", "" ] [ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] @@ -412,9 +435,11 @@ Ready. [ "sys", "host", 1, "inet", "" ] [ "sys", "hostmask", 0, "inet", "create function \"hostmask\" (p inet) returns inet\n\texternal name inet.\"hostmask\";" ] [ "sys", "hostmask", 1, "inet", "" ] -[ "sys", "ilike", 0, "clob", "create filter function \"ilike\"(val string, pat string, esc string) external name algebra.ilikesubselect;" ] +[ "sys", "ilike", 0, "clob", "create filter function \"ilike\"(val string, pat string, esc string) external name algebra.\"ilike\";" ] [ "sys", "ilike", 1, "clob", "" ] [ "sys", "ilike", 2, "clob", "" ] +[ "sys", "ilike", 0, "clob", "create filter function \"ilike\"(val string, pat string) external name algebra.\"ilike\";" ] +[ "sys", "ilike", 1, "clob", "" ] [ "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 = 'hugeint'\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", "" ] @@ -433,9 +458,11 @@ Ready. [ "sys", "issimple", 1, "geometry", "" ] [ "sys", "length", 0, "double", "create function length(g geometry) returns float external name geom.\"Length\";" ] [ "sys", "length", 1, "geometry", "" ] -[ "sys", "like", 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-2015 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate filter function \"like\"(val string, pat string, esc string) external name algebra.likesubselect;" ] +[ "sys", "like", 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-2015 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate filter function \"like\"(val string, pat string, esc string) external name algebra.\"like\";" ] [ "sys", "like", 1, "clob", "" ] [ "sys", "like", 2, "clob", "" ] +[ "sys", "like", 0, "clob", "create filter function \"like\"(val string, pat string) external name algebra.\"like\";" ] +[ "sys", "like", 1, "clob", "" ] [ "sys", "linefromtext", 0, "linestring", "create function linefromtext(wkt string, srid smallint) returns linestring external name geom.\"LineFromText\";" ] [ "sys", "linefromtext", 1, "clob", "" ] [ "sys", "linefromtext", 2, "smallint", "" ] @@ -518,6 +545,8 @@ Ready. [ "sys", "overlaps", 0, "boolean", "create function overlaps(a geometry, b geometry) returns boolean external name geom.\"Overlaps\";" ] [ "sys", "overlaps", 1, "geometry", "" ] [ "sys", "overlaps", 2, "geometry", "" ] +[ "sys", "overlaps", 0, "geometry", "create filter function overlaps(a geometry, b geometry) external name geom.\"Overlaps\";" ] +[ "sys", "overlaps", 1, "geometry", "" ] [ "sys", "password_hash", 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-2015 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate function sys.password_hash (username string) \n\treturns string \n\texternal name sql.password;" ] [ "sys", "password_hash", 1, "clob", "" ] [ "sys", "pause", 0, "int", "-- operations to manipulate the state of havoc queries\ncreate procedure sys.pause(tag int)\nexternal name sql.sysmon_pause;" ] @@ -605,6 +634,9 @@ Ready. [ "sys", "relate", 1, "geometry", "" ] [ "sys", "relate", 2, "geometry", "" ] [ "sys", "relate", 3, "clob", "" ] +[ "sys", "relate", 0, "geometry", "create filter function relate(a geometry, b geometry, pattern string) external name geom.\"Relate\";" ] +[ "sys", "relate", 1, "geometry", "" ] +[ "sys", "relate", 2, "clob", "" ] [ "sys", "resume", 0, "int", "create procedure sys.resume(tag int)\nexternal name sql.sysmon_resume;" ] [ "sys", "resume", 0, "bigint", "create procedure sys.resume(tag bigint)\nexternal name sql.sysmon_resume;" ] [ "sys", "reuse", 0, "clob", "create procedure reuse(sys string, tab string)\n\texternal name sql.reuse;" ] @@ -710,6 +742,8 @@ Ready. [ "sys", "touches", 0, "boolean", "create function touches(a geometry, b geometry) returns boolean external name geom.\"Touches\";" ] [ "sys", "touches", 1, "geometry", "" ] [ "sys", "touches", 2, "geometry", "" ] +[ "sys", "touches", 0, "geometry", "create filter function touches(a geometry, b geometry) external name geom.\"Touches\";" ] +[ "sys", "touches", 1, "geometry", "" ] [ "sys", "tracelog", 0, "int", "-- 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-2015 MonetDB B.V.\n-- All Rights Reserved.\n\n-- make the offline tracing table available for inspection\ncreate function sys.tracelog() \n\treturns table (\n\t\tevent integer,\t\t-- event counter\n\t\tclk varchar(20), \t-- wallclock, no mtime i n kernel\n\t\tpc varchar(50), \t-- module.function[nr]\n\t\tthread int, \t\t-- thread identifier\n\t\t\"user\" int, \t\t-- user identifier\n\t\tticks bigint, \t\t-- time in microseconds\n\t\treads bigint, \t\t-- number of blocks read\n\t\twrites bigint, \t-- number of blocks written\n\t\trbytes bigint,\t\t-- amount of bytes touched\n\t\twbytes bigint,\t\t-- amount of bytes written\n\t\ttype string,\t\t-- return types\n\t\tstmt string\t\t\t-- actual statement executed\n\t)\n\texternal name sql.dump_trace;" ] [ "sys", "tracelog", 1, "varchar", "" ] [ "sys", "tracelog", 2, "varchar", "" ] @@ -773,6 +807,8 @@ Ready. [ "sys", "within", 0, "boolean", "create function within(a geometry, b geometry) returns boolean external name geom.\"Within\";" ] [ "sys", "within", 1, "geometry", "" ] [ "sys", "within", 2, "geometry", "" ] +[ "sys", "within", 0, "geometry", "create filter function within(a geometry, b geometry) external name geom.\"Within\";" ] +[ "sys", "within", 1, "geometry", "" ] [ "sys", "x", 0, "double", "create function x(g geometry) returns double external name geom.\"X\";" ] [ "sys", "x", 1, "geometry", "" ] [ "sys", "y", 0, "double", "create function y(g geometry) returns double external name geom.\"Y\";" ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
