Changeset: a152218822a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a152218822a0
Modified Files:
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.h
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/batcolor.h
monetdb5/modules/kernel/batmmath.h
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/group.h
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/microbenchmark.h
monetdb5/modules/kernel/mmath.h
monetdb5/modules/kernel/status.h
monetdb5/modules/mal/batExtensions.h
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/factories.h
monetdb5/modules/mal/groupby.h
monetdb5/modules/mal/inspect.h
monetdb5/modules/mal/iterator.h
monetdb5/modules/mal/json_util.h
monetdb5/modules/mal/language.h
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_mapi.h
monetdb5/modules/mal/manifold.h
monetdb5/modules/mal/manual.h
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/mkey.h
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/projectionpath.h
monetdb5/modules/mal/querylog.h
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/sabaoth.h
monetdb5/modules/mal/sample.h
monetdb5/modules/mal/sysmon.h
monetdb5/modules/mal/tablet.h
monetdb5/modules/mal/tokenizer.h
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/txtsim.h
monetdb5/modules/mal/zorder.h
monetdb5/optimizer/opt_aliases.h
monetdb5/optimizer/opt_candidates.h
monetdb5/optimizer/opt_coercion.h
monetdb5/optimizer/opt_commonTerms.h
monetdb5/optimizer/opt_constants.h
monetdb5/optimizer/opt_costModel.h
monetdb5/optimizer/opt_dataflow.h
monetdb5/optimizer/opt_deadcode.h
monetdb5/optimizer/opt_evaluate.h
monetdb5/optimizer/opt_factorize.h
monetdb5/optimizer/opt_garbageCollector.h
monetdb5/optimizer/opt_generator.h
monetdb5/optimizer/opt_inline.h
monetdb5/optimizer/opt_json.h
monetdb5/optimizer/opt_macro.h
monetdb5/optimizer/opt_matpack.h
monetdb5/optimizer/opt_mergetable.h
monetdb5/optimizer/opt_mitosis.h
monetdb5/optimizer/opt_multiplex.h
monetdb5/optimizer/opt_pipes.h
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.h
monetdb5/optimizer/opt_projectionpath.h
monetdb5/optimizer/opt_pushselect.h
monetdb5/optimizer/opt_querylog.h
monetdb5/optimizer/opt_recycler.h
monetdb5/optimizer/opt_reduce.h
monetdb5/optimizer/opt_remap.h
monetdb5/optimizer/opt_remoteQueries.h
monetdb5/optimizer/opt_reorder.h
monetdb5/optimizer/opt_statistics.h
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_volcano.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.h
monetdb5/scheduler/run_adder.h
monetdb5/scheduler/run_isolate.h
monetdb5/scheduler/run_memo.h
monetdb5/scheduler/run_pipeline.h
monetdb5/scheduler/srvpool.h
sql/backends/monet5/sql_execute.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 6100 to 300 lines):
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -35,32 +35,26 @@
#include "mal_function.h"
#include "xml.h"
-#ifdef WIN32
-#define batxml_export extern __declspec(dllexport)
-#else
-#define batxml_export extern
-#endif
-
-batxml_export str BATXMLxml2str(bat *ret, const bat *bid);
-batxml_export str BATXMLxmltext(bat *ret, const bat *bid);
-batxml_export str BATXMLstr2xml(bat *ret, const bat *bid);
-batxml_export str BATXMLdocument(bat *ret, const bat *bid);
-batxml_export str BATXMLcontent(bat *ret, const bat *bid);
-batxml_export str BATXMLisdocument(bat *ret, const bat *bid);
-batxml_export str BATXMLelementSmall(bat *ret, const char * const *name, const
bat *bid);
-batxml_export str BATXMLoptions(bat *ret, const char * const *name, const char
* const *options, const bat *bid);
-batxml_export str BATXMLcomment(bat *ret, const bat *bid);
-batxml_export str BATXMLparse(bat *ret, const char * const *doccont, const bat
*bid, const char * const *option);
-batxml_export str BATXMLxquery(bat *ret, const bat *bid, const char * const
*expr);
-batxml_export str BATXMLpi(bat *ret, const char * const *tgt, const bat *bid);
-batxml_export str BATXMLroot(bat *ret, const bat *bid, const char * const
*version, const char * const *standalone);
-batxml_export str BATXMLattribute(bat *ret, const char * const *name, const
bat *bid);
-batxml_export str BATXMLelement(bat *ret, const char * const *name, xml *ns,
xml *attr, const bat *bid);
-batxml_export str BATXMLconcat(bat *ret, const bat *bid, const bat *rid);
-batxml_export str BATXMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-batxml_export str BATXMLgroup(xml *ret, const bat *bid);
-batxml_export str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bat *sid, const bit *skip_nils);
-batxml_export str AGGRsubxml(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bit *skip_nils);
+mal_export str BATXMLxml2str(bat *ret, const bat *bid);
+mal_export str BATXMLxmltext(bat *ret, const bat *bid);
+mal_export str BATXMLstr2xml(bat *ret, const bat *bid);
+mal_export str BATXMLdocument(bat *ret, const bat *bid);
+mal_export str BATXMLcontent(bat *ret, const bat *bid);
+mal_export str BATXMLisdocument(bat *ret, const bat *bid);
+mal_export str BATXMLelementSmall(bat *ret, const char * const *name, const
bat *bid);
+mal_export str BATXMLoptions(bat *ret, const char * const *name, const char *
const *options, const bat *bid);
+mal_export str BATXMLcomment(bat *ret, const bat *bid);
+mal_export str BATXMLparse(bat *ret, const char * const *doccont, const bat
*bid, const char * const *option);
+mal_export str BATXMLxquery(bat *ret, const bat *bid, const char * const
*expr);
+mal_export str BATXMLpi(bat *ret, const char * const *tgt, const bat *bid);
+mal_export str BATXMLroot(bat *ret, const bat *bid, const char * const
*version, const char * const *standalone);
+mal_export str BATXMLattribute(bat *ret, const char * const *name, const bat
*bid);
+mal_export str BATXMLelement(bat *ret, const char * const *name, xml *ns, xml
*attr, const bat *bid);
+mal_export str BATXMLconcat(bat *ret, const bat *bid, const bat *rid);
+mal_export str BATXMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
+mal_export str BATXMLgroup(xml *ret, const bat *bid);
+mal_export str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bat *sid, const bit *skip_nils);
+mal_export str AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const
bat *eid, const bit *skip_nils);
#ifdef HAVE_LIBXML
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -35,31 +35,31 @@
int TYPE_blob;
int TYPE_sqlblob;
-blob_export str BLOBprelude(void *ret);
+mal_export str BLOBprelude(void *ret);
-blob_export int BLOBtostr(str *tostr, int *l, blob *pin);
-blob_export int BLOBfromstr(char *instr, int *l, blob **val);
-blob_export int BLOBnequal(blob *l, blob *r);
-blob_export BUN BLOBhash(blob *b);
-blob_export blob * BLOBnull(void);
-blob_export var_t BLOBput(Heap *h, var_t *bun, blob *val);
-blob_export void BLOBdel(Heap *h, var_t *index);
-blob_export int BLOBlength(blob *p);
-blob_export void BLOBheap(Heap *heap, size_t capacity);
-blob_export int SQLBLOBfromstr(char *instr, int *l, blob **val);
-blob_export int SQLBLOBtostr(str *tostr, int *l, blob *pin);
-blob_export str BLOBtoblob(blob **retval, str *s);
-blob_export str BLOBfromblob(str *retval, blob **b);
-blob_export str BLOBfromidx(str *retval, blob **binp, int *index);
-blob_export str BLOBnitems(int *ret, blob *b);
-blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
-blob_export blob * BLOBread(blob *a, stream *s, size_t cnt);
-blob_export gdk_return BLOBwrite(blob *a, stream *s, size_t cnt);
+mal_export int BLOBtostr(str *tostr, int *l, blob *pin);
+mal_export int BLOBfromstr(char *instr, int *l, blob **val);
+mal_export int BLOBnequal(blob *l, blob *r);
+mal_export BUN BLOBhash(blob *b);
+mal_export blob * BLOBnull(void);
+mal_export var_t BLOBput(Heap *h, var_t *bun, blob *val);
+mal_export void BLOBdel(Heap *h, var_t *index);
+mal_export int BLOBlength(blob *p);
+mal_export void BLOBheap(Heap *heap, size_t capacity);
+mal_export int SQLBLOBfromstr(char *instr, int *l, blob **val);
+mal_export int SQLBLOBtostr(str *tostr, int *l, blob *pin);
+mal_export str BLOBtoblob(blob **retval, str *s);
+mal_export str BLOBfromblob(str *retval, blob **b);
+mal_export str BLOBfromidx(str *retval, blob **binp, int *index);
+mal_export str BLOBnitems(int *ret, blob *b);
+mal_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
+mal_export blob * BLOBread(blob *a, stream *s, size_t cnt);
+mal_export gdk_return BLOBwrite(blob *a, stream *s, size_t cnt);
-blob_export str BLOBblob_blob(blob **d, blob **s);
-blob_export str BLOBblob_fromstr(blob **b, str *d);
+mal_export str BLOBblob_blob(blob **d, blob **s);
+mal_export str BLOBblob_fromstr(blob **b, str *d);
-blob_export str BLOBsqlblob_fromstr(sqlblob **b, str *d);
+mal_export str BLOBsqlblob_fromstr(sqlblob **b, str *d);
str
BLOBprelude(void *ret)
diff --git a/monetdb5/modules/atoms/blob.h b/monetdb5/modules/atoms/blob.h
--- a/monetdb5/modules/atoms/blob.h
+++ b/monetdb5/modules/atoms/blob.h
@@ -21,21 +21,11 @@ typedef struct blob {
#define sqlblob blob
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
-#define blob_export extern __declspec(dllimport)
-#else
-#define blob_export extern __declspec(dllexport)
-#endif
-#else
-#define blob_export extern
-#endif
+mal_export int TYPE_blob;
+mal_export int TYPE_sqlblob;
-blob_export int TYPE_blob;
-blob_export int TYPE_sqlblob;
-
-blob_export var_t blobsize(size_t nitems);
-blob_export int sqlblob_tostr(str *tostr, int *l, const blob *p);
-blob_export int sqlblob_fromstr(char *instr, int *l, blob **val);
+mal_export var_t blobsize(size_t nitems);
+mal_export int sqlblob_tostr(str *tostr, int *l, const blob *p);
+mal_export int sqlblob_fromstr(char *instr, int *l, blob **val);
#endif /* __BLOB_H__ */
diff --git a/monetdb5/modules/atoms/color.h b/monetdb5/modules/atoms/color.h
--- a/monetdb5/modules/atoms/color.h
+++ b/monetdb5/modules/atoms/color.h
@@ -10,35 +10,25 @@
#define _COLOR_H
typedef unsigned int color;
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
-#define color_export extern __declspec(dllimport)
-#else
-#define color_export extern __declspec(dllexport)
-#endif
-#else
-#define color_export extern
-#endif
-
-color_export str CLRstr(str *val, color *c);
-color_export str CLRcolor(color *c, str *val);
-color_export str CLRred(int *r, color *c);
-color_export str CLRgreen(int *g, color *c);
-color_export str CLRblue(int *b, color *c);
-color_export str CLRhue(flt *r, color *c);
-color_export str CLRsaturation(flt *g, color *c);
-color_export str CLRvalue(flt *b, color *c);
-color_export str CLRhueInt(int *r, color *c);
-color_export str CLRsaturationInt(int *g, color *c);
-color_export str CLRvalueInt(int *b, color *c);
-color_export str CLRluminance(int *r, color *c);
-color_export str CLRcr(int *r, color *c);
-color_export str CLRcb(int *g, color *c);
-color_export str CLRhsv(color *c, flt *h, flt *s, flt *v);
-color_export str CLRrgb(color *rgb, int *r, int *g, int *b);
-color_export str CLRycc(color *c, int *y, int *cr, int *cb);
-color_export int color_fromstr(char *colorStr, int *len, color **c);
-color_export int color_tostr(char **colorStr, int *len, color *c);
+mal_export str CLRstr(str *val, color *c);
+mal_export str CLRcolor(color *c, str *val);
+mal_export str CLRred(int *r, color *c);
+mal_export str CLRgreen(int *g, color *c);
+mal_export str CLRblue(int *b, color *c);
+mal_export str CLRhue(flt *r, color *c);
+mal_export str CLRsaturation(flt *g, color *c);
+mal_export str CLRvalue(flt *b, color *c);
+mal_export str CLRhueInt(int *r, color *c);
+mal_export str CLRsaturationInt(int *g, color *c);
+mal_export str CLRvalueInt(int *b, color *c);
+mal_export str CLRluminance(int *r, color *c);
+mal_export str CLRcr(int *r, color *c);
+mal_export str CLRcb(int *g, color *c);
+mal_export str CLRhsv(color *c, flt *h, flt *s, flt *v);
+mal_export str CLRrgb(color *rgb, int *r, int *g, int *b);
+mal_export str CLRycc(color *c, int *y, int *cr, int *cb);
+mal_export int color_fromstr(char *colorStr, int *len, color **c);
+mal_export int color_tostr(char **colorStr, int *len, color *c);
#define color_nil ((color)int_nil)
diff --git a/monetdb5/modules/atoms/identifier.c
b/monetdb5/modules/atoms/identifier.c
--- a/monetdb5/modules/atoms/identifier.c
+++ b/monetdb5/modules/atoms/identifier.c
@@ -23,21 +23,11 @@
typedef str identifier;
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
-#define identifier_export extern __declspec(dllimport)
-#else
-#define identifier_export extern __declspec(dllexport)
-#endif
-#else
-#define identifier_export extern
-#endif
-
-identifier_export int TYPE_identifier;
-identifier_export str IDprelude(void *ret);
-identifier_export int IDfromString(str src, int *len, identifier *retval);
-identifier_export int IDtoString(str *retval, int *len, identifier handle);
-identifier_export str IDentifier(identifier *retval, str *in);
+mal_export int TYPE_identifier;
+mal_export str IDprelude(void *ret);
+mal_export int IDfromString(str src, int *len, identifier *retval);
+mal_export int IDtoString(str *retval, int *len, identifier handle);
+mal_export str IDentifier(identifier *retval, str *in);
int TYPE_identifier;
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -54,43 +54,33 @@ typedef struct _inet {
#endif
#define in_setnil(i) (i)->q1 = (i)->q2 = (i)->q3 = (i)->q4 = (i)->mask =
(i)->filler1 = (i)->filler2 = 0; (i)->isnil = 1
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
-#define inet_export extern __declspec(dllimport)
-#else
-#define inet_export extern __declspec(dllexport)
-#endif
-#else
-#define inet_export extern
-#endif
-
-inet_export int INETfromString(const char *src, int *len, inet **retval);
-inet_export int INETtoString(str *retval, int *len, const inet *handle);
-inet_export int INETcompare(const inet *l, const inet *r);
-inet_export str INETnew(inet *retval, str *in);
-inet_export str INET_isnil(bit *retval, const inet *val);
-inet_export str INET_comp_EQ(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_NEQ(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_LT(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_GT(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_LE(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_GE(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_CW(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_CWE(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_CS(bit *retval, const inet *val1, const inet *val2);
-inet_export str INET_comp_CSE(bit *retval, const inet *val1, const inet *val2);
-inet_export str INETbroadcast(inet *retval, const inet *val);
-inet_export str INEThost(str *retval, const inet *val);
-inet_export str INETmasklen(int *retval, const inet *val);
-inet_export str INETsetmasklen(inet *retval, const inet *val, const int *mask);
-inet_export str INETnetmask(inet *retval, const inet *val);
-inet_export str INEThostmask(inet *retval, const inet *val);
-inet_export str INETnetwork(inet *retval, const inet *val);
-inet_export str INETtext(str *retval, const inet *val);
-inet_export str INETabbrev(str *retval, const inet *val);
-inet_export str INET_inet(inet *d, const inet *s);
-inet_export str INET_fromstr(inet *ret, str *s);
-inet_export inet *INETnull(void);
+mal_export int INETfromString(const char *src, int *len, inet **retval);
+mal_export int INETtoString(str *retval, int *len, const inet *handle);
+mal_export int INETcompare(const inet *l, const inet *r);
+mal_export str INETnew(inet *retval, str *in);
+mal_export str INET_isnil(bit *retval, const inet *val);
+mal_export str INET_comp_EQ(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_NEQ(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_LT(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_GT(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_LE(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_GE(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_CW(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_CWE(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_CS(bit *retval, const inet *val1, const inet *val2);
+mal_export str INET_comp_CSE(bit *retval, const inet *val1, const inet *val2);
+mal_export str INETbroadcast(inet *retval, const inet *val);
+mal_export str INEThost(str *retval, const inet *val);
+mal_export str INETmasklen(int *retval, const inet *val);
+mal_export str INETsetmasklen(inet *retval, const inet *val, const int *mask);
+mal_export str INETnetmask(inet *retval, const inet *val);
+mal_export str INEThostmask(inet *retval, const inet *val);
+mal_export str INETnetwork(inet *retval, const inet *val);
+mal_export str INETtext(str *retval, const inet *val);
+mal_export str INETabbrev(str *retval, const inet *val);
+mal_export str INET_inet(inet *d, const inet *s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
