Changeset: fd5551fdc6c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd5551fdc6c3
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/R/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_heap.c
gdk/libbat.rc
geom/monetdb5/geom.c
libversions
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_errors.h
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/srvpool.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/Tests/pyloader04.stable.err
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/connection.h
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/conversion.h
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/formatinput.h
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/UDF/pyapi/pyheader.h
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/UDF/pyapi/pytypes.c
sql/backends/monet5/UDF/pyapi/pytypes.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/UDF/pyapi/undef.h
sql/backends/monet5/UDF/pyapi/unicode.c
sql/backends/monet5/UDF/pyapi/unicode.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/storage/store.c
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out
tools/merovingian/daemon/controlrunner.c
tools/mserver/mserver5.c
vertoo.data
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 11265 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -656,3 +656,6 @@ 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b
615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_SP2_release
566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_11
566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_SP3_release
+94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_13
+566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_SP3_release
+94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -944,6 +944,22 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Mar 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.13-20170329
+- Rebuilt.
+- BZ#6216: Assertion raised (sqlsmith)
+- BZ#6227: Monetdb fails on remote tables
+- BZ#6242: Crash on rel_reduce_groupby_exps (sqlsmith)
+- BZ#6243: Static optimization gives wrong result (1 + NULL = -127)
+- BZ#6245: Nested query crashes all versions of MonetDB or gives wrong
+ result starting from Dec2016-SP2
+- BZ#6246: update statements: references to a table do not bind to
+ its alias
+- BZ#6247: Type analysis issue (sqlsmith)
+- BZ#6248: update statements: the semantic stage does not resolve the
+ relation in the from clause
+- BZ#6251: Crash after adding an ordered index on sys.statistics column
+ and querying sys.statistics
+
* Mon Mar 13 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313
- Rebuilt.
- BZ#6138: Weak duplicate elimination in string heaps > 64KB
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
@@ -6184,12 +6184,12 @@ Ready.
[ "bbp", "getRefCount", "command bbp.getRefCount(b:bat[:any_1]):int ",
"CMDgetBATrefcnt;", "Utility for debugging MAL interpreter" ]
[ "bbp", "getStatus", "command bbp.getStatus():bat[:str] ",
"CMDbbpStatus;", "Create a BAT with the disk/load status" ]
[ "bbp", "setName", "command bbp.setName(b:bat[:any_1], n:str):str
", "CMDsetName;", "Rename a BAT" ]
+[ "blob", "#cmp", "command blob.#cmp():void ", "BLOBcmp;", ""
]
[ "blob", "#del", "command blob.#del():void ", "BLOBdel;", ""
]
[ "blob", "#fromstr", "command blob.#fromstr():void ",
"BLOBfromstr;", "" ]
[ "blob", "#hash", "command blob.#hash():void ", "BLOBhash;",
"" ]
[ "blob", "#heap", "command blob.#heap():void ", "BLOBheap;",
"" ]
[ "blob", "#length", "command blob.#length():void ", "BLOBlength;",
"" ]
-[ "blob", "#nequal", "command blob.#nequal():void ", "BLOBnequal;",
"" ]
[ "blob", "#null", "command blob.#null():void ", "BLOBnull;",
"" ]
[ "blob", "#put", "command blob.#put():void ", "BLOBput;", ""
]
[ "blob", "#read", "command blob.#read():void ", "BLOBread;",
"" ]
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
@@ -8153,12 +8153,12 @@ Ready.
[ "bbp", "getRefCount", "command bbp.getRefCount(b:bat[:any_1]):int ",
"CMDgetBATrefcnt;", "Utility for debugging MAL interpreter" ]
[ "bbp", "getStatus", "command bbp.getStatus():bat[:str] ",
"CMDbbpStatus;", "Create a BAT with the disk/load status" ]
[ "bbp", "setName", "command bbp.setName(b:bat[:any_1], n:str):str
", "CMDsetName;", "Rename a BAT" ]
+[ "blob", "#cmp", "command blob.#cmp():void ", "BLOBcmp;", ""
]
[ "blob", "#del", "command blob.#del():void ", "BLOBdel;", ""
]
[ "blob", "#fromstr", "command blob.#fromstr():void ",
"BLOBfromstr;", "" ]
[ "blob", "#hash", "command blob.#hash():void ", "BLOBhash;",
"" ]
[ "blob", "#heap", "command blob.#heap():void ", "BLOBheap;",
"" ]
[ "blob", "#length", "command blob.#length():void ", "BLOBlength;",
"" ]
-[ "blob", "#nequal", "command blob.#nequal():void ", "BLOBnequal;",
"" ]
[ "blob", "#null", "command blob.#null():void ", "BLOBnull;",
"" ]
[ "blob", "#put", "command blob.#put():void ", "BLOBput;", ""
]
[ "blob", "#read", "command blob.#read():void ", "BLOBread;",
"" ]
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
@@ -839,6 +839,7 @@ str BKCsetkey(bat *res, const bat *bid,
str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
+int BLOBcmp(blob *l, blob *r);
void BLOBdel(Heap *h, var_t *index);
str BLOBfromblob(str *retval, blob **b);
str BLOBfromidx(str *retval, blob **binp, int *index);
@@ -847,7 +848,6 @@ int BLOBget(Heap *h, int *bun, int *l, b
BUN BLOBhash(blob *b);
void BLOBheap(Heap *heap, size_t capacity);
int BLOBlength(blob *p);
-int BLOBnequal(blob *l, blob *r);
str BLOBnitems(int *ret, blob *b);
blob *BLOBnull(void);
str BLOBprelude(void *ret);
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+monetdb (11.25.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6216: Assertion raised (sqlsmith)
+ * BZ#6227: Monetdb fails on remote tables
+ * BZ#6242: Crash on rel_reduce_groupby_exps (sqlsmith)
+ * BZ#6243: Static optimization gives wrong result (1 + NULL = -127)
+ * BZ#6245: Nested query crashes all versions of MonetDB or gives wrong
+ result starting from Dec2016-SP2
+ * BZ#6246: update statements: references to a table do not bind to
+ its alias
+ * BZ#6247: Type analysis issue (sqlsmith)
+ * BZ#6248: update statements: the semantic stage does not resolve the
+ relation in the from clause
+ * BZ#6251: Crash after adding an ordered index on sys.statistics column
+ and querying sys.statistics
+
+ -- Sjoerd Mullender <sjo...@acm.org> Wed, 29 Mar 2017 13:18:23 +0200
+
monetdb (11.25.11) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -395,7 +395,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
size_t i, n;
size_t savefree;
const char *filename;
- bat bid;
+ bat bid = b->batCacheid;
assert(b->theap.parentid == 0);
assert(width != 0);
@@ -430,7 +430,6 @@ GDKupgradevarheap(BAT *b, var_t v, int c
filename = b->theap.filename;
else
filename++;
- bid = strtol(filename, NULL, 8);
if ((BBP_status(bid) & (BBPEXISTING|BBPDELETED)) &&
!file_exists(b->theap.farmid, BAKDIR, filename, NULL) &&
(b->theap.storage != STORE_MEM ||
@@ -505,7 +504,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
break;
case 4:
#ifndef NDEBUG
- memset(ps, 0, b->theap.base + b->theap.size - (char *) pi);
+ memset(pi, 0, b->theap.base + b->theap.size - (char *) pi);
#endif
switch (b->twidth) {
case 1:
@@ -521,7 +520,7 @@ GDKupgradevarheap(BAT *b, var_t v, int c
#if SIZEOF_VAR_T == 8
case 8:
#ifndef NDEBUG
- memset(ps, 0, b->theap.base + b->theap.size - (char *) pv);
+ memset(pv, 0, b->theap.base + b->theap.size - (char *) pv);
#endif
switch (b->twidth) {
case 1:
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -854,18 +854,18 @@ segmentizeLineString(GEOSGeometry **outG
//store the points so that I do not have to read them multiple times
using geos
if ((xCoords_org = GDKmalloc(pointsNum * sizeof(double))) == NULL) {
*outGeometry = NULL;
- throw(MAL, "geom.Segmentize", "Could not allocate memory for %d
double values", pointsNum);
+ throw(MAL, "geom.Segmentize", MAL_MALLOC_FAIL " for %d double
values", pointsNum);
}
if ((yCoords_org = GDKmalloc(pointsNum * sizeof(double))) == NULL) {
GDKfree(xCoords_org);
*outGeometry = NULL;
- throw(MAL, "geom.Segmentize", "Could not allocate memory for %d
double values", pointsNum);
+ throw(MAL, "geom.Segmentize", MAL_MALLOC_FAIL " for %d double
values", pointsNum);
}
if ((zCoords_org = GDKmalloc(pointsNum * sizeof(double))) == NULL) {
GDKfree(xCoords_org);
GDKfree(yCoords_org);
*outGeometry = NULL;
- throw(MAL, "geom.Segmentize", "Could not allocate memory for %d
double values", pointsNum);
+ throw(MAL, "geom.Segmentize", MAL_MALLOC_FAIL " for %d double
values", pointsNum);
}
if (!GEOSCoordSeq_getX(gcs_old, 0, &xCoords_org[0])) {
@@ -2236,7 +2236,7 @@ wkbaFROMSTR_withSRID(char *fromStr, int
size_t parsedBytes;
str err = wkbFROMSTR_withSRID(fromStr + skipBytes, len,
&(*toArray)->data[i], srid, &parsedBytes);
if (err != MAL_SUCCEED) {
- GDKfree(err);
+ freeException(err);
return 0;
}
skipBytes += parsedBytes;
@@ -3272,7 +3272,7 @@ wkbMakeLineAggr(wkb **outWKB, bat *inBAT
err = wkbFromWKB(outWKB, &aWKB);
BBPunfix(inBAT->batCacheid);
if (err) {
- GDKfree(err);
+ freeException(err);
throw(MAL, "geom.MakeLine", MAL_MALLOC_FAIL);
}
return MAL_SUCCEED;
@@ -4223,7 +4223,7 @@ wkbUnionAggr(wkb **outWKB, bat *inBAT_id
err = wkbFromWKB(outWKB, &aWKB);
BBPunfix(inBAT->batCacheid);
if (err) {
- GDKfree(err);
+ freeException(err);
throw(MAL, "geom.Union", MAL_MALLOC_FAIL);
}
return MAL_SUCCEED;
@@ -5096,7 +5096,7 @@ wkbFROMSTR(char *geomWKT, int *len, wkb
err = wkbFROMSTR_withSRID(geomWKT, len, geomWKB, 0, &parsedBytes);
if (err != MAL_SUCCEED) {
- GDKfree(err);
+ freeException(err);
return 0;
}
return (int) parsedBytes;
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=14:3:1
+GDK_VERSION=14:4:1
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=8:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:2:1
+MONETDB5_VERSION=22:3:1
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=9:0:1
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -561,7 +561,7 @@ pushNilType(MalBlkPtr mb, InstrPtr q, ch
cst.len = 0;
msg = convertConstant(idx, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,idx,&cst);
@@ -583,7 +583,7 @@ pushType(MalBlkPtr mb, InstrPtr q, int t
cst.len = 0;
msg = convertConstant(tpe, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,tpe,&cst);
@@ -606,7 +606,7 @@ pushZero(MalBlkPtr mb, InstrPtr q, int t
cst.len = 0;
msg = convertConstant(tpe, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,tpe,&cst);
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -248,7 +248,7 @@ MCinitClientRecord(Client c, oid user, b
{
str msg = AUTHgetUsername(&c->username, c);
if (msg) /* shouldn't happen */
- GDKfree(msg);
+ freeException(msg);
}
#endif
c->blocksize = BLOCK;
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -556,7 +556,7 @@ DFLOWinitBlk(DataFlow flow, MalBlkPtr mb
PARDEBUG fprintf(stderr, "#Initialize dflow block\n");
assign = (int *) GDKzalloc(mb->vtop * sizeof(int));
if (assign == NULL)
- throw(MAL, "dataflow", "DFLOWinitBlk(): Failed to allocate
assign");
+ throw(MAL, "dataflow", MAL_MALLOC_FAIL " for assign");
etop = flow->stop - flow->start;
for (n = 0, pc = flow->start; pc < flow->stop; pc++, n++) {
p = getInstrPtr(mb, pc);
@@ -878,7 +878,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
flow = (DataFlow)GDKzalloc(sizeof(DataFlowRec));
if (flow == NULL)
- throw(MAL, "dataflow", "runMALdataflow(): Failed to allocate
flow");
+ throw(MAL, "dataflow", MAL_MALLOC_FAIL " for flow");
flow->cntxt = cntxt;
flow->mb = mb;
@@ -902,7 +902,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
q_destroy(flow->done);
MT_lock_destroy(&flow->flowlock);
GDKfree(flow);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
