Changeset: 8d6c449ed5f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d6c449ed5f3
Added Files:
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/Makefile.ag
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
Removed Files:
tools/merovingian/daemon/.merovingian_properties.in
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
MonetDB.spec
debian/monetdb5-sql.install
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/backends/monet5/sql_cat.c
sql/test/Tests/setoptimizer.stable.out
tools/merovingian/ChangeLog.Aug2018
tools/merovingian/daemon/Makefile.ag
tools/mserver/shutdowntest.c
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (267 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
-%define name MonetDB
-%define version 11.32.0
+%global name MonetDB
+%global version 11.32.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -12,12 +12,12 @@
%bcond_without hugeint
%endif
-%define release %{buildno}%{?dist}
+%global release %{buildno}%{?dist}
# 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.
-# If the EPEL repository is availabe, or if building for Fedora, all
+# If the EPEL repository is availabe, or if building for Fedora, most
# optional sub packages can be built. We indicate that here by
# setting the macro fedpkgs to 1. If the EPEL repository is not
# available and we are not building for Fedora, we set fedpkgs to 0.
@@ -26,14 +26,14 @@
%bcond_with epel
%if %{with epel}
# EPEL is enabled through the command line
-%define fedpkgs 1
+%global fedpkgs 1
%else
# EPEL is not enabled
-%define fedpkgs 0
+%global fedpkgs 0
%endif
%else
# Not RHEL (so presumably Fedora)
-%define fedpkgs 1
+%global fedpkgs 1
%endif
# On Fedora, the geos library is available, and so we can require it
@@ -45,6 +45,7 @@
# up-to-date version of RHEL.
%if %{fedpkgs}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7
%bcond_without geos
%endif
%endif
@@ -75,7 +76,7 @@
%bcond_without pcre
%if %{fedpkgs}
-# By default, create teh MonetDB-R package.
+# By default, create the MonetDB-R package.
%bcond_without rintegration
%endif
@@ -93,13 +94,6 @@
%{!?__python2: %global __python2 %__python}
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-# python3 option not currently used
-# %if 0%{?fedora}
-# %bcond_without python3
-# %else
-# %bcond_with python3
-# %endif
-
Name: %{name}
Version: %{version}
Release: %{release}
@@ -425,8 +419,6 @@ developer.
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-geom
-Obsoletes: %{name}-geom-devel
%description geom-MonetDB5
MonetDB is a database management system that is developed from a
@@ -593,22 +585,10 @@ to use the SQL frontend, you also need %
%pre -n MonetDB5-server
getent group monetdb >/dev/null || groupadd -r monetdb
getent passwd monetdb >/dev/null || \
-useradd -r -g monetdb -d %{_localstatedir}/MonetDB -s /sbin/nologin \
- -c "MonetDB Server" monetdb
+ useradd -r -g monetdb -d %{_localstatedir}/MonetDB -s /sbin/nologin \
+ -c "MonetDB Server" monetdb
exit 0
-%post -n MonetDB5-server
-# move database from old location to new location
-if [ -d %{_localstatedir}/MonetDB5/dbfarm -a !
%{_localstatedir}/MonetDB5/dbfarm -ef %{_localstatedir}/monetdb5/dbfarm ]; then
- # old database exists and is different from new
- if [ $(find %{_localstatedir}/monetdb5 -print | wc -l) -le 2 ]; then
- # new database is still empty
- rmdir %{_localstatedir}/monetdb5/dbfarm
- rmdir %{_localstatedir}/monetdb5
- mv %{_localstatedir}/MonetDB5 %{_localstatedir}/monetdb5
- fi
-fi
-
%files -n MonetDB5-server
%defattr(-,root,root)
%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
@@ -751,6 +731,7 @@ systemd-tmpfiles --create %{_sysconfdir}
# RHEL >= 7, and all current Fedora
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%{_unitdir}/monetdbd.service
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
%else
# RedHat Enterprise Linux < 7
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
@@ -970,7 +951,7 @@ fi
--with-valgrind=no \
%{?comp_cc:CC="%{comp_cc}"}
-make %{?_smp_mflags}
+%make_build
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,7 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/??_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
+debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d
debian/tmp/etc/tmpfiles.d/monetdbd.conf etc/tmpfiles.d
# usr/lib/monetdb5/sql*.mal EXCEPT: sql*_hge.mal
debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,7 +55,7 @@ Ready.
% def # name
% clob # type
% 560 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();"
]
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -114,7 +114,7 @@ end user.s10_1;
% def # name
% clob # type
% 583 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();"
]
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
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
@@ -1532,7 +1532,7 @@ SQLcomment_on(Client cntxt, MalBlkPtr mb
if (!id_col || !remark_col)
throw(SQL, "sql.comment_on", SQLSTATE(3F000) "no table
sys.comments");
rid = table_funcs.column_find_row(tx, id_col, &objid, NULL);
- if (remark != NULL && *remark) {
+ if (remark != NULL && *remark && strcmp(remark, str_nil) != 0) {
if (!is_oid_nil(rid)) {
// have new remark and found old one, so update field
/* UPDATE sys.comments SET remark = %s WHERE id = %d */
diff --git a/sql/test/Tests/setoptimizer.stable.out
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -68,8 +68,8 @@ Ready.
[ "minimal_pipe",
"optimizer.inline();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
[ "volcano_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
-[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
-[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
+[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
+[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();",
"stable" ]
# 02:57:35 >
# 02:57:35 > "Done."
diff --git a/tools/merovingian/ChangeLog.Aug2018
b/tools/merovingian/ChangeLog.Aug2018
--- a/tools/merovingian/ChangeLog.Aug2018
+++ b/tools/merovingian/ChangeLog.Aug2018
@@ -1,3 +1,6 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Mon Aug 27 2018 Sjoerd Mullender <[email protected]>
+- Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd.
+
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -10,10 +10,6 @@ monetdb_var_logdir = $(logdir)
monetdb_var_log_DATA =
monetdb_var_rundir = $(rundir)
monetdb_var_run_DATA =
-monetdb_var_dbfarmdir = $(localstatedir)/monetdb5/dbfarm
-monetdb_var_dbfarm_DATA = .merovingian_properties
-monetdb_etc_systemddir = $(prefix)/lib/systemd/system
-monetdb_etc_systemd_DATA = monetdbd.service
INCLUDES = .. \
../../../common/stream \
@@ -24,7 +20,8 @@ INCLUDES = .. \
../../../monetdb5/mal \
$(MSGCONTROL_FLAGS)
-EXTRA_DIST = monetdbd.1.in .merovingian_properties.in monetdbd.service.in
+SUBDIRS = config
+EXTRA_DIST = monetdbd.1.in
bin_monetdbd = {
SOURCES = \
diff --git a/tools/merovingian/daemon/.merovingian_properties.in
b/tools/merovingian/daemon/config/.merovingian_properties.in
rename from tools/merovingian/daemon/.merovingian_properties.in
rename to tools/merovingian/daemon/config/.merovingian_properties.in
diff --git a/tools/merovingian/daemon/config/Makefile.ag
b/tools/merovingian/daemon/config/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/config/Makefile.ag
@@ -0,0 +1,14 @@
+# 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
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
+
+monetdb_var_dbfarmdir = $(localstatedir)/monetdb5/dbfarm
+monetdb_var_dbfarm_DATA = .merovingian_properties
+monetdb_etc_systemddir = $(prefix)/lib/systemd/system
+monetdb_etc_systemd_DATA = monetdbd.service
+monetdb_etc_logrotatedir = $(sysconfdir)/logrotate.d
+monetdb_etc_logrotate_DATA = monetdbd
+
+EXTRA_DIST = .merovingian_properties.in monetdbd.service.in monetdbd.in
diff --git a/tools/merovingian/daemon/config/monetdbd.in
b/tools/merovingian/daemon/config/monetdbd.in
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/config/monetdbd.in
@@ -0,0 +1,8 @@
+# this is the logrotate configuration for merovingian
+@Elogdir@@[email protected] {
+ missingok
+ notifempty
+ postrotate
+ kill -HUP $(cat @Erundir@@[email protected])
+ endscript
+}
diff --git a/tools/merovingian/daemon/monetdbd.service.in
b/tools/merovingian/daemon/config/monetdbd.service.in
rename from tools/merovingian/daemon/monetdbd.service.in
rename to tools/merovingian/daemon/config/monetdbd.service.in
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -132,6 +132,7 @@ static str monetdb_initialize(void) {
retval = GDKstrdup("GDKinit() failed");
goto cleanup;
}
+ GDKdebug |= NOSYNCMASK;
if (GDKsetenv("mapi_disable", "true") != GDK_SUCCEED) {
retval = GDKstrdup("GDKsetenv failed");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
