Changeset: f57a867a2004 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f57a867a2004
Added Files:
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.out
Modified Files:
MonetDB.spec
clients/Tests/exports.stable.out
debian/control
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_cross.c
gdk/gdk_delta.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_join_legacy.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_setop.c
gdk/gdk_storage.c
gdk/gdk_utils.c
gdk/gdk_value.c
geom/monetdb5/geom.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/include/sql_mem.h
sql/server/rel_schema.c
sql/test/BugTracker-2015/Tests/All
testing/malcheck.py
Branch: resultset
Log Message:
Merge with default branch.
diffs (truncated from 3817 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -161,6 +161,8 @@ more client packages.
Summary: MonetDB development files
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: libatomic_ops-devel
%description devel
MonetDB is a database management system that is developed from a
@@ -688,6 +690,7 @@ MonetDB5-server component.
Summary: MonetDB development files
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description -n MonetDB5-server-devel
MonetDB is a database management system that is developed from a
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
@@ -30,7 +30,7 @@ BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s
BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s);
-int BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals);
+gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals);
BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int sym);
BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int
sym);
BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int
sym);
@@ -339,34 +339,34 @@ 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);
-int VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo, const
ValRecord *hi, int sym);
-int VARcalccmp(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcdecr(ValPtr ret, const ValRecord *v, int abort_on_error);
-int VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalceq(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcge(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcgt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcincr(ValPtr ret, const ValRecord *v, int abort_on_error);
-int VARcalcisnil(ValPtr ret, const ValRecord *v);
-int VARcalcisnotnil(ValPtr ret, const ValRecord *v);
-int VARcalciszero(ValPtr ret, const ValRecord *v);
-int VARcalcle(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalclsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalclt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcmod(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalcmul(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalcne(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcnegate(ValPtr ret, const ValRecord *v);
-int VARcalcnot(ValPtr ret, const ValRecord *v);
-int VARcalcor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARcalcrsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalcsign(ValPtr ret, const ValRecord *v);
-int VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
-int VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-int VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
+gdk_return VARcalcabsolute(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo,
const ValRecord *hi, int sym);
+gdk_return VARcalccmp(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcdecr(ValPtr ret, const ValRecord *v, int abort_on_error);
+gdk_return VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalceq(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcge(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcgt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcincr(ValPtr ret, const ValRecord *v, int abort_on_error);
+gdk_return VARcalcisnil(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcisnotnil(ValPtr ret, const ValRecord *v);
+gdk_return VARcalciszero(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcle(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalclsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalclt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcmod(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcmul(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcne(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcnegate(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcnot(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARcalcrsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcsign(ValPtr ret, const ValRecord *v);
+gdk_return VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+gdk_return VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
BAT *VIEWcombine(BAT *b);
BAT *VIEWcreate(BAT *h, BAT *t);
@@ -924,7 +924,7 @@ blob *BLOBread(blob *a, stream *s, size_
str BLOBsqlblob_fromstr(sqlblob **b, str *d);
str BLOBtoblob(blob **retval, str *s);
int BLOBtostr(str *tostr, int *l, blob *pin);
-int BLOBwrite(blob *a, stream *s, size_t cnt);
+gdk_return BLOBwrite(blob *a, stream *s, size_t cnt);
str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2025,7 +2025,7 @@ uuid *UUIDread(uuid *u, stream *s, size_
str UUIDstr2uuid(uuid **retval, str *s);
int UUIDtoString(str *retval, int *len, const uuid *value);
str UUIDuuid2str(str *retval, uuid **u);
-int UUIDwrite(const uuid *u, stream *s, size_t cnt);
+gdk_return UUIDwrite(const uuid *u, stream *s, size_t cnt);
str XMLattribute(xml *ret, str *name, str *val);
str XMLcomment(xml *x, str *s);
str XMLconcat(xml *ret, xml *left, xml *right);
@@ -2361,23 +2361,23 @@ str listRef;
str loadLibrary(str modulename, int flag);
char *locate_file(const char *basename, const char *ext, bit recurse);
str lockRef;
-int log_abort_wrap(logger *L);
-int log_bat_clear_wrap(logger *L, str nme);
-int log_bat_persists_wrap(logger *L, BAT *b, str nme);
-int log_bat_transient_wrap(logger *L, str nme);
-int log_bat_wrap(logger *L, BAT *b, str nme);
-int log_delta_wrap(logger *L, BAT *uid, BAT *b, str nme);
-int log_tend_wrap(logger *L);
-int log_tstart_wrap(logger *L);
-int logger_add_bat_wrap(int *bid, logger *L, BAT *b, str nme);
-int logger_changes_wrap(int *r, logger *L);
-int logger_cleanup_wrap(logger *L);
+gdk_return log_abort_wrap(logger *L);
+gdk_return log_bat_clear_wrap(logger *L, str nme);
+gdk_return log_bat_persists_wrap(logger *L, BAT *b, str nme);
+gdk_return log_bat_transient_wrap(logger *L, str nme);
+gdk_return log_bat_wrap(logger *L, BAT *b, str nme);
+gdk_return log_delta_wrap(logger *L, BAT *uid, BAT *b, str nme);
+gdk_return log_tend_wrap(logger *L);
+gdk_return log_tstart_wrap(logger *L);
+gdk_return logger_add_bat_wrap(int *bid, logger *L, BAT *b, str nme);
+gdk_return logger_changes_wrap(int *r, logger *L);
+gdk_return logger_cleanup_wrap(logger *L);
str logger_create_wrap(logger *L, int *debug, str *fn, str *dirname, int
*version);
-int logger_del_bat_wrap(logger *L, int *bid);
+gdk_return logger_del_bat_wrap(logger *L, int *bid);
str logger_destroy_wrap(void *ret, logger *L);
-int logger_exit_wrap(logger *L);
-int logger_find_bat_wrap(int *bid, logger *L, str nme);
-int logger_restart_wrap(logger *L);
+gdk_return logger_exit_wrap(logger *L);
+gdk_return logger_find_bat_wrap(int *bid, logger *L, str nme);
+gdk_return logger_restart_wrap(logger *L);
str lookupRef;
str mal2str(MalBlkPtr mb, int first, int last);
malType malAnyBatType(malType t1, malType t2);
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,11 @@ Vcs-Browser: http://dev.monetdb.org/hg/M
Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
# for Build-Depends and Depends syntax, see
# http://www.debian.org/doc/debian-policy/ch-relationships.html
-Build-Depends: debhelper (>= 5), autotools-dev, bison, libbz2-dev,
- libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0), libgsl0-dev, libpcre3-dev,
- libreadline-gplv2-dev | libreadline-dev, libssl-dev, libxml2-dev, perl,
- ruby, rubygems | libyaml-0-2, unixodbc-dev, uuid-dev, zlib1g-dev,
- python, python3,
- libbam-dev, pkg-config
+Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
+ libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0),
+ libgsl0-dev, libpcre3-dev, libreadline-gplv2-dev | libreadline-dev,
+ libssl-dev, libxml2-dev, perl, pkg-config, python, python3, ruby,
+ rubygems | libyaml-0-2, unixodbc-dev, uuid-dev, zlib1g-dev
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.0
@@ -20,8 +19,6 @@ X-Python3-Version: >= 3.0
Package: libmonetdb11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb1, libmonetdb2
-Replaces: libmonetdb1, libmonetdb2
Description: MonetDB core library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -36,7 +33,8 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb11
+Depends: ${shlibs:Depends}, ${misc:Depends}, libatomic-ops-dev,
+ libmonetdb11, libmonetdb-stream-dev
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -47,8 +45,6 @@ Description: MonetDB development files
functionality of MonetDB.
Package: libmonetdb-stream6
-Conflicts: libmonetdb-stream2
-Replaces: libmonetdb-stream2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -75,8 +71,6 @@ Description: MonetDB stream library deve
Package: libmonetdb-client7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client1, libmonetdb-client2
-Replaces: libmonetdb-client1, libmonetdb-client2
Description: MonetDB client/server interface library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -127,8 +121,6 @@ Description: MonetDB database client
Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
-Replaces: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
Description: MonetDB ODBC driver
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -153,8 +145,6 @@ Package: perl-monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}
Provides: ${perl:Provides}
-Conflicts: libmonetdb-client-perl
-Replaces: libmonetdb-client-perl
Description: MonetDB perl client code
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -193,8 +183,6 @@ Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
-Conflicts: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
-Replaces: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -233,8 +221,6 @@ Description: MonetDB5 SQL GIS support mo
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: libmonetdb5-server5, libmonetdb5-server-dev, libmonetdb1,
libmonetdb-dev
-Replaces: libmonetdb5-server5, libmonetdb5-server-dev
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -259,7 +245,7 @@ Description: MonetDB - 128-bit integer s
Package: monetdb5-server-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server, libmonetdb-dev
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -272,8 +258,6 @@ Description: MonetDB database server ver
Package: monetdb5-sql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (=
${source:Version})
-Conflicts: libmonetdb5-sql2
-Replaces: libmonetdb5-sql2
Description: MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -390,15 +390,9 @@
#define MIN(A,B) ((A)>(B)?(B):(A))
/* defines from ctype with casts that allow passing char values */
-#define GDKisprint(c) isprint((int) (unsigned char) (c))
#define GDKisspace(c) isspace((int) (unsigned char) (c))
#define GDKisalnum(c) isalnum((int) (unsigned char) (c))
-#define GDKisgraph(c) isgraph((int) (unsigned char) (c))
#define GDKisdigit(c) (((unsigned char) (c)) >= '0' && ((unsigned char) (c))
<= '9')
-#define GDKisxcntrl(c) (((unsigned char) (c)) >= 128 && ((unsigned char) (c))
<= 160)
-#define GDKisspecial(c) (((unsigned char) (c)) >= 161 && ((unsigned char) (c))
<= 191)
-#define GDKisupperl(c) (((unsigned char) (c)) >= 192 && ((unsigned char) (c))
<= 223)
-#define GDKislowerl(c) (((unsigned char) (c)) >= 224 && ((unsigned char) (c))
<= 255)
#define GDKPROP 6 /* use one spare! */
#define MONETHOME "MONETHOME"
@@ -1169,7 +1163,7 @@ gdk_export bte ATOMelmshift(int sz);
if ((b)->HT->width < SIZEOF_VAR_T && \
((b)->HT->width <= 2 ? _d - GDK_VAROFFSET : _d) >=
((size_t) 1 << (8 * (b)->HT->width))) { \
/* doesn't fit in current heap, upgrade it */ \
- if (GDKupgradevarheap((b)->HT, _d, (copyall),
(b)->batRestricted == BAT_READ) == GDK_FAIL) \
+ if (GDKupgradevarheap((b)->HT, _d, (copyall),
(b)->batRestricted == BAT_READ) != GDK_SUCCEED) \
goto bunins_failed; \
} \
_ptr = (p); \
@@ -1217,7 +1211,7 @@ gdk_export bte ATOMelmshift(int sz);
if ((b)->HT->width < SIZEOF_VAR_T && \
((b)->HT->width <= 2 ? _d - GDK_VAROFFSET : _d) >=
((size_t) 1 << (8 * (b)->HT->width))) { \
/* doesn't fit in current heap, upgrade it */ \
- if (GDKupgradevarheap((b)->HT, _d, 0,
(b)->batRestricted == BAT_READ) == GDK_FAIL) \
+ if (GDKupgradevarheap((b)->HT, _d, 0,
(b)->batRestricted == BAT_READ) != GDK_SUCCEED) \
goto bunins_failed; \
} \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
