Changeset: ee45a7ba7626 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee45a7ba7626
Added Files:
debian/monetdb5-jaql.install
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Jul2012
clients/Tests/exports.stable.out
common/stream/stream.c
debian/control
debian/monetdb5-server.install
gdk/gdk.h
gdk/gdk_calc.c
gdk/gdk_private.h
gdk/gdk_value.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_recycle.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/recycle.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_support.c
sql/server/sql_atom.c
sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
testing/Mtest.py.in
Branch: default
Log Message:
Commit with default
diffs (truncated from 1791 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -359,6 +359,28 @@ extensions for MonetDB-SQL-server5.
%{_libdir}/monetdb5/lib_geom.so
%endif
+%package jaql
+Summary: MonetDB5 JAQL
+Group: Applications/Databases
+Requires: MonetDB5-server = %{version}-%{release}
+
+%description jaql
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains the JAQL extension for MonetDB5. JAQL is a
+querly language for JavaScript Object Notation (JSON).
+
+%files jaql
+%defattr(-,root,root)
+%{_libdir}/monetdb5/autoload/*_jaql.mal
+%{_libdir}/monetdb5/jaql*.mal
+%{_libdir}/monetdb5/json*.mal
+%{_libdir}/monetdb5/lib_jaql.so
+%{_libdir}/monetdb5/lib_json.so
+
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -411,9 +433,10 @@ fi
%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
+%exclude %{_libdir}/monetdb5/jaql*.mal
+%exclude %{_libdir}/monetdb5/json*.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/autoload/*_jaql.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
@@ -423,6 +446,8 @@ fi
%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
+%exclude %{_libdir}/monetdb5/lib_jaql.so
+%exclude %{_libdir}/monetdb5/lib_json.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
diff --git a/buildtools/ChangeLog.Jul2012 b/buildtools/ChangeLog.Jul2012
--- a/buildtools/ChangeLog.Jul2012
+++ b/buildtools/ChangeLog.Jul2012
@@ -1,6 +1,9 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Jul 2 2012 Sjoerd Mullender <[email protected]>
+- Created seperate RPM and DEB packages for MonetDB/JAQL.
+
* Tue Jun 5 2012 Sjoerd Mullender <[email protected]>
- Removed --enable-bits option from configure.
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
@@ -312,13 +312,14 @@ int TMcommit(void);
int TMsubcommit(BAT *bl);
int TMsubcommit_list(bat *subcommit, int cnt);
void VALclear(ValPtr v);
-int VALcmp(ValPtr p, ValPtr q);
+int VALcmp(const ValRecord *p, const ValRecord *q);
ptr VALconvert(int typ, ValPtr t);
-ValPtr VALcopy(ValPtr dst, ValPtr src);
+ValPtr VALcopy(ValPtr dst, const ValRecord *src);
void VALempty(ValPtr v);
-int VALformat(char **buf, ValPtr res);
+int VALformat(char **buf, const ValRecord *res);
void *VALget(ValPtr v);
ValPtr VALinit(ValPtr d, int tpe, const void *s);
+int VALisnil(const ValRecord *v);
ValPtr VALset(ValPtr v, int t, ptr p);
int VARcalcabsolute(ValPtr ret, const ValRecord *v);
int VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
@@ -1079,12 +1080,6 @@ str CALCmax_no_nil(Client cntxt, MalBlkP
str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmin_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCswitchbit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str CHPbunHasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CHPbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CHPgetHead(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CHPgetTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CHPhasMoreElements(lng *res, int *vid, int *bid, lng *granule);
-str CHPnewChunkIterator(lng *res, int *vid, int *bid, lng *granule);
str CLRbatBlue(int *ret, int *l);
str CLRbatCb(int *ret, int *l);
str CLRbatColor(int *ret, int *l);
@@ -1354,9 +1349,11 @@ str CMDgetDiskReads(lng *ret);
str CMDgetDiskWrites(lng *ret);
str CMDgetEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetFootprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDgetHead(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetPageSize(int *ret);
str CMDgetSystemTime(lng *ret);
+str CMDgetTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetTrace(int *res, str *ev);
str CMDgetUserTime(lng *ret);
str CMDifThenCst_bit(int *ret, int *bid, bit *tid);
@@ -1743,6 +1740,16 @@ str IOtableAll(stream *f, Client cntxt,
str IOtableAll(stream *f, Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, int i, int order, int printhead, int printorderby);
str IOtotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOttable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ITRnewChunk(lng *res, int *vid, int *bid, lng *granule);
+str ITRnextChunk(lng *res, int *vid, int *bid, lng *granule);
+str ITRnext_dbl(dbl *i, dbl *step, dbl *last);
+str ITRnext_flt(flt *i, flt *step, flt *last);
+str ITRnext_int(int *i, int *step, int *last);
+str ITRnext_lng(lng *i, lng *step, lng *last);
+str ITRnext_oid(oid *i, oid *step, oid *last);
+str ITRnext_sht(sht *i, sht *step, sht *last);
str LCKcreate(monet_lock *l);
str LCKdestroy(int *res, monet_lock *l);
str LCKset(int *res, monet_lock *l);
@@ -2295,8 +2302,6 @@ str PQdequeue_lngmax(int *ret, int *bid)
str PQdequeue_lngmin(int *ret, int *bid);
str PQdequeue_oidmax(int *ret, int *bid);
str PQdequeue_oidmin(int *ret, int *bid);
-str PQdequeue_ptrmax(int *ret, int *bid);
-str PQdequeue_ptrmin(int *ret, int *bid);
str PQdequeue_shtmax(int *ret, int *bid);
str PQdequeue_shtmin(int *ret, int *bid);
str PQdequeue_wrdmax(int *ret, int *bid);
@@ -2315,8 +2320,6 @@ str PQenqueue_lngmax(int *ret, int *bid,
str PQenqueue_lngmin(int *ret, int *bid, oid *idx, lng *el);
str PQenqueue_oidmax(int *ret, int *bid, oid *idx, oid *el);
str PQenqueue_oidmin(int *ret, int *bid, oid *idx, oid *el);
-str PQenqueue_ptrmax(int *ret, int *bid, oid *idx, ptr *el);
-str PQenqueue_ptrmin(int *ret, int *bid, oid *idx, ptr *el);
str PQenqueue_shtmax(int *ret, int *bid, oid *idx, sht *el);
str PQenqueue_shtmin(int *ret, int *bid, oid *idx, sht *el);
str PQenqueue_wrdmax(int *ret, int *bid, oid *idx, wrd *el);
@@ -2336,8 +2339,6 @@ str PQmovedowntop_lngmax(int *ret, int *
str PQmovedowntop_lngmin(int *ret, int *bid);
str PQmovedowntop_oidmax(int *ret, int *bid);
str PQmovedowntop_oidmin(int *ret, int *bid);
-str PQmovedowntop_ptrmax(int *ret, int *bid);
-str PQmovedowntop_ptrmin(int *ret, int *bid);
str PQmovedowntop_shtmax(int *ret, int *bid);
str PQmovedowntop_shtmin(int *ret, int *bid);
str PQmovedowntop_wrdmax(int *ret, int *bid);
@@ -2356,8 +2357,6 @@ str PQtopn2_lngmax(int *ret, int *aid, i
str PQtopn2_lngmin(int *ret, int *aid, int *bid, wrd *N);
str PQtopn2_oidmax(int *ret, int *aid, int *bid, wrd *N);
str PQtopn2_oidmin(int *ret, int *aid, int *bid, wrd *N);
-str PQtopn2_ptrmax(int *ret, int *aid, int *bid, wrd *N);
-str PQtopn2_ptrmin(int *ret, int *aid, int *bid, wrd *N);
str PQtopn2_shtmax(int *ret, int *aid, int *bid, wrd *N);
str PQtopn2_shtmin(int *ret, int *aid, int *bid, wrd *N);
str PQtopn2_wrdmax(int *ret, int *aid, int *bid, wrd *N);
@@ -2376,8 +2375,6 @@ str PQtopn_lngmax(int *ret, int *bid, wr
str PQtopn_lngmin(int *ret, int *bid, wrd *N);
str PQtopn_oidmax(int *ret, int *bid, wrd *N);
str PQtopn_oidmin(int *ret, int *bid, wrd *N);
-str PQtopn_ptrmax(int *ret, int *bid, wrd *N);
-str PQtopn_ptrmin(int *ret, int *bid, wrd *N);
str PQtopn_shtmax(int *ret, int *bid, wrd *N);
str PQtopn_shtmin(int *ret, int *bid, wrd *N);
str PQtopn_wrdmax(int *ret, int *bid, wrd *N);
@@ -2396,8 +2393,6 @@ str PQtopreplace_lngmax(int *ret, int *b
str PQtopreplace_lngmin(int *ret, int *bid, oid *idx, lng *el);
str PQtopreplace_oidmax(int *ret, int *bid, oid *idx, oid *el);
str PQtopreplace_oidmin(int *ret, int *bid, oid *idx, oid *el);
-str PQtopreplace_ptrmax(int *ret, int *bid, oid *idx, ptr *el);
-str PQtopreplace_ptrmin(int *ret, int *bid, oid *idx, ptr *el);
str PQtopreplace_shtmax(int *ret, int *bid, oid *idx, sht *el);
str PQtopreplace_shtmin(int *ret, int *bid, oid *idx, sht *el);
str PQtopreplace_wrdmax(int *ret, int *bid, oid *idx, wrd *el);
@@ -2416,8 +2411,6 @@ str PQutopn2_lngmax(int *ret, int *aid,
str PQutopn2_lngmin(int *ret, int *aid, int *bid, wrd *N);
str PQutopn2_oidmax(int *ret, int *aid, int *bid, wrd *N);
str PQutopn2_oidmin(int *ret, int *aid, int *bid, wrd *N);
-str PQutopn2_ptrmax(int *ret, int *aid, int *bid, wrd *N);
-str PQutopn2_ptrmin(int *ret, int *aid, int *bid, wrd *N);
str PQutopn2_shtmax(int *ret, int *aid, int *bid, wrd *N);
str PQutopn2_shtmin(int *ret, int *aid, int *bid, wrd *N);
str PQutopn2_wrdmax(int *ret, int *aid, int *bid, wrd *N);
@@ -2436,8 +2429,6 @@ str PQutopn_lngmax(int *ret, int *bid, w
str PQutopn_lngmin(int *ret, int *bid, wrd *N);
str PQutopn_oidmax(int *ret, int *bid, wrd *N);
str PQutopn_oidmin(int *ret, int *bid, wrd *N);
-str PQutopn_ptrmax(int *ret, int *bid, wrd *N);
-str PQutopn_ptrmin(int *ret, int *bid, wrd *N);
str PQutopn_shtmax(int *ret, int *bid, wrd *N);
str PQutopn_shtmin(int *ret, int *bid, wrd *N);
str PQutopn_wrdmax(int *ret, int *bid, wrd *N);
@@ -2495,18 +2486,6 @@ str RMTput(Client cntxt, MalBlkPtr mb, M
str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTregisterInternal(Client cntxt, str conn, str mod, str fcn);
str RMTresolve(int *ret, str *pat);
-str RNGnewRange_dbl(bit *res, dbl *i, dbl *first);
-str RNGnewRange_flt(bit *res, flt *i, flt *first);
-str RNGnewRange_int(bit *res, int *i, int *first);
-str RNGnewRange_lng(bit *res, lng *i, lng *first);
-str RNGnewRange_oid(bit *res, oid *i, oid *first);
-str RNGnewRange_sht(bit *res, sht *i, sht *first);
-str RNGnextElement_dbl(bit *res, dbl *i, dbl *step, dbl *last);
-str RNGnextElement_flt(bit *res, flt *i, flt *step, flt *last);
-str RNGnextElement_int(bit *res, int *i, int *step, int *last);
-str RNGnextElement_lng(bit *res, lng *i, lng *step, lng *last);
-str RNGnextElement_oid(bit *res, oid *i, oid *step, oid *last);
-str RNGnextElement_sht(bit *res, sht *i, sht *step, sht *last);
str RUNadder(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RUNchoice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RUNcostPrediction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2609,38 +2588,6 @@ str SRVPOOLregister(Client cntxt, MalBlk
str SRVPOOLreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SRVPOOLscheduler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str SRVsetServers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATclose(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdeposit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdepositStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdestroy(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdiscard(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdiscard2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATdrop(str nme);
-str STATdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATenroll(int *ret, str *nme);
-str STATenrollHistogram(int *ret, str *nme);
-str STATepilogue(int *ret);
-str STATforceUpdate(int *ret, str *nme);
-str STATforceUpdateAll(int *ret);
-str STATforceUpdateAll(int *ret);
-str STATgetCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATgetHistogram(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATgetHotset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATgetMax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATgetMin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATgetObjects(int *bid);
-str STATgetSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STAThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str STATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATopen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATprelude(int *ret);
-str STATrelease(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATreleaseStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str STATupdate(int *ret);
-str STATupdateAll(int *ret, int forced);
str STRBytes(int *res, str *arg1);
str STRConcat(str *res, str *val1, str *val2);
str STRFromWChr(str *res, int *at);
@@ -2883,8 +2830,6 @@ str ZORDdecode_int_oid_y(int *y, oid *z)
str ZORDencode_int_oid(oid *z, int *x, int *y);
str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt);
str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt){ BAT *bn;
-str ZORDsql_slice_int(int *r, int *xb, int *yb, int *xt, int *yt);
-str ZORDsql_slice_int(int *r, int *xb, int *yb, int *xt, int *yt){ int
slice_ret;
void _initTrace(void);
str activateCounter(str name);
str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
@@ -3061,7 +3006,7 @@ str finishFactory(Client cntxt, MalBlkPt
void finishNamespace(void);
str finishRef;
Module fixModule(Module scope, str nme);
-int fndConstant(MalBlkPtr mb, ValPtr cst, int depth);
+int fndConstant(MalBlkPtr mb, const ValRecord *cst, int depth);
void formatVolume(str buf, int len, lng vol);
void freeInstruction(InstrPtr p);
void freeMalBlk(MalBlkPtr mb);
@@ -3193,6 +3138,7 @@ int isUnsafeFunction(InstrPtr q);
int isUnsafeInstruction(InstrPtr q);
int isUpdateInstruction(InstrPtr p);
int isUpdated(MalBlkPtr mb, int pc);
+str iteratorRef;
str joinPathRef;
str joinRef;
str kdifferenceRef;
@@ -3358,6 +3304,7 @@ int newTmpVariable(MalBlkPtr mb, malType
int newTypeVariable(MalBlkPtr mb, malType type);
int newVariable(MalBlkPtr mb, str name, malType type);
oid nextBoxElement(Box box, oid *cursor, ValPtr v);
+str nextRef;
str notRef;
str not_uniqueRef;
int notnilProp;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1335,9 +1335,18 @@ open_urlstream(const char *url)
}
#else
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
