Changeset: 7b39adf76de7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b39adf76de7 Removed Files: sql/test/sys-schema/Tests/systemfunctions.sql sql/test/sys-schema/Tests/systemfunctions.stable.err sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 sql/test/sys-schema/Tests/systemfunctions.test Modified Files: sql/test/sys-schema/Tests/All Branch: default Log Message:
Removed systemfunctions test. It was redundant compared to the dump tests diffs (truncated from 8310 to 300 lines): diff --git a/sql/test/sys-schema/Tests/All b/sql/test/sys-schema/Tests/All --- a/sql/test/sys-schema/Tests/All +++ b/sql/test/sys-schema/Tests/All @@ -9,8 +9,6 @@ check_MaxStrLength_violations HAVE_GEOM?geom_tables_checks HAVE_NETCDF?netcdf_tables_checks -HAVE_FITS&HAVE_GEOM&HAVE_SHP&HAVE_NETCDF?systemfunctions - utilities HAVE_JDBCCLIENT_JAR?ValidateSystemCatalogTables diff --git a/sql/test/sys-schema/Tests/systemfunctions.sql b/sql/test/sys-schema/Tests/systemfunctions.sql deleted file mode 100644 --- a/sql/test/sys-schema/Tests/systemfunctions.sql +++ /dev/null @@ -1,6 +0,0 @@ -select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" - from sys.functions f, sys.schemas s, sys.args a - where s.id = f.schema_id - and f.id = a.func_id - and f.system - order by s.name, f.name, f.id, a.number; diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.err b/sql/test/sys-schema/Tests/systemfunctions.stable.err deleted file mode 100644 --- a/sql/test/sys-schema/Tests/systemfunctions.stable.err +++ /dev/null @@ -1,35 +0,0 @@ -stderr of test 'systemfunctions` in directory 'sql/test/sys-schema` itself: - - -# 16:20:24 > -# 16:20:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36066" "--set" "mapi_usock=/var/tmp/mtest-26153/.s.monetdb.36066" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test" "--set" "mal_listing=0" -# 16:20:24 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = yes -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 36066 -# cmdline opt mapi_usock = /var/tmp/mtest-26153/.s.monetdb.36066 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test -# cmdline opt mal_listing = 0 - -# 16:20:25 > -# 16:20:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-26153" "--port=36066" -# 16:20:25 > - - -# 16:20:25 > -# 16:20:25 > "Done." -# 16:20:25 > - diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out b/sql/test/sys-schema/Tests/systemfunctions.stable.out deleted file mode 100644 --- a/sql/test/sys-schema/Tests/systemfunctions.stable.out +++ /dev/null @@ -1,3860 +0,0 @@ -stdout of test 'systemfunctions` in directory 'sql/test/sys-schema` itself: - - -# 16:20:24 > -# 16:20:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36066" "--set" "mapi_usock=/var/tmp/mtest-26153/.s.monetdb.36066" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test" "--set" "mal_listing=0" -# 16:20:24 > - -# MonetDB 5 server v11.33.4 (hg id: e20e95cd4eff+) -# This is an unreleased version -# Serving database 'mTests_sql_test', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit integers -# Found 31.305 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36066/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-26153/.s.monetdb.36066 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -#select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" -# from sys.functions f, sys.schemas s, sys.args a -# where s.id = f.schema_id -# and f.id = a.func_id -# and f.system -# order by s.name, f.name, f.id, a.number; -% sys., sys., sys., sys., . # table_name -% schema, function, argno, argtype, definition # name -% varchar, varchar, int, varchar, varchar # type -% 8, 24, 2, 14, 695 # length -[ "json", "filter", 0, "json", "create function json.filter(js json, pathexpr string)\nreturns json external name json.filter;" ] -[ "json", "filter", 1, "json", "" ] -[ "json", "filter", 2, "clob", "" ] -[ "json", "filter", 0, "json", "create function json.filter(js json, name tinyint)\nreturns json external name json.filter;" ] -[ "json", "filter", 1, "json", "" ] -[ "json", "filter", 2, "tinyint", "" ] -[ "json", "filter", 0, "json", "create function json.filter(js json, name integer)\nreturns json external name json.filter;" ] -[ "json", "filter", 1, "json", "" ] -[ "json", "filter", 2, "int", "" ] -[ "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;" ] -[ "json", "isarray", 1, "json", "" ] -[ "json", "isobject", 0, "boolean", "create function json.isobject(js string)\nreturns bool external name json.isobject;" ] -[ "json", "isobject", 1, "clob", "" ] -[ "json", "isobject", 0, "boolean", "create function json.isobject(js json)\nreturns bool external name json.isobject;" ] -[ "json", "isobject", 1, "json", "" ] -[ "json", "isvalid", 0, "boolean", "create function json.isvalid(js string)\nreturns bool external name json.isvalid;" ] -[ "json", "isvalid", 1, "clob", "" ] -[ "json", "isvalid", 0, "boolean", "create function json.isvalid(js json)\nreturns bool external name json.isvalid;" ] -[ "json", "isvalid", 1, "json", "" ] -[ "json", "keyarray", 0, "json", "create function json.keyarray(js json)\nreturns json external name json.keyarray;" ] -[ "json", "keyarray", 1, "json", "" ] -[ "json", "length", 0, "int", "create 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", "" ] -[ "json", "text", 0, "clob", "create function json.text(js json)\nreturns string external name json.text;" ] -[ "json", "text", 1, "json", "" ] -[ "json", "tojsonarray", 0, "clob", "create aggregate json.tojsonarray( x string ) returns string external name aggr.jsonaggr;" ] -[ "json", "tojsonarray", 1, "clob", "" ] -[ "json", "tojsonarray", 0, "clob", "create aggregate json.tojsonarray( x double ) returns string external name aggr.jsonaggr;" ] -[ "json", "tojsonarray", 1, "double", "" ] -[ "json", "valuearray", 0, "json", "create function json.valuearray(js json)\nreturns json external name json.valuearray;" ] -[ "json", "valuearray", 1, "json", "" ] -[ "logging", "compinfo", 0, "int", "create function logging.compinfo()\nreturns table(\n\"id\" int,\n\"component\" string,\n\"log_level\" string\n)\nexternal name logging.compinfo;" ] -[ "logging", "compinfo", 1, "clob", "" ] -[ "logging", "compinfo", 2, "clob", "" ] -[ "logging", "resetcomplevel", 0, "clob", "create procedure logging.resetcomplevel(comp_id string)\nexternal name logging.resetcomplevel;" ] -[ "logging", "resetlayerlevel", 0, "clob", "create procedure logging.resetlayerlevel(layer_id string)\nexternal name logging.resetlayerlevel;" ] -[ "logging", "setadapter", 0, "clob", "create procedure logging.setadapter(adapter_id string)\nexternal name logging.setadapter;" ] -[ "logging", "setcomplevel", 0, "clob", "create procedure logging.setcomplevel(comp_id string, lvl_id string)\nexternal name logging.setcomplevel;" ] -[ "logging", "setcomplevel", 1, "clob", "" ] -[ "logging", "setflushlevel", 0, "clob", "create procedure logging.setflushlevel(lvl_id string)\nexternal name logging.setflushlevel;" ] -[ "logging", "setlayerlevel", 0, "clob", "create procedure logging.setlayerlevel(layer_id string, lvl_id string)\nexternal name logging.setlayerlevel;" ] -[ "logging", "setlayerlevel", 1, "clob", "" ] -[ "profiler", "getlimit", 0, "int", "create function profiler.getlimit() returns integer external name profiler.getlimit;" ] -[ "profiler", "setheartbeat", 0, "int", "create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat;" ] -[ "profiler", "setlimit", 0, "int", "create procedure profiler.setlimit(lim integer) external name profiler.setlimit;" ] -[ "sys", "<", 0, "boolean", "<" ] -[ "sys", "<", 1, "any", "" ] -[ "sys", "<", 2, "any", "" ] -[ "sys", "<=", 0, "boolean", "<=" ] -[ "sys", "<=", 1, "any", "" ] -[ "sys", "<=", 2, "any", "" ] -[ "sys", "<>", 0, "boolean", "!=" ] -[ "sys", "<>", 1, "any", "" ] -[ "sys", "<>", 2, "any", "" ] -[ "sys", "=", 0, "boolean", "=" ] -[ "sys", "=", 1, "any", "" ] -[ "sys", "=", 2, "any", "" ] -[ "sys", ">", 0, "boolean", ">" ] -[ "sys", ">", 1, "any", "" ] -[ "sys", ">", 2, "any", "" ] -[ "sys", ">=", 0, "boolean", ">=" ] -[ "sys", ">=", 1, "any", "" ] -[ "sys", ">=", 2, "any", "" ] -[ "sys", "abbrev", 0, "clob", "create function \"abbrev\" (p inet) returns clob\nexternal name inet.\"abbrev\";" ] -[ "sys", "abbrev", 1, "inet", "" ] -[ "sys", "abs", 0, "month_interval", "abs" ] -[ "sys", "abs", 1, "month_interval", "" ] -[ "sys", "abs", 0, "day_interval", "abs" ] -[ "sys", "abs", 1, "day_interval", "" ] -[ "sys", "abs", 0, "sec_interval", "abs" ] -[ "sys", "abs", 1, "sec_interval", "" ] -[ "sys", "abs", 0, "tinyint", "abs" ] -[ "sys", "abs", 1, "tinyint", "" ] -[ "sys", "abs", 0, "smallint", "abs" ] -[ "sys", "abs", 1, "smallint", "" ] -[ "sys", "abs", 0, "int", "abs" ] -[ "sys", "abs", 1, "int", "" ] -[ "sys", "abs", 0, "bigint", "abs" ] -[ "sys", "abs", 1, "bigint", "" ] -[ "sys", "abs", 0, "decimal", "abs" ] -[ "sys", "abs", 1, "decimal", "" ] -[ "sys", "abs", 0, "decimal", "abs" ] -[ "sys", "abs", 1, "decimal", "" ] -[ "sys", "abs", 0, "decimal", "abs" ] -[ "sys", "abs", 1, "decimal", "" ] -[ "sys", "abs", 0, "decimal", "abs" ] -[ "sys", "abs", 1, "decimal", "" ] -[ "sys", "abs", 0, "real", "abs" ] -[ "sys", "abs", 1, "real", "" ] -[ "sys", "abs", 0, "double", "abs" ] -[ "sys", "abs", 1, "double", "" ] -[ "sys", "acos", 0, "real", "acos" ] -[ "sys", "acos", 1, "real", "" ] -[ "sys", "acos", 0, "double", "acos" ] -[ "sys", "acos", 1, "double", "" ] -[ "sys", "all", 0, "any", "all" ] -[ "sys", "all", 1, "any", "" ] -[ "sys", "all", 0, "boolean", "all" ] -[ "sys", "all", 1, "boolean", "" ] -[ "sys", "all", 2, "boolean", "" ] -[ "sys", "all", 3, "boolean", "" ] -[ "sys", "allnotequal", 0, "boolean", "allnotequal" ] -[ "sys", "allnotequal", 1, "any", "" ] -[ "sys", "alpha", 0, "double", "create function alpha(pdec double, pradius double)\nreturns double external name sql.alpha;" ] -[ "sys", "alpha", 1, "double", "" ] -[ "sys", "alpha", 2, "double", "" ] -[ "sys", "analyze", 0, "int", "create procedure sys.analyze(minmax int, \"sample\" bigint)\nexternal name sql.analyze;" ] -[ "sys", "analyze", 1, "bigint", "" ] -[ "sys", "analyze", 0, "int", "create procedure sys.analyze(minmax int, \"sample\" bigint, sch string)\nexternal name sql.analyze;" ] -[ "sys", "analyze", 1, "bigint", "" ] -[ "sys", "analyze", 2, "clob", "" ] -[ "sys", "analyze", 0, "int", "create procedure sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string)\nexternal name sql.analyze;" ] -[ "sys", "analyze", 1, "bigint", "" ] -[ "sys", "analyze", 2, "clob", "" ] -[ "sys", "analyze", 3, "clob", "" ] -[ "sys", "analyze", 0, "int", "create procedure sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string, col string)\nexternal name sql.analyze;" ] -[ "sys", "analyze", 1, "bigint", "" ] -[ "sys", "analyze", 2, "clob", "" ] -[ "sys", "analyze", 3, "clob", "" ] -[ "sys", "analyze", 4, "clob", "" ] -[ "sys", "and", 0, "boolean", "and" ] -[ "sys", "and", 1, "boolean", "" ] -[ "sys", "and", 2, "boolean", "" ] -[ "sys", "any", 0, "boolean", "any" ] -[ "sys", "any", 1, "boolean", "" ] -[ "sys", "any", 2, "boolean", "" ] -[ "sys", "any", 3, "boolean", "" ] -[ "sys", "anyequal", 0, "boolean", "anyequal" ] -[ "sys", "anyequal", 1, "any", "" ] -[ "sys", "ascii", 0, "int", "ascii" ] -[ "sys", "ascii", 1, "char", "" ] -[ "sys", "ascii", 0, "int", "ascii" ] -[ "sys", "ascii", 1, "varchar", "" ] -[ "sys", "ascii", 0, "int", "ascii" ] -[ "sys", "ascii", 1, "clob", "" ] -[ "sys", "asin", 0, "real", "asin" ] -[ "sys", "asin", 1, "real", "" ] -[ "sys", "asin", 0, "double", "asin" ] -[ "sys", "asin", 1, "double", "" ] -[ "sys", "atan", 0, "real", "atan" ] -[ "sys", "atan", 1, "real", "" ] -[ "sys", "atan", 0, "real", "atan2" ] -[ "sys", "atan", 1, "real", "" ] -[ "sys", "atan", 2, "real", "" ] -[ "sys", "atan", 0, "double", "atan" ] -[ "sys", "atan", 1, "double", "" ] -[ "sys", "atan", 0, "double", "atan2" ] -[ "sys", "atan", 1, "double", "" ] -[ "sys", "atan", 2, "double", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "double", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "tinyint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "smallint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "int", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "bigint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "real", "" ] -[ "sys", "avg", 0, "decimal", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "decimal", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "decimal", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "decimal", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "month_interval", "avg" ] -[ "sys", "avg", 1, "month_interval", "" ] -[ "sys", "avg", 0, "day_interval", "avg" ] -[ "sys", "avg", 1, "day_interval", "" ] -[ "sys", "avg", 0, "sec_interval", "avg" ] -[ "sys", "avg", 1, "sec_interval", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "double", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "tinyint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "smallint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "int", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "bigint", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "real", "" ] -[ "sys", "avg", 0, "decimal", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
