Changeset: 2a7dc4e8f896 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2a7dc4e8f896
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
debian/monetdb5-server.install
sql/ChangeLog
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
tools/mserver/mserver5.c
Branch: default
Log Message:
Do not package or load the opt_sql_append and udf modules.
diffs (truncated from 611 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -527,7 +527,6 @@ exit 0
%{_libdir}/monetdb5/lib_capi.so
%endif
%{_libdir}/monetdb5/lib_generator.so
-%{_libdir}/monetdb5/lib_udf.so
%doc %{_mandir}/man1/mserver5.1.gz
%dir %{_datadir}/doc/MonetDB
%docdir %{_datadir}/doc/MonetDB
@@ -832,6 +831,7 @@ rm -f %{buildroot}%{_libdir}/monetdb5/ru
rm -f %{buildroot}%{_libdir}/monetdb5/lib_run_*.so
rm -f %{buildroot}%{_libdir}/monetdb5/microbenchmark.mal
rm -f %{buildroot}%{_libdir}/monetdb5/lib_microbenchmark*.so
+rm -f %{buildroot}%{_libdir}/monetdb5/lib_udf*.so
rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -191,9 +191,9 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('run_' not in x) and
('microbenchmark' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('run_' not in x) and
('microbenchmark' not in x) and ('udf' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('run_' not in x) and ('microbenchmark' not in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('run_' not in x) and ('microbenchmark' not in
x) and ('udf' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -2,7 +2,6 @@ debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so.* usr/lib/x86_64-linux-gnu
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
-# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,run_*,sql}.so
+# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,run_*,sql,udf}.so
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_generator.so
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_udf.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Aug 23 2021 Sjoerd Mullender <[email protected]>
+- The example modules opt_sql_append and udf are no longer loaded by
+ default and no longer part of the binary release. If installed,
+ they can be loaded using the --loadmodule option.
+
* Wed Aug 11 2021 Sjoerd Mullender <[email protected]>
- The built-in SQL functions to produce a dump that were added as a
proof-of-concept in the previous release have been improved and are
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -166,11 +166,6 @@ sql_update_hugeint(Client c, mvc *sql, c
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
- /* 80_udf_hge.sql */
- pos += snprintf(buf + pos, bufsize - pos,
- "create function fuse(one bigint, two bigint)\n"
- "returns hugeint external name udf.fuse;\n");
-
/* 90_generator_hge.sql */
pos += snprintf(buf + pos, bufsize - pos,
"create function sys.generate_series(first hugeint,
\"limit\" hugeint)\n"
@@ -244,12 +239,11 @@ sql_update_hugeint(Client c, mvc *sql, c
"GRANT EXECUTE ON FUNCTION json.filter(json, hugeint)
TO PUBLIC;\n");
pos += snprintf(buf + pos, bufsize - pos,
- "update sys.functions set system = true where system <>
true and name in ('fuse') and schema_id = (select id from sys.schemas where
name = 'sys') and type = %d;\n"
"update sys.functions set system = true where system <>
true and name in ('generate_series') and schema_id = (select id from
sys.schemas where name = 'sys') and type = %d;\n"
"update sys.functions set system = true where system <>
true and name in ('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp',
'var_pop', 'covar_pop', 'median', 'median_avg', 'quantile', 'quantile_avg',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = %d;\n"
"update sys.functions set system = true where system <>
true and name in ('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp',
'var_pop', 'covar_pop', 'corr') and schema_id = (select id from sys.schemas
where name = 'sys') and type = %d;\n"
"update sys.functions set system = true where system <>
true and name = 'filter' and schema_id = (select id from sys.schemas where name
= 'json') and type = %d;\n",
- (int) F_FUNC, (int) F_UNION, (int) F_AGGR, (int)
F_ANALYTIC, (int) F_FUNC);
+ (int) F_UNION, (int) F_AGGR, (int) F_ANALYTIC, (int)
F_FUNC);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"%s\";\n",
prev_schema);
assert(pos < bufsize);
@@ -4175,6 +4169,11 @@ sql_update_default(Client c, mvc *sql, c
pos += snprintf(buf + pos, bufsize - pos,
"update sys._tables set system = true
where name in ('dump_create_roles', 'dump_create_users', 'dump_create_schemas',
'dump_add_schemas_to_users', 'dump_grant_user_privileges',
'dump_table_constraint_type', 'dump_table_grants', 'dump_column_grants',
'dump_function_grants', 'dump_indices', 'dump_column_defaults',
'dump_foreign_keys', 'dump_partition_tables', 'dump_sequences',
'dump_start_sequences', 'dump_functions', 'dump_tables', 'dump_triggers',
'dump_comments', 'dump_user_defined_types') AND schema_id = 2000;\n");
+ /* 80_udf.sql (removed) */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop function sys.reverse(string);\n"
+ "drop all function sys.fuse;\n");
+
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
err = SQLstatementIntern(c, buf, "update", true, false, NULL);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4143,8 +4143,6 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-create function fuse(one bigint, two bigint)
-returns hugeint external name udf.fuse;
create function sys.generate_series(first hugeint, "limit" hugeint)
returns table (value hugeint)
external name generator.series;
@@ -4208,7 +4206,6 @@ GRANT EXECUTE ON WINDOW corr(HUGEINT, HU
create function json.filter(js json, name hugeint)
returns json external name json.filter;
GRANT EXECUTE ON FUNCTION json.filter(json, hugeint) TO PUBLIC;
-update sys.functions set system = true where system <> true and name in
('fuse') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 1;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'median', 'median_avg', 'quantile', 'quantile_avg', 'corr') and schema_id =
(select id from sys.schemas where name = 'sys') and type = 3;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
@@ -4814,4 +4811,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4143,8 +4143,6 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-create function fuse(one bigint, two bigint)
-returns hugeint external name udf.fuse;
create function sys.generate_series(first hugeint, "limit" hugeint)
returns table (value hugeint)
external name generator.series;
@@ -4208,7 +4206,6 @@ GRANT EXECUTE ON WINDOW corr(HUGEINT, HU
create function json.filter(js json, name hugeint)
returns json external name json.filter;
GRANT EXECUTE ON FUNCTION json.filter(json, hugeint) TO PUBLIC;
-update sys.functions set system = true where system <> true and name in
('fuse') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 1;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'median', 'median_avg', 'quantile', 'quantile_avg', 'corr') and schema_id =
(select id from sys.schemas where name = 'sys') and type = 3;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
@@ -4814,4 +4811,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -597,4 +597,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -4143,8 +4143,6 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-create function fuse(one bigint, two bigint)
-returns hugeint external name udf.fuse;
create function sys.generate_series(first hugeint, "limit" hugeint)
returns table (value hugeint)
external name generator.series;
@@ -4208,7 +4206,6 @@ GRANT EXECUTE ON WINDOW corr(HUGEINT, HU
create function json.filter(js json, name hugeint)
returns json external name json.filter;
GRANT EXECUTE ON FUNCTION json.filter(json, hugeint) TO PUBLIC;
-update sys.functions set system = true where system <> true and name in
('fuse') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 1;
update sys.functions set system = true where system <> true and name in
('generate_series') and schema_id = (select id from sys.schemas where name =
'sys') and type = 5;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'median', 'median_avg', 'quantile', 'quantile_avg', 'corr') and schema_id =
(select id from sys.schemas where name = 'sys') and type = 3;
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
@@ -4814,4 +4811,6 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('dump_database') and schema_id = 2000 and type = 5;
update sys.functions set system = true where system <> true and name in
('dump_table_data') and schema_id = 2000 and type = 2;
update sys._tables set system = true where name in ('dump_create_roles',
'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users',
'dump_grant_user_privileges', 'dump_table_constraint_type',
'dump_table_grants', 'dump_column_grants', 'dump_function_grants',
'dump_indices', 'dump_column_defaults', 'dump_foreign_keys',
'dump_partition_tables', 'dump_sequences', 'dump_start_sequences',
'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments',
'dump_user_defined_types') AND schema_id = 2000;
+drop function sys.reverse(string);
+drop all function sys.fuse;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -178,7 +178,6 @@
\dSf sys."fitsattach"
\dSf sys."fitsload"
\dSf sys."fqn"
-\dSf sys."fuse"
\dSf sys."generate_series"
\dSf sys."geometrytype"
\dSf sys."get_merge_table_partition_expressions"
@@ -250,7 +249,6 @@
\dSf sys."replace_first"
\dSf sys."resume"
\dSf sys."resume_log_flushing"
-\dSf sys."reverse"
\dSf sys."right_shift"
\dSf sys."right_shift_assign"
\dSf sys."schema_guard"
@@ -612,7 +610,6 @@ SYSTEM PROCEDURE sys.fitsattach
SYSTEM PROCEDURE sys.fitsload
SYSTEM FUNCTION sys.floor
SYSTEM FUNCTION sys.fqn
-SYSTEM FUNCTION sys.fuse
SYSTEM FUNCTION sys.generate_series
SYSTEM FUNCTION sys.geometrytype
SYSTEM FUNCTION sys.get_merge_table_partition_expressions
@@ -763,7 +760,6 @@ SYSTEM FUNCTION sys.replace_firs
SYSTEM FUNCTION sys.restart
SYSTEM PROCEDURE sys.resume
SYSTEM PROCEDURE sys.resume_log_flushing
-SYSTEM FUNCTION sys.reverse
SYSTEM FUNCTION sys.right
SYSTEM FUNCTION sys.right_shift
SYSTEM FUNCTION sys.right_shift_assign
@@ -1164,9 +1160,6 @@ create procedure sys.evalalgebra(ra_stmt
create procedure fitsattach(fname string) external name fits.attach;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
