Changeset: dea33b647bb7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dea33b647bb7
Branch: nested
Log Message:
merged with default
diffs (33 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2743,7 +2743,7 @@ log_flush(logger *lg, ulng ts)
}
if (lg->saved_id >= lid) {
/* if too many pending */
- if (lg->saved_id + lg->cur_max_pending > lg->id) {
+ if (lg->saved_id + lg->cur_max_pending < lg->id) {
lg->cur_max_pending *= 2; /* when to warn again */
TRC_WARNING(GDK, "Too many pending log files " LLFMT
"\n", (lg->id - lg->saved_id));
if (GDKtriggerusr1 &&
diff --git a/gdk/gdk_rtree.c b/gdk/gdk_rtree.c
--- a/gdk/gdk_rtree.c
+++ b/gdk/gdk_rtree.c
@@ -88,7 +88,7 @@ persistRtree(BAT *b)
const char * filename = BBP_physical(b->batCacheid);
int farmid = b->theap->farmid;
- FILE *file_stream = GDKfilelocate(farmid, filename,
"w", "bsrt");
+ FILE *file_stream = GDKfilelocate(farmid, filename,
"wb", "bsrt");
if (file_stream != NULL) {
int err;
@@ -130,7 +130,7 @@ BATcheckrtree(BAT *b)
int farmid = b->theap->farmid;
//Do we have the rtree on file?
- FILE *file_stream = GDKfilelocate(farmid, filename, "r", "bsrt");
+ FILE *file_stream = GDKfilelocate(farmid, filename, "rb", "bsrt");
if (file_stream != NULL) {
rtree_t* rtree = rtree_bsrt_read(file_stream);
if (!rtree) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
