MonetDB: default - Merge with Aug2018 branch.
Changeset: 6dd85dae2011 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6dd85dae2011 Modified Files: clients/mapiclient/mhelp.c Branch: default Log Message: Merge with Aug2018 branch. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rename-sql - Updated documentation for rename statements.
Changeset: 98652fbc203a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98652fbc203a Modified Files: clients/mapiclient/mhelp.c sql/server/sql_parser.y Branch: rename-sql Log Message: Updated documentation for rename statements. Also added missing tokens in token2string. diffs (50 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -41,7 +41,7 @@ typedef struct { const char *comments; } SQLhelp; -#define NUMBER_MAJOR_COMMANDS 74 // The number of major commands to show in case of no query +#define NUMBER_MAJOR_COMMANDS 75 // The number of major commands to show in case of no query SQLhelp sqlhelp[] = { // major commands @@ -52,9 +52,11 @@ SQLhelp sqlhelp[] = { "ALTER TABLE qname ALTER [ COLUMN ] ident SET [NOT] NULL\n" "ALTER TABLE qname ALTER [ COLUMN ] ident DROP DEFAULT\n" "ALTER TABLE qname ALTER [ COLUMN ] ident SET STORAGE {string | NULL}\n" +"ALTER TABLE qname ALTER [ COLUMN ] ident RENAME TO ident\n" "ALTER TABLE qname DROP [ COLUMN ] ident [ RESTRICT | CASCADE ]\n" "ALTER TABLE qname DROP CONSTRAINT ident [ RESTRICT | CASCADE ]\n" -"ALTER TABLE qname SET { { READ | INSERT } ONLY | READ WRITE }", +"ALTER TABLE qname SET { { READ | INSERT } ONLY | READ WRITE }\n" +"ALTER TABLE qname RENAME TO ident", "column_def,table_constraint", "See also https://www.monetdb.org/Documentation/SQLreference/Alter"}, {"ALTER MERGE TABLE", @@ -64,6 +66,11 @@ SQLhelp sqlhelp[] = { "ALTER TABLE qname SET TABLE qname AS PARTITION opt_partition_spec", "opt_partition_spec", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"}, + {"ALTER SCHEMA", +"", +"ALTER SCHEMA ident RENAME TO ident", +NULL, +"See also https://www.monetdb.org/Documentation/SQLreference/Alter"}, {"ALTER SEQUENCE", "", "ALTER SEQUENCE ident [ AS datatype] [ RESTART [WITH start]] [INCREMENT BY increment]\n" diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y --- a/sql/server/sql_parser.y +++ b/sql/server/sql_parser.y @@ -6488,6 +6488,9 @@ char *token2string(int token) SQL(PARTITION_RANGE); SQL(PARTITION_COLUMN); SQL(PARTITION_EXPRESSION); + SQL(RENAME_SCHEMA); + SQL(RENAME_TABLE); + SQL(RENAME_COLUMN); } return "unknown"; /* just needed for broken compilers ! */ } ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rename-sql - Merge with default
Changeset: 2f808bb6231a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f808bb6231a Modified Files: ChangeLog.Aug2018 MonetDB.spec clients/mapiclient/mhelp.c rpm.mk.in testing/Mtest.py.in Branch: rename-sql Log Message: Merge with default diffs (truncated from 376 to 300 lines): diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,2 +1,5 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Oct 10 2018 Sjoerd Mullender +- Some subtle dependencies between RPMs have been fixed. + diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -14,6 +14,10 @@ %global release %{buildno}%{?dist} +# This package contains monetdbd which is a (long running) daemon, so +# we need to harden: +%global _hardened_build 1 + # On RedHat Enterprise Linux and derivatives, if the Extra Packages # for Enterprise Linux (EPEL) repository is available, you can enable # its use by providing rpmbuild or mock with the "--with epel" option. @@ -739,10 +743,6 @@ used from the MAL level. Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# RHEL >= 7, and all current Fedora -Requires(post): %{_bindir}/systemd-tmpfiles -%endif %if (0%{?fedora} >= 22) %if %{with hugeint} Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} @@ -759,11 +759,6 @@ accelerators. It also has an SQL fronte This package contains the SQL frontend for MonetDB. If you want to use SQL with MonetDB, you will need to install this package. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%post SQL-server5 -systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf -%endif - %files SQL-server5 %defattr(-,root,root) %{_bindir}/monetdb @@ -771,7 +766,8 @@ systemd-tmpfiles --create %{_sysconfdir} %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora -%{_sysconfdir}/tmpfiles.d/monetdbd.conf +%dir %attr(775,monetdb,monetdb) /run/monetdb +%{_tmpfilesdir}/monetdbd.conf %{_unitdir}/monetdbd.service %else # RedHat Enterprise Linux < 7 @@ -908,6 +904,8 @@ do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : done +# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, +# %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : /usr/bin/systemctl try-restart monetdbd.service @@ -921,6 +919,8 @@ if [ $1 -eq 0 ] ; then do /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : done + # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, + # %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : if [ $active = active ]; then /usr/bin/systemctl start monetdbd.service @@ -943,11 +943,18 @@ fi # that causes it to report an internal error when compiling # testing/difflib.c. The work around is to not use -fstack-protector-strong. # The bug exhibits itself on CentOS 7 on AArch64. -if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then - # set CFLAGS before configure, so that this value gets used - CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -grecord-gcc-switches ' - export CFLAGS -fi +# Everywhere else, add -Wno-format-truncation to the compiler options +# to reduce the number of warnings during compilation. +%ifarch aarch64 +if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then + CFLAGS="${CFLAGS:-$(echo %optflags | sed 's/-fstack-protector-strong//')" +else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +fi +%else +CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +%endif +export CFLAGS %{configure} \ --enable-assert=no \ --enable-console=yes \ @@ -1017,10 +1024,23 @@ cd - %install %make_install -mkdir -p %{buildroot}%{_localstatedir}/MonetDB -mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm -mkdir -p %{buildroot}%{_localstatedir}/log/monetdb -mkdir -p %{buildroot}%{_localstatedir}/run/monetdb +# move file to correct location +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +mkdir -p %{buildroot}%{_tmpfilesdir} +mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} +rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d +%endif + +install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB +install -d -m
MonetDB: analytics - Updated window functions documentation.
Changeset: b7aa382ede3e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7aa382ede3e Modified Files: clients/mapiclient/mhelp.c Branch: analytics Log Message: Updated window functions documentation. diffs (95 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -250,7 +250,7 @@ SQLhelp sqlhelp[] = { "Give execution plan details", "EXPLAIN statement", NULL, -"See alsp https://www.monetdb.org/Documentation/Manuals/SQLreference/Explain"}, +"See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Explain"}, {"LOCAL_TIMESTAMP", "Built-in function", "LOCAL_TIMESTAMP [ '(' ')']", @@ -390,6 +390,7 @@ SQLhelp sqlhelp[] = { "SELECT [ ALL | DISTINCT [ ON ( expression [',' ...] ) ] ]\n" "[ '*' | expression [ [ AS ] output_name ] [',' ...] ]\n" "[ FROM from_item [',' ...] ]\n" +"[ WINDOW window_definition [',' ...] ]\n" "[ WHERE condition ]\n" "[ GROUP BY grouping_element ',', ...] ]\n" "[ HAVING condition [',' ...] ]\n" @@ -398,7 +399,7 @@ SQLhelp sqlhelp[] = { "[ LIMIT { count | param } ]\n" "[ OFFSET { count | param } ]\n" "[ SAMPLE size ]", -"with_list,expression", +"with_list,expression,window_definition", "See also https://www.monetdb.org/Documentation/SQLreference/TableExpressions"}, {"SET", "Assign a value to a variable or column", @@ -479,17 +480,10 @@ SQLhelp sqlhelp[] = { "[ident ':'] WHILE search_condition DO procedure_statement ... END WHILE [ident]", "search_condition,procedure_statement", "See also https://www.monetdb.org/Documentation/SQLreference/Flowofcontrol"}, - {"WINDOW", + {"WINDOW FUNCTIONS", "", -"{ RANK | DENSE_RANK | PERCENT_RANK | CUME_DIST } OVER window_name |\n" -"{ RANK | DENSE_RANK | PERCENT_RANK | CUME_DIST } OVER '('\n" -"[ window_name ] [ PARTITION BY column_ref ... ]\n" -"[ ORDER BY sort_spec]\n" -"{ ROWS | RANGE } { UNBOUNDED PRECEDING | value PRECEDING | CURRENT ROW }\n" -"[ BETWEEN { UNBOUNDED FOLLOWING | value FOLLOWING | UNBOUNDED PRECEDING | value PRECEDING | CURRENT ROW }\n" -" AND { UNBOUNDED FOLLOWING | value FOLLOWING | UNBOUNDED PRECEDING | value PRECEDING | CURRENT ROW } ]\n" -"[ EXCLUDING {CURRENT ROW | GROUP | TIES | NO OTHERS} ]", -NULL, +"{ window_aggregate_function | window_rank_function } OVER { ident | '(' window_specification ')' }", +"window_aggregate_function,window_rank_function,window_specification", "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/WindowFunctions"}, // The subgrammar rules @@ -792,6 +786,44 @@ SQLhelp sqlhelp[] = { "WHEN scalar_expression THEN procedure_statement ...", "procedure_statement", NULL}, + {"window_aggregate_function", +NULL, +"{ AVG '(' query_expression ')' | COUNT '(' [ '*' | query_expression ] ')' | MAX '(' query_expression ')'\n" +"| MIN '(' query_expression ')' | PROD '(' query_expression ')' | SUM '(' query_expression ')' }", +"query_expression", +NULL}, + {"window_bound", +NULL, +"{ UNBOUNDED FOLLOWING | query_expression FOLLOWING | UNBOUNDED PRECEDING | query_expression PRECEDING | CURRENT ROW }", +"query_expression", +NULL}, + {"window_definition", +NULL, +"ident AS '(' window_specification ')'", +"window_specification", +NULL}, + {"window_frame_start", +NULL, +"{ UNBOUNDED PRECEDING | query_expression PRECEDING | CURRENT ROW }", +"query_expression", +NULL}, + {"window_rank_function", +NULL, +"{ CUME_DIST '(' ')' | DENSE_RANK '(' ')' | FIRST_VALUE '(' query_expression ')'\n" +"| LAG '(' query_expression [ ',' query_expression [ ',' query_expression ] ] ')' | LAST_VALUE '(' query_expression ')'\n" +"| LEAD '(' query_expression [ ',' query_expression [ ',' query_expression ] ] ')'\n" +"| NTH_VALUE '(' query_expression ',' query_expression ')' | NTILE '(' query_expression ')'\n" +"| PERCENT_RANK '(' ')' | RANK '(' ')' | ROW_NUMBER '(' ')' }", +"query_expression", +NULL}, + {"window_specification", +NULL, +"[ PARTITION BY column_ref ... ]\n" +"[ ORDER BY sort_spec ]\n" +"[ { ROWS | RANGE | GROUPS } { window_frame_start | BETWEEN window_bound AND window_bound }\n" +" [ EXCLUDING { CURRENT ROW | GROUP | TIES | NO OTHERS } ] ]", +"window_bound,window_frame_start", +NULL}, {"with_list", NULL, "ident [ column_list ] AS query_expression [ ',' with_list ] ...",
MonetDB: analytics - Merge with default
Changeset: e197f8eee297 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e197f8eee297 Modified Files: ChangeLog.Aug2018 MonetDB.spec clients/mapiclient/mhelp.c rpm.mk.in testing/Mtest.py.in Branch: analytics Log Message: Merge with default diffs (truncated from 376 to 300 lines): diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,2 +1,5 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Oct 10 2018 Sjoerd Mullender +- Some subtle dependencies between RPMs have been fixed. + diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -14,6 +14,10 @@ %global release %{buildno}%{?dist} +# This package contains monetdbd which is a (long running) daemon, so +# we need to harden: +%global _hardened_build 1 + # On RedHat Enterprise Linux and derivatives, if the Extra Packages # for Enterprise Linux (EPEL) repository is available, you can enable # its use by providing rpmbuild or mock with the "--with epel" option. @@ -739,10 +743,6 @@ used from the MAL level. Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# RHEL >= 7, and all current Fedora -Requires(post): %{_bindir}/systemd-tmpfiles -%endif %if (0%{?fedora} >= 22) %if %{with hugeint} Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} @@ -759,11 +759,6 @@ accelerators. It also has an SQL fronte This package contains the SQL frontend for MonetDB. If you want to use SQL with MonetDB, you will need to install this package. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%post SQL-server5 -systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf -%endif - %files SQL-server5 %defattr(-,root,root) %{_bindir}/monetdb @@ -771,7 +766,8 @@ systemd-tmpfiles --create %{_sysconfdir} %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora -%{_sysconfdir}/tmpfiles.d/monetdbd.conf +%dir %attr(775,monetdb,monetdb) /run/monetdb +%{_tmpfilesdir}/monetdbd.conf %{_unitdir}/monetdbd.service %else # RedHat Enterprise Linux < 7 @@ -908,6 +904,8 @@ do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : done +# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, +# %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : /usr/bin/systemctl try-restart monetdbd.service @@ -921,6 +919,8 @@ if [ $1 -eq 0 ] ; then do /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : done + # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, + # %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : if [ $active = active ]; then /usr/bin/systemctl start monetdbd.service @@ -943,11 +943,18 @@ fi # that causes it to report an internal error when compiling # testing/difflib.c. The work around is to not use -fstack-protector-strong. # The bug exhibits itself on CentOS 7 on AArch64. -if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then - # set CFLAGS before configure, so that this value gets used - CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -grecord-gcc-switches ' - export CFLAGS -fi +# Everywhere else, add -Wno-format-truncation to the compiler options +# to reduce the number of warnings during compilation. +%ifarch aarch64 +if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then + CFLAGS="${CFLAGS:-$(echo %optflags | sed 's/-fstack-protector-strong//')" +else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +fi +%else +CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +%endif +export CFLAGS %{configure} \ --enable-assert=no \ --enable-console=yes \ @@ -1017,10 +1024,23 @@ cd - %install %make_install -mkdir -p %{buildroot}%{_localstatedir}/MonetDB -mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm -mkdir -p %{buildroot}%{_localstatedir}/log/monetdb -mkdir -p %{buildroot}%{_localstatedir}/run/monetdb +# move file to correct location +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +mkdir -p %{buildroot}%{_tmpfilesdir} +mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} +rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d +%endif + +install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB +install -d -m
MonetDB: default - Added missing rules references.
Changeset: c349bfc69fab for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c349bfc69fab Modified Files: clients/mapiclient/mhelp.c Branch: default Log Message: Added missing rules references. diffs (217 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -41,7 +41,7 @@ typedef struct { const char *comments; } SQLhelp; -#define NUMBER_MAJOR_COMMANDS 73 // The number of major commands to show in case of no query +#define NUMBER_MAJOR_COMMANDS 74 // The number of major commands to show in case of no query SQLhelp sqlhelp[] = { // major commands @@ -62,7 +62,7 @@ SQLhelp sqlhelp[] = { "ALTER TABLE qname ADD TABLE qname [ AS PARTITION opt_partition_spec ]\n" "ALTER TABLE qname DROP TABLE qname [ RESTRICT | CASCADE ]\n" "ALTER TABLE qname SET TABLE qname AS PARTITION opt_partition_spec", -"", +"opt_partition_spec", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"}, {"ALTER SEQUENCE", "", @@ -81,7 +81,7 @@ SQLhelp sqlhelp[] = { "See also https://www.monetdb.org/Documentation/SQLreference/Users"}, {"ANALYZE", "Collect column data statistics for optimizations", -"ANALYZE schemaname [ . tablename [ column_list ] ] [SAMPLE size] [MINMAX]", +"ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]", "column_list", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"}, {"CALL", @@ -179,7 +179,7 @@ SQLhelp sqlhelp[] = { {"CREATE MERGE TABLE", "", "CREATE MERGE TABLE [ IF NOT EXISTS ] qname table_source [ opt_partition_by ];", -NULL, +"table_source,opt_partition_by", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"}, {"CREATE REMOTE TABLE", "", @@ -205,7 +205,7 @@ SQLhelp sqlhelp[] = { {"CREATE STREAM TABLE", "Temporary table, locked during updates/ continues query processing", "CREATE STREAM TABLE [ IF NOT EXISTS ] qname table_source\n", -NULL, +"table_source", NULL}, {"CREATE TABLE", "", @@ -216,9 +216,9 @@ SQLhelp sqlhelp[] = { NULL}, {"CREATE TRIGGER", "", -"CREATE [ OR REPLACE ] TRIGGER wname { BEFORE | AFTER } { INSERT | DELETE | TRUNCATE ...\n" +"CREATE [ OR REPLACE ] TRIGGER qname { BEFORE | AFTER } { INSERT | DELETE | TRUNCATE ...\n" " | UPDATE [ OF ident [',' ident]] } ON qname REFERENCING trigger_reference... triggered_action", -"trigger_reference", +"trigger_reference,triggered_action", NULL}, {"CREATE TYPE", "Add user defined type to the type system ", @@ -275,13 +275,13 @@ SQLhelp sqlhelp[] = { "", "DROP ALL AGGREGATE qname [ RESTRICT | CASCADE ]\n" "DROP AGGREGATE [ IF EXISTS ] qname [ '(' [ param [',' ...]] ')' ] [ RESTRICT | CASCADE ]", -NULL, +"param", NULL}, {"DROP FUNCTION", "", "DROP ALL [FILTER] FUNCTION qname [ RESTRICT | CASCADE ]\n" "DROP [FILTER] FUNCTION [ IF EXISTS ] qname [ '(' [ param [',' ...]] ')' ] [ RESTRICT | CASCADE ]", -NULL, +"param", NULL}, {"DROP INDEX", "", @@ -292,13 +292,13 @@ SQLhelp sqlhelp[] = { "", "DROP ALL LOADER qname [ RESTRICT | CASCADE ]\n" "DROP LOADER [ IF EXISTS ] qname [ '(' [ param [',' ...]] ')' ] [ RESTRICT | CASCADE ]", -NULL, +"param", NULL}, {"DROP PROCEDURE", "", "DROP ALL PROCEDURE qname [ RESTRICT | CASCADE ]\n" "DROP PROCEDURE [ IF EXISTS ] qname [ '(' [ param [',' ...]] ')' ] [ RESTRICT | CASCADE ]", -NULL, +"param", NULL}, {"DROP ROLE", "", @@ -356,7 +356,7 @@ SQLhelp sqlhelp[] = { "Define access privileges", "GRANT privileges TO grantee [',' ...] [ WITH GRANT OPTION ]\n" "GRANT role [',' ...] TO grantee [',' ...] [ WITH ADMIN OPTION]", -"privileges,role", +"privileges,role,grantee", "See also https://www.monetdb.org/Documentation/SQLreference/Permissions"}, {"RELEASE SAVEPOINT", "", @@ -366,7 +366,7 @@ SQLhelp sqlhelp[] = { {"RETURN", "", "RETURN { query_expression | search_condition | TABLE '(' query_expression ')'", -NULL, +"query_expression,search_condition", NULL}, {"REVOKE", "Remove some privileges", @@ -457,7 +457,7 @@ SQLhelp sqlhelp[] = { "table_ref NATURAL [ INNER | LEFT | RIGHT | FULL ] JOIN table_ref |\n" "table_ref UNION JOIN table_ref { ON search_condition | USING column_list } |\n"
MonetDB: Aug2018 - Another typo in documentation.
Changeset: fb7e28070bd6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb7e28070bd6 Modified Files: clients/mapiclient/mhelp.c Branch: Aug2018 Log Message: Another typo in documentation. diffs (21 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -41,7 +41,7 @@ typedef struct { const char *comments; } SQLhelp; -#define NUMBER_MAJOR_COMMANDS 73 // The number of major commands to show in case of no query +#define NUMBER_MAJOR_COMMANDS 74 // The number of major commands to show in case of no query SQLhelp sqlhelp[] = { // major commands @@ -215,7 +215,7 @@ SQLhelp sqlhelp[] = { NULL}, {"CREATE TRIGGER", "", -"CREATE [ OR REPLACE ] TRIGGER wname { BEFORE | AFTER } { INSERT | DELETE | TRUNCATE ...\n" +"CREATE [ OR REPLACE ] TRIGGER qname { BEFORE | AFTER } { INSERT | DELETE | TRUNCATE ...\n" " | UPDATE [ OF ident [',' ident]] } ON qname REFERENCING trigger_reference... triggered_action", "trigger_reference", NULL}, ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Aug2018 branch.
Changeset: 8767d349a374 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8767d349a374 Modified Files: ChangeLog.Aug2018 MonetDB.spec clients/mapiclient/mhelp.c rpm.mk.in testing/Mtest.py.in Branch: default Log Message: Merge with Aug2018 branch. diffs (162 lines): diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,2 +1,5 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Oct 10 2018 Sjoerd Mullender +- Some subtle dependencies between RPMs have been fixed. + diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -14,6 +14,10 @@ %global release %{buildno}%{?dist} +# This package contains monetdbd which is a (long running) daemon, so +# we need to harden: +%global _hardened_build 1 + # On RedHat Enterprise Linux and derivatives, if the Extra Packages # for Enterprise Linux (EPEL) repository is available, you can enable # its use by providing rpmbuild or mock with the "--with epel" option. @@ -739,10 +743,6 @@ used from the MAL level. Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# RHEL >= 7, and all current Fedora -Requires(post): %{_bindir}/systemd-tmpfiles -%endif %if (0%{?fedora} >= 22) %if %{with hugeint} Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} @@ -759,11 +759,6 @@ accelerators. It also has an SQL fronte This package contains the SQL frontend for MonetDB. If you want to use SQL with MonetDB, you will need to install this package. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%post SQL-server5 -systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf -%endif - %files SQL-server5 %defattr(-,root,root) %{_bindir}/monetdb @@ -771,7 +766,8 @@ systemd-tmpfiles --create %{_sysconfdir} %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora -%{_sysconfdir}/tmpfiles.d/monetdbd.conf +%dir %attr(775,monetdb,monetdb) /run/monetdb +%{_tmpfilesdir}/monetdbd.conf %{_unitdir}/monetdbd.service %else # RedHat Enterprise Linux < 7 @@ -908,6 +904,8 @@ do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : done +# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, +# %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : /usr/bin/systemctl try-restart monetdbd.service @@ -921,6 +919,8 @@ if [ $1 -eq 0 ] ; then do /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : done + # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, + # %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : if [ $active = active ]; then /usr/bin/systemctl start monetdbd.service @@ -943,11 +943,18 @@ fi # that causes it to report an internal error when compiling # testing/difflib.c. The work around is to not use -fstack-protector-strong. # The bug exhibits itself on CentOS 7 on AArch64. -if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then - # set CFLAGS before configure, so that this value gets used - CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -grecord-gcc-switches ' - export CFLAGS -fi +# Everywhere else, add -Wno-format-truncation to the compiler options +# to reduce the number of warnings during compilation. +%ifarch aarch64 +if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then + CFLAGS="${CFLAGS:-$(echo %optflags | sed 's/-fstack-protector-strong//')" +else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +fi +%else +CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +%endif +export CFLAGS %{configure} \ --enable-assert=no \ --enable-console=yes \ @@ -1017,10 +1024,23 @@ cd - %install %make_install -mkdir -p %{buildroot}%{_localstatedir}/MonetDB -mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm -mkdir -p %{buildroot}%{_localstatedir}/log/monetdb -mkdir -p %{buildroot}%{_localstatedir}/run/monetdb +# move file to correct location +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +mkdir -p %{buildroot}%{_tmpfilesdir} +mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} +rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d +%endif + +install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB +install -d -m 0770
MonetDB: Aug2018 - RPM wants python2 in shebang line.
Changeset: d377966ef19d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d377966ef19d Modified Files: testing/Mtest.py.in Branch: Aug2018 Log Message: RPM wants python2 in shebang line. diffs (9 lines): diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PYTHON2@ # 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 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Typo in documentation
Changeset: fcd24f427333 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcd24f427333 Modified Files: clients/mapiclient/mhelp.c Branch: Aug2018 Log Message: Typo in documentation diffs (12 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -544,7 +544,7 @@ SQLhelp sqlhelp[] = { "BOOLEAN | BOOL | TINYINT | SMALLINT | INT | INTEGER | BIGINT | HUGEINT |\n" " { DECIMAL | DEC | NUMERIC | FLOAT } [ '(' nonzero [',' nonzero ] ')' ] |\n" " REAL | DOUBLE [ PRECISION ] |\n" -" { VARCHAR | CHARARCTER VARYING } '(' nonzero ')' |\n" +" { VARCHAR | CHARACTER VARYING } '(' nonzero ')' |\n" " { CHAR | CHARACTER [ LARGE OBJECT ] | CLOB | TEXT | STRING | JSON | URL } [ '(' nonzero ')' ] |\n" " { BINARY LARGE OBJECT | BLOB } [ '(' nonzero ')' ] |\n" " UUID | INET | datetime_type | interval_type | geometry_type", ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - ChangeLog blurb.
Changeset: 92c78e4f7f02 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92c78e4f7f02 Modified Files: ChangeLog.Aug2018 Branch: Aug2018 Log Message: ChangeLog blurb. diffs (9 lines): diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,2 +1,5 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Oct 10 2018 Sjoerd Mullender +- Some subtle dependencies between RPMs have been fixed. + ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rename-sql - Set renamed flag for tables and columns wh...
Changeset: 3efd7cd49f88 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3efd7cd49f88 Added Files: sql/test/rename/Tests/rename04.stable.out Modified Files: sql/storage/store.c Branch: rename-sql Log Message: Set renamed flag for tables and columns when it happens. diffs (227 lines): diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -4905,7 +4905,7 @@ sql_trans_rename_schema(sql_trans *tr, i assert(new_name && strcmp(new_name, str_nil) != 0); - list_hash_delete(tr->schemas.set, s, NULL); + list_hash_delete(tr->schemas.set, s, NULL); /* has to re-hash the entry in the changeset */ s->base.name = sa_strdup(tr->sa, new_name); if(!list_hash_add(tr->schemas.set, s, NULL)) return NULL; @@ -5201,7 +5201,7 @@ sql_trans_rename_table(sql_trans *tr, sq assert(new_name && strcmp(new_name, str_nil) != 0); - list_hash_delete(s->tables.set, t, NULL); + list_hash_delete(s->tables.set, t, NULL); /* has to re-hash the entry in the changeset */ t->base.name = sa_strdup(tr->sa, new_name); if(!list_hash_add(s->tables.set, t, NULL)) return NULL; @@ -5210,6 +5210,7 @@ sql_trans_rename_table(sql_trans *tr, sq assert(!is_oid_nil(rid)); table_funcs.column_update_value(tr, find_sql_column(systable, "name"), rid, (void*) new_name); + setRenamedFlag(t); t->base.wtime = tr->wtime = tr->wstime; tr->schema_updates ++; return t; @@ -5586,7 +5587,7 @@ sql_trans_rename_column(sql_trans *tr, s assert(new_name && strcmp(new_name, str_nil) != 0); - list_hash_delete(t->columns.set, c, NULL); + list_hash_delete(t->columns.set, c, NULL); /* has to re-hash the entry in the changeset */ c->base.name = sa_strdup(tr->sa, new_name); if(!list_hash_add(t->columns.set, c, NULL)) return NULL; @@ -5595,6 +5596,7 @@ sql_trans_rename_column(sql_trans *tr, s assert(!is_oid_nil(rid)); table_funcs.column_update_value(tr, find_sql_column(syscolumn, "name"), rid, (void*) new_name); + setRenamedFlag(c); c->base.wtime = tr->wtime = tr->wstime; tr->schema_updates ++; return c; diff --git a/sql/test/rename/Tests/rename04.stable.out b/sql/test/rename/Tests/rename04.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/rename/Tests/rename04.stable.out @@ -0,0 +1,176 @@ +stdout of test 'rename04` in directory 'sql/test/rename` itself: + + +# 11:53:10 > +# 11:53:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34170" "--set" "mapi_usock=/var/tmp/mtest-8454/.s.monetdb.34170" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/repositories/MonetDB-rename-sql/BUILD/var/MonetDB/mTests_sql_test_rename" "--set" "embedded_c=true" +# 11:53:10 > + +# MonetDB 5 server v11.32.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_rename', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.492 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:34170/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-8454/.s.monetdb.34170 +# MonetDB/GIS module loaded +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_lidar.sql +# loading sql script: 75_shp.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading
MonetDB: Aug2018 - Update CFLAGS from RPM macros.
Changeset: 576be8cc7bb1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=576be8cc7bb1 Modified Files: MonetDB.spec Branch: Aug2018 Log Message: Update CFLAGS from RPM macros. We add the compiler option -Wno-format-truncation in order to get fewer warnings during compilation. On EPEL 7 on AArch64, we remove -fstack-protector-strong. diffs (27 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -902,11 +902,18 @@ fi # that causes it to report an internal error when compiling # testing/difflib.c. The work around is to not use -fstack-protector-strong. # The bug exhibits itself on CentOS 7 on AArch64. -if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then - # set CFLAGS before configure, so that this value gets used - CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -grecord-gcc-switches ' - export CFLAGS -fi +# Everywhere else, add -Wno-format-truncation to the compiler options +# to reduce the number of warnings during compilation. +%ifarch aarch64 +if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then + CFLAGS="${CFLAGS:-$(echo %optflags | sed 's/-fstack-protector-strong//')" +else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +fi +%else +CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +%endif +export CFLAGS %{configure} \ --enable-assert=no \ --enable-console=yes \ ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: analytics - Merge with default.
Changeset: d026fdc8dcfc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d026fdc8dcfc Added Files: gdk/xoshiro256starstar.h sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out sql/test/sample/Tests/All sql/test/sample/Tests/sample.1.sql sql/test/sample/Tests/sample.1.stable.err sql/test/sample/Tests/sample.1.stable.out sql/test/sample/Tests/sample.10.sql sql/test/sample/Tests/sample.10.stable.err sql/test/sample/Tests/sample.10.stable.out sql/test/sample/Tests/sample.11.sql sql/test/sample/Tests/sample.11.stable.err sql/test/sample/Tests/sample.11.stable.out sql/test/sample/Tests/sample.12.sql sql/test/sample/Tests/sample.12.stable.err sql/test/sample/Tests/sample.12.stable.out sql/test/sample/Tests/sample.13.sql sql/test/sample/Tests/sample.13.stable.err sql/test/sample/Tests/sample.13.stable.out sql/test/sample/Tests/sample.14.sql sql/test/sample/Tests/sample.14.stable.err sql/test/sample/Tests/sample.14.stable.out sql/test/sample/Tests/sample.15.sql sql/test/sample/Tests/sample.15.stable.err sql/test/sample/Tests/sample.15.stable.out sql/test/sample/Tests/sample.2.sql sql/test/sample/Tests/sample.2.stable.err sql/test/sample/Tests/sample.2.stable.out sql/test/sample/Tests/sample.3.sql sql/test/sample/Tests/sample.3.stable.err sql/test/sample/Tests/sample.3.stable.out sql/test/sample/Tests/sample.4.sql sql/test/sample/Tests/sample.4.stable.err sql/test/sample/Tests/sample.4.stable.out sql/test/sample/Tests/sample.5.sql sql/test/sample/Tests/sample.5.stable.err sql/test/sample/Tests/sample.5.stable.out sql/test/sample/Tests/sample.6.sql sql/test/sample/Tests/sample.6.stable.err sql/test/sample/Tests/sample.6.stable.out sql/test/sample/Tests/sample.7.sql sql/test/sample/Tests/sample.7.stable.err sql/test/sample/Tests/sample.7.stable.out sql/test/sample/Tests/sample.8.sql sql/test/sample/Tests/sample.8.stable.err sql/test/sample/Tests/sample.8.stable.out sql/test/sample/Tests/sample.9.sql sql/test/sample/Tests/sample.9.stable.err sql/test/sample/Tests/sample.9.stable.out Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/ChangeLog.Aug2018 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/ReadlineTools.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/Makefile.ag gdk/gdk.h gdk/gdk_calc.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_sample.c gdk/libbat.rc geom/monetdb5/geom_upgrade.c libversions monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sample.mal monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/include/sql_catalog.h sql/server/rel_select.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2018/Tests/All sql/test/BugTracker/Tests/drop_sequence_crash.SF-1505973.sql sql/test/BugTracker/Tests/drop_sequence_crash_2.SF-1505973.sql sql/test/group-concat/Tests/groupconcat01.sql sql/test/group-concat/Tests/groupconcat01.stable.out sql/test/group-concat/Tests/groupconcat05.sql sql/test/group-concat/Tests/groupconcat05.stable.out tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.data Branch: analytics Log Message: Merge with default. diffs (truncated from 6209 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7 3aaf6c916bd870cc478d3973241bc24cafbe1655
MonetDB: rename-sql - Merge with default.
Changeset: 5f325c009606 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f325c009606 Added Files: gdk/xoshiro256starstar.h sql/test/sample/Tests/All sql/test/sample/Tests/sample.1.sql sql/test/sample/Tests/sample.1.stable.err sql/test/sample/Tests/sample.1.stable.out sql/test/sample/Tests/sample.10.sql sql/test/sample/Tests/sample.10.stable.err sql/test/sample/Tests/sample.10.stable.out sql/test/sample/Tests/sample.11.sql sql/test/sample/Tests/sample.11.stable.err sql/test/sample/Tests/sample.11.stable.out sql/test/sample/Tests/sample.12.sql sql/test/sample/Tests/sample.12.stable.err sql/test/sample/Tests/sample.12.stable.out sql/test/sample/Tests/sample.13.sql sql/test/sample/Tests/sample.13.stable.err sql/test/sample/Tests/sample.13.stable.out sql/test/sample/Tests/sample.14.sql sql/test/sample/Tests/sample.14.stable.err sql/test/sample/Tests/sample.14.stable.out sql/test/sample/Tests/sample.15.sql sql/test/sample/Tests/sample.15.stable.err sql/test/sample/Tests/sample.15.stable.out sql/test/sample/Tests/sample.2.sql sql/test/sample/Tests/sample.2.stable.err sql/test/sample/Tests/sample.2.stable.out sql/test/sample/Tests/sample.3.sql sql/test/sample/Tests/sample.3.stable.err sql/test/sample/Tests/sample.3.stable.out sql/test/sample/Tests/sample.4.sql sql/test/sample/Tests/sample.4.stable.err sql/test/sample/Tests/sample.4.stable.out sql/test/sample/Tests/sample.5.sql sql/test/sample/Tests/sample.5.stable.err sql/test/sample/Tests/sample.5.stable.out sql/test/sample/Tests/sample.6.sql sql/test/sample/Tests/sample.6.stable.err sql/test/sample/Tests/sample.6.stable.out sql/test/sample/Tests/sample.7.sql sql/test/sample/Tests/sample.7.stable.err sql/test/sample/Tests/sample.7.stable.out sql/test/sample/Tests/sample.8.sql sql/test/sample/Tests/sample.8.stable.err sql/test/sample/Tests/sample.8.stable.out sql/test/sample/Tests/sample.9.sql sql/test/sample/Tests/sample.9.stable.err sql/test/sample/Tests/sample.9.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/Makefile.ag gdk/gdk.h gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_sample.c monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sample.mal sql/ChangeLog sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/server/rel_select.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_scan.c sql/test/BugTracker/Tests/drop_sequence_crash.SF-1505973.sql sql/test/BugTracker/Tests/drop_sequence_crash_2.SF-1505973.sql Branch: rename-sql Log Message: Merge with default. diffs (truncated from 2344 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10897,8 +10897,10 @@ Ready. [ "sabaoth", "marchScenario","command sabaoth.marchScenario(lang:str):void ","SABmarchScenario;", "Publishes the given language as available for this server" ] [ "sabaoth", "prelude", "command sabaoth.prelude():void ", "SABprelude;", "Initialise the sabaoth module" ] [ "sabaoth", "retreatScenario", "command sabaoth.retreatScenario(lang:str):void ", "SABretreatScenario;", "Unpublishes the given language as available for this server" ] -[ "sample","subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s"] -[ "sample","subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0"] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0"] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], p:dbl, sample_seed:int):bat[:oid] ","SAMPLEuniform;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 and where the prg is seeded with sample_seed" ] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], sample_size:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the
MonetDB: rename-sql - Added new tests and the possibility to ren...
Changeset: d44b06dc4614 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d44b06dc4614 Added Files: sql/test/rename/Tests/rename00.py sql/test/rename/Tests/rename00.stable.err sql/test/rename/Tests/rename00.stable.out sql/test/rename/Tests/rename05.sql sql/test/rename/Tests/rename05.stable.err sql/test/rename/Tests/rename05.stable.out Modified Files: sql/backends/monet5/sql_cat.c sql/server/rel_schema.c sql/test/rename/Tests/All sql/test/rename/Tests/rename02.sql sql/test/rename/Tests/rename02.stable.err sql/test/rename/Tests/rename02.stable.out Branch: rename-sql Log Message: Added new tests and the possibility to rename the current session schema. diffs (truncated from 526 to 300 lines): diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c --- a/sql/backends/monet5/sql_cat.c +++ b/sql/backends/monet5/sql_cat.c @@ -1570,15 +1570,16 @@ SQLrename_schema(Client cntxt, MalBlkPtr throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: access denied for %s to schema '%s'", stack_get_string(sql, "current_user"), old_name); if (s->system) throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: cannot rename a system schema"); - if (s == cur_schema(sql)) - throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: cannot rename current schema"); if (!new_name || strcmp(new_name, str_nil) == 0) throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: invalid new schema name"); if (mvc_bind_schema(sql, new_name)) throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: there is a schema named '%s' in the database", new_name); - if(!sql_trans_rename_schema(sql->session->tr, s->base.id, new_name)) + if (!sql_trans_rename_schema(sql->session->tr, s->base.id, new_name)) throw(SQL, "sql.rename_schema",SQLSTATE(HY001) MAL_MALLOC_FAIL); + if (s == cur_schema(sql)) + if(!mvc_set_schema(sql, new_name)) + throw(SQL, "sql.rename_schema",SQLSTATE(HY001) MAL_MALLOC_FAIL); return msg; } @@ -1607,7 +1608,7 @@ SQLrename_table(Client cntxt, MalBlkPtr if (mvc_bind_table(sql, s, new_name)) throw(SQL, "sql.rename_table", SQLSTATE(3F000) "ALTER TABLE: there is a table named '%s' in schema '%s'", new_name, schema_name); - if(!sql_trans_rename_table(sql->session->tr, s, t->base.id, new_name)) + if (!sql_trans_rename_table(sql->session->tr, s, t->base.id, new_name)) throw(SQL, "sql.rename_table",SQLSTATE(HY001) MAL_MALLOC_FAIL); return msg; } @@ -1636,13 +1637,13 @@ SQLrename_column(Client cntxt, MalBlkPtr if (isView(t)) throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE: cannot rename column '%s': '%s' is a view", old_name, t->base.name); if (!mvc_bind_column(sql, t, old_name)) - throw(SQL, "sql.rename_column", "ALTER TABLE: no such column '%s' in table '%s'", old_name, t->base.name); + throw(SQL, "sql.rename_column", SQLSTATE(42S22) "ALTER TABLE: no such column '%s' in table '%s'", old_name, t->base.name); if (!new_name || strcmp(new_name, str_nil) == 0) throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE: invalid new column name"); if (mvc_bind_column(sql, t, new_name)) throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE: there is a column named '%s' in table '%s'", new_name, t->base.name); - if(!sql_trans_rename_column(sql->session->tr, t, old_name, new_name)) + if (!sql_trans_rename_column(sql->session->tr, t, old_name, new_name)) throw(SQL, "sql.rename_column",SQLSTATE(HY001) MAL_MALLOC_FAIL); return msg; } diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c --- a/sql/server/rel_schema.c +++ b/sql/server/rel_schema.c @@ -2449,8 +2449,8 @@ rel_rename_schema(mvc *sql, char *old_na return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: access denied for %s to schema '%s'", stack_get_string(sql, "current_user"), old_name); if (s->system) return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: cannot rename a system schema"); - if (s == cur_schema(sql)) - return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: cannot rename current schema"); + if (!new_name || strcmp(new_name, str_nil) == 0) + return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: invalid new schema name"); if (mvc_bind_schema(sql, new_name)) return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: there is a schema named '%s' in the database", new_name); @@ -2481,7 +2481,7 @@ rel_rename_table(mvc *sql, char* schema_ if (!(t =
MonetDB: Aug2018 - Be explicit about type of tar ball to build.
Changeset: 8af410a2044d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8af410a2044d Modified Files: rpm.mk.in Branch: Aug2018 Log Message: Be explicit about type of tar ball to build. diffs (15 lines): diff --git a/rpm.mk.in b/rpm.mk.in --- a/rpm.mk.in +++ b/rpm.mk.in @@ -13,7 +13,10 @@ rpmtopdir = $(shell cd $(top_builddir) & RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)" --define="tmpdir %{_tmppath}" --define="rpmcflags -O2 " --define="packager MonetDB Database System " --define="_@LIBLAS_RPM@_lidar 1" $(top_builddir)/$(distdir).tar.bz2: - $(MAKE) $(AM_MAKEFLAGS) dist + $(MAKE) $(AM_MAKEFLAGS) dist-bzip2 + +$(top_builddir)/$(distdir).tar.xz: + $(MAKE) $(AM_MAKEFLAGS) dist-xz $(rpmtopdir)/rpmmacros: mkdir -p $(rpmtopdir)/RPMS ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - No tmpfiles.d on EPEL 6.
Changeset: 9a427fc9b525 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a427fc9b525 Modified Files: MonetDB.spec Branch: Aug2018 Log Message: No tmpfiles.d on EPEL 6. diffs (24 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -731,7 +731,7 @@ use SQL with MonetDB, you will need to i %else # RedHat Enterprise Linux < 7 %dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb -%exclude %{_tmpfilesdir}/monetdbd.conf +%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf # no _unitdir macro %exclude %{_prefix}/lib/systemd/system/monetdbd.service %endif @@ -977,9 +977,11 @@ cd - %make_install # move file to correct location +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 mkdir -p %{buildroot}%{_tmpfilesdir} mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d +%endif install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Fix for EPEL 6.
Changeset: 9bf0768fffef for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9bf0768fffef Modified Files: MonetDB.spec Branch: Aug2018 Log Message: Fix for EPEL 6. diffs (39 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -863,7 +863,9 @@ do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : done -/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb /run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : +# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, +# %{_localstatedir}/run is a symlink to /run +/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : /usr/bin/systemctl try-restart monetdbd.service %postun selinux @@ -876,7 +878,9 @@ if [ $1 -eq 0 ] ; then do /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : done - /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb /run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : + # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, + # %{_localstatedir}/run is a symlink to /run + /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : if [ $active = active ]; then /usr/bin/systemctl start monetdbd.service fi @@ -980,7 +984,13 @@ rmdir %{buildroot}%{_sysconfdir}/tmpfile install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm install -d -m 0775 %{buildroot}%{_localstatedir}/log/monetdb +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +# RHEL >= 7, and all current Fedora install -d -m 0775 %{buildroot}/run/monetdb +%else +# RedHat Enterprise Linux < 7 +install -d -m 0775 %{buildroot}%{_localstatedir}/run/monetdb +%endif # remove unwanted stuff # .la files ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list