MonetDB: Dec2016 - Clear the correct bit of memory.

2017-03-27 Thread Sjoerd Mullender 
Changeset: 48becf736621 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48becf736621
Modified Files:
gdk/gdk_heap.c
Branch: Dec2016
Log Message:

Clear the correct bit of memory.
Note, this only occurred in debug (--enable-assert) builds.


diffs (21 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -504,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:
@@ -520,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:
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - Simplify.

2017-03-27 Thread Sjoerd Mullender 
Changeset: bc4af81dea67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc4af81dea67
Modified Files:
gdk/gdk_heap.c
Branch: Dec2016
Log Message:

Simplify.


diffs (20 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -394,7 +394,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);
@@ -429,7 +429,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 ||
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Dec2016 branch.

2017-03-27 Thread Sjoerd Mullender 
Changeset: a353c55efd8c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a353c55efd8c
Modified Files:
gdk/gdk_heap.c
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (38 lines):

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:
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - disabled r tests for now because of their hig...

2017-03-27 Thread Hannes Muehleisen 
Changeset: e798e9acbc37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e798e9acbc37
Modified Files:
clients/R/Tests/All
Branch: Dec2016
Log Message:

disabled r tests for now because of their high volatility


diffs (20 lines):

diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,8 +1,8 @@
-HAVE_LIBR?deps-install
-HAVE_LIBR?install
-HAVE_LIBR?deps-test
-HAVE_LIBR?dbi
-HAVE_LIBR?dplyr
-HAVE_LIBR?dplyr-flights
-HAVE_LIBR?copy_into_fwf
-HAVE_LIBR&NOT_WIN32?dbapply
+#HAVE_LIBR?deps-install
+#HAVE_LIBR?install
+#HAVE_LIBR?deps-test
+#HAVE_LIBR?dbi
+#HAVE_LIBR?dplyr
+#HAVE_LIBR?dplyr-flights
+#HAVE_LIBR?copy_into_fwf
+#HAVE_LIBR&NOT_WIN32?dbapply
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list