Changeset: 3066405cd6dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3066405cd6dc
Added Files:
gdk/gdk_project.c
monetdb5/modules/mal/projectionpath.c
monetdb5/modules/mal/projectionpath.h
monetdb5/optimizer/Tests/projectionchain.malC
monetdb5/optimizer/Tests/projectionchain.stable.err
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_projectionpath.h
monetdb5/optimizer/opt_volcano.c
monetdb5/optimizer/opt_volcano.h
sql/test/rdf/Tests/q8_v_small.reqtests
sql/test/rdf/Tests/q8_v_small.sql
sql/test/rdf/Tests/q8_v_small.stable.err
sql/test/rdf/Tests/q8_v_small.stable.out
tools/merovingian/daemon/monetdbd.service.in
Removed Files:
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/joinpath.h
monetdb5/optimizer/Tests/joinchain.malC
monetdb5/optimizer/Tests/joinchain.stable.err
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_joinpath.h
Modified Files:
MonetDB.spec
buildtools/ChangeLog
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.err
clients/Tests/exports.stable.out
clients/Tests/malcheck.stable.err
common/stream/stream.c
configure.ag
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_search.c
gdk/gdk_search.h
gdk/shared_memory.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_dataflow.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/language.mal
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/profiler.mal
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/JPexample.malC
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/dataflow3.malC
monetdb5/optimizer/Tests/joinpath.malC
monetdb5/optimizer/Tests/leftjoinpath.malC
monetdb5/optimizer/Tests/tst4005.malC
monetdb5/optimizer/Tests/tst4630.malC
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/Tests/optimizers.sql
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/sql.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
sql/server/rel_optimizer.c
sql/server/sql_parser.y
sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/rdf/Tests/All
testing/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: pythonudf
Log Message:
Merge with default.
diffs (truncated from 7943 to 300 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 <[email protected]>
+- Implemented a systemd configuration file for a monetdbd.service
+ on Fedora.
+
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
@@ -1989,8 +1989,8 @@ command algebra.not_like(s:str,pat:str):
address PCREnotlike2;
command algebra.not_like(s:str,pat:str,esc:str):bit
address PCREnotlike3;
-pattern algebra.projectionPath(l:bat[:any]...):bat[:any]
-address ALGjoinPath;
+pattern algebra.projectionpath(l:bat[:any]...):bat[:any]
+address ALGprojectionpath;
comment Routine to handle join paths. The type analysis is rather tricky.
command algebra.projection(left:bat[:oid],right:bat[:any_3]):bat[:any_3]
@@ -2005,10 +2005,6 @@ command algebra.reuse(b:bat[:any_1]):bat
address ALGreuse;
comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage
to accept result of an operation (not involving the heap)
-pattern algebra.semijoinPath(l:bat[:any]...):bat[:any]
-address ALGjoinPath;
-comment Routine to handle join paths. The type analysis is rather tricky.
-
command algebra.subslice(b:bat[:any_1],x:wrd,y:wrd):bat[:oid]
address ALGsubslice_wrd;
comment Return the oids of the slice with the BUNs at position x till y.
@@ -38366,6 +38362,10 @@ command language.assert(v:sht,term:str):
address MALassertSht;
command language.assert(v:bit,term:str):void
address MALassertBit;
+pattern language.block(v:int,w:any...):int
+address deblockdataflow;
+comment Block on availability of all variables w, and then pass on v
+
pattern language.call(s:bat[:str]):void
address CMDcallBAT;
comment Evaluate a program stored in a BAT.
@@ -39548,12 +39548,6 @@ comment Replace select with join select
pattern optimizer.joinselect():str
address OPTwrapper;
-pattern optimizer.joinPath(mod:str,fcn:str):str
-address OPTwrapper;
-comment Join path constructor
-
-pattern optimizer.joinPath():str
-address OPTwrapper;
pattern optimizer.matpack(mod:str,fcn:str):str
address OPTwrapper;
comment Unroll the mat.pack operation
@@ -39624,6 +39618,12 @@ comment Experiment with partitioned data
pattern optimizer.partitions():str
address OPTwrapper;
+pattern optimizer.projectionpath(mod:str,fcn:str):str
+address OPTwrapper;
+comment Join path constructor
+
+pattern optimizer.projectionpath():str
+address OPTwrapper;
pattern optimizer.prelude():void
address optimizer_prelude;
comment Initialize the optimizer
@@ -39702,6 +39702,12 @@ comment Collect trace of a specific oper
pattern optimizer.trace():str
address OPTwrapper;
+pattern optimizer.volcano(mod:str,fcn:str):str
+address OPTwrapper;
+comment Simulate volcano style execution
+
+pattern optimizer.volcano():str
+address OPTwrapper;
command pcre.imatch(s:str,pat:str):bit
address PCREimatch;
comment Caseless Perl Compatible Regular Expression pattern matching against a
string
@@ -39784,6 +39790,14 @@ command profiler.setheartbeat(b:int):voi
address CMDsetHeartbeat;
comment Set heart beat performance tracing
+command profiler.stoptrace():void
+address CMDstopTrace;
+comment Stop collecting trace information
+
+command profiler.starttrace():void
+address CMDstartTrace;
+comment Start collecting trace information
+
pattern profiler.stop():void
address CMDstopProfiler;
comment Stop offline performance profiling
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -2428,8 +2428,8 @@ command algebra.not_like(s:str,pat:str):
address PCREnotlike2;
command algebra.not_like(s:str,pat:str,esc:str):bit
address PCREnotlike3;
-pattern algebra.projectionPath(l:bat[:any]...):bat[:any]
-address ALGjoinPath;
+pattern algebra.projectionpath(l:bat[:any]...):bat[:any]
+address ALGprojectionpath;
comment Routine to handle join paths. The type analysis is rather tricky.
command algebra.projection(left:bat[:oid],right:bat[:any_3]):bat[:any_3]
@@ -2444,10 +2444,6 @@ command algebra.reuse(b:bat[:any_1]):bat
address ALGreuse;
comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage
to accept result of an operation (not involving the heap)
-pattern algebra.semijoinPath(l:bat[:any]...):bat[:any]
-address ALGjoinPath;
-comment Routine to handle join paths. The type analysis is rather tricky.
-
command algebra.subslice(b:bat[:any_1],x:wrd,y:wrd):bat[:oid]
address ALGsubslice_wrd;
comment Return the oids of the slice with the BUNs at position x till y.
@@ -49217,6 +49213,10 @@ command language.assert(v:sht,term:str):
address MALassertSht;
command language.assert(v:bit,term:str):void
address MALassertBit;
+pattern language.block(v:int,w:any...):int
+address deblockdataflow;
+comment Block on availability of all variables w, and then pass on v
+
pattern language.call(s:bat[:str]):void
address CMDcallBAT;
comment Evaluate a program stored in a BAT.
@@ -50407,12 +50407,6 @@ comment Replace select with join select
pattern optimizer.joinselect():str
address OPTwrapper;
-pattern optimizer.joinPath(mod:str,fcn:str):str
-address OPTwrapper;
-comment Join path constructor
-
-pattern optimizer.joinPath():str
-address OPTwrapper;
pattern optimizer.matpack(mod:str,fcn:str):str
address OPTwrapper;
comment Unroll the mat.pack operation
@@ -50483,6 +50477,12 @@ comment Experiment with partitioned data
pattern optimizer.partitions():str
address OPTwrapper;
+pattern optimizer.projectionpath(mod:str,fcn:str):str
+address OPTwrapper;
+comment Join path constructor
+
+pattern optimizer.projectionpath():str
+address OPTwrapper;
pattern optimizer.prelude():void
address optimizer_prelude;
comment Initialize the optimizer
@@ -50561,6 +50561,12 @@ comment Collect trace of a specific oper
pattern optimizer.trace():str
address OPTwrapper;
+pattern optimizer.volcano(mod:str,fcn:str):str
+address OPTwrapper;
+comment Simulate volcano style execution
+
+pattern optimizer.volcano():str
+address OPTwrapper;
command pcre.imatch(s:str,pat:str):bit
address PCREimatch;
comment Caseless Perl Compatible Regular Expression pattern matching against a
string
@@ -50643,6 +50649,14 @@ command profiler.setheartbeat(b:int):voi
address CMDsetHeartbeat;
comment Set heart beat performance tracing
+command profiler.stoptrace():void
+address CMDstopTrace;
+comment Stop collecting trace information
+
+command profiler.starttrace():void
+address CMDstartTrace;
+comment Start collecting trace information
+
pattern profiler.stop():void
address CMDstopProfiler;
comment Stop offline performance profiling
diff --git a/clients/Tests/exports.stable.err b/clients/Tests/exports.stable.err
--- a/clients/Tests/exports.stable.err
+++ b/clients/Tests/exports.stable.err
@@ -6,7 +6,4 @@ stderr of test 'exports` in directory 'c
# 15:10:42 >
-# 15:11:17 >
-# 15:11:17 > "Done."
-# 15:11:17 >
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
@@ -1,9 +1,9 @@
stdout of test 'exports` in directory 'clients` itself:
-# 15:10:42 >
-# 15:10:42 > "/usr/bin/python" "exports.py" "exports"
-# 15:10:42 >
+# 21:40:57 >
+# 21:40:57 > "/usr/bin/python2" "exports.py" "exports"
+# 21:40:57 >
# gdk
void ALIGNsetH(BAT *b1, BAT *b2);
@@ -154,6 +154,7 @@ gdk_return BATprintcolumns(stream *s, in
gdk_return BATprintf(stream *f, BAT *b);
gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
BAT *BATproject(BAT *l, BAT *r);
+BAT *BATprojectchain(BAT **bats);
gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, int li, int hi, BUN estimate);
gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force);
void BATroles(BAT *b, const char *hnme, const char *tnme);
@@ -252,7 +253,7 @@ size_t GDKvm_cursize(void);
void *GDKzalloc(size_t size) __attribute__((__malloc__))
__attribute__((__warn_unused_result__));
void HASHdestroy(BAT *b);
BUN HASHlist(Hash *h, BUN i);
-BUN HASHprobe(Hash *h, const void *v);
+BUN HASHprobe(const Hash *h, const void *v);
void HEAP_free(Heap *heap, var_t block);
void HEAP_initialize(Heap *heap, size_t nbytes, size_t nprivate, int
alignment);
var_t HEAP_malloc(Heap *heap, size_t nbytes);
@@ -669,10 +670,10 @@ str ALGfetchoid(ptr ret, const bat *bid,
str ALGfind(oid *ret, const bat *bid, ptr val);
str ALGfirstn(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGgroupby(bat *res, const bat *gids, const bat *cnts);
-str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGmaxany(ptr result, const bat *bid);
str ALGminany(ptr result, const bat *bid);
str ALGprojection(bat *result, const bat *lid, const bat *rid);
+str ALGprojectionpath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGreuse(bat *ret, const bat *bid);
str ALGsample(bat *result, const bat *bid, const int *param);
@@ -1055,7 +1056,9 @@ str CMDscience_bat_flt_tanh(bat *ret, co
str CMDsetHeartbeat(void *res, int *ev);
str CMDsetoid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDstartTrace(void *res);
str CMDstopProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDstopTrace(void *res);
str CMDstr2qgrams(bat *ret, str *val);
str CMDstrlength(int *ret, str *v);
str CMDvarABS(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1248,6 +1251,7 @@ str MALpass(Client cntxt, MalBlkPtr mb,
str MALpipeline(Client c);
str MALreader(Client c);
void MALresourceFairness(lng usec);
+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);
@@ -1516,7 +1520,6 @@ int OPTgarbageCollectorImplementation(Cl
int OPTgeneratorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTinlineImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTisAlias(InstrPtr p);
-int OPTjoinPathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTjsonImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str OPTmacro(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTmacroImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
@@ -1529,6 +1532,7 @@ str OPTmultiplexSimple(Client cntxt, Mal
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
+int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
