Changeset: cd4aac446267 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd4aac446267
Added Files:
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
MonetDB.spec
buildtools/ChangeLog
clients/Tests/exports.stable.out
configure.ag
gdk/gdk_project.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
sql/backends/monet5/sql_optimizer.c
tools/merovingian/daemon/Makefile.ag
Branch: mosaic
Log Message:
merge with default
diffs (177 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -754,6 +754,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
+%{_unitdir}/monetdbd.service
%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
@@ -891,9 +892,6 @@ developer, but if you do want to test, t
%files testing-python
%defattr(-,root,root)
-# at least F12 doesn't produce these
-# %exclude %{_bindir}/*.pyc
-# %exclude %{_bindir}/*.pyo
%{_bindir}/Mapprove.py
%{_bindir}/Mtest.py
%dir %{python_sitelib}/MonetDBtesting
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Sat Jan 23 2016 Sjoerd Mullender <sjo...@acm.org>
+- Implemented a systemd configuration file for a monetdbd.service
+ on Fedora.
+
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1260,7 +1260,7 @@ str MALpass(Client cntxt, MalBlkPtr mb,
str MALpipeline(Client c);
str MALreader(Client c);
void MALresourceFairness(lng usec);
-int MALrunningThreads(void);
+size_t MALrunningThreads(void);
str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3145,6 +3145,7 @@ eval "Ebindir=${Ebindir}"
QEbindir="`echo "$Ebindir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(Qbindir)
AC_SUBST(Xbindir)
+AC_SUBST(Ebindir)
AC_SUBST(QXbindir)
Qlibexecdir="$libexecdir"
Xlibexecdir="`$translatepath "$libexecdir"`"
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -591,7 +591,7 @@ BATprojectchain(BAT **bats)
GDKerror("BATprojectchain: does
not match always\n");
goto bunins_failed;
}
- *v++ = o + offset;
+ *v++ = (oid) (o + offset);
}
}
} else {
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -222,7 +222,7 @@ MALresourceFairness(lng usec)
}
// Get a hint on the parallel behavior
-int
+size_t
MALrunningThreads(void)
{
return running;
diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -22,6 +22,6 @@ mal_export int MALadmission(lng argclaim
mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int
i, int flag);
mal_export void MALresourceFairness(lng usec);
-mal_export int MALrunningThreads(void);
+mal_export size_t MALrunningThreads(void);
#endif /* _MAL_RESOURCE_H*/
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -50,14 +50,14 @@
* common term optimizer, because the first bind has a side-effect.
*/
-static size_t SQLgetStatistics(Client cntxt, mvc *m, MalBlkPtr mb)
+static lng SQLgetStatistics(Client cntxt, mvc *m, MalBlkPtr mb)
{
InstrPtr *old = NULL;
int oldtop, i, actions = 0, size = 0;
lng clk = GDKusec();
sql_trans *tr = m->session->tr;
str msg;
- size_t space = 0; // sum the total amount of data potentially read
+ lng space = 0; // sum the total amount of data potentially read
old = mb->stmt;
oldtop = mb->stop;
@@ -148,7 +148,7 @@ static size_t SQLgetStatistics(Client cn
mt_member = c->t->p->base.id;
}
}
- //mnstr_printf(GDKerr, "#space estimate after %s.%s.%s
mode %d "SZFMT"\n",sname,tname,cname, mode, space);
+ //mnstr_printf(GDKerr, "#space estimate after %s.%s.%s
mode %d "LLFMT"\n",sname,tname,cname, mode, space);
if (rows > 1 && mode != RD_INS)
setRowCnt(mb,k,rows);
if (mt_member && mode != RD_INS)
@@ -184,14 +184,14 @@ addOptimizers(Client c, MalBlkPtr mb, ch
InstrPtr q;
backend *be;
str msg;
- size_t space;
+ lng space;
be = (backend *) c->sqlcontext;
assert(be && be->mvc); /* SQL clients should always have their state
set */
space = SQLgetStatistics(c, be->mvc, mb);
if(space && (pipe == NULL || strcmp(pipe,"default_pipe")== 0)){
- if( space > (size_t)(0.8 * MT_npages() * MT_pagesize()) ){
+ if( space > (lng)(0.8 * MT_npages() * MT_pagesize()) ){
pipe = "volcano_pipe";
//mnstr_printf(GDKout, "#use volcano optimizer
pipeline? "SZFMT"\n", space);
}else
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
@@ -12,6 +12,8 @@ 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 \
@@ -22,7 +24,7 @@ INCLUDES = .. \
../../../monetdb5/mal \
$(MSGCONTROL_FLAGS)
-EXTRA_DIST = monetdbd.1.in .merovingian_properties.in
+EXTRA_DIST = monetdbd.1.in .merovingian_properties.in monetdbd.service.in
bin_monetdbd = {
SOURCES = \
diff --git a/tools/merovingian/daemon/monetdbd.service.in
b/tools/merovingian/daemon/monetdbd.service.in
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/monetdbd.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=MonetDB: the column store
+After=network.target
+
+[Service]
+Type=forking
+User=monetdb
+Group=monetdb
+ExecStart=@Ebindir@/monetdbd start @Elocalstatedir@/monetdb5/dbfarm
+ExecStop=@Ebindir@/monetdbd stop @Elocalstatedir@/monetdb5/dbfarm
+Restart=always
+PIDFILE=@Erundir@/merovingian.pid
+
+[Install]
+WantedBy=multi-user.target
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
