Changeset: fce61c6df2b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fce61c6df2b7
Modified Files:
MonetDB5/src/modules/mal/remote.mx
Branch: default
Log Message:
Make sure we always send an empty line after batload, or the communication with
the remote server will get out of sync, since the server waits for the empty
line.
diffs (32 lines):
diff -r 4493943e12a6 -r fce61c6df2b7 MonetDB5/src/modules/mal/remote.mx
--- a/MonetDB5/src/modules/mal/remote.mx Thu Sep 16 11:39:27 2010 +0200
+++ b/MonetDB5/src/modules/mal/remote.mx Thu Sep 16 13:17:04 2010 +0200
@@ -804,18 +804,18 @@
GDKfree(tailv);
}
BBPunfix(b->batCacheid);
+ }
- /* write the empty line the server is waiting for,
handles
- * all errors at the same time, if any */
- qbuf[0] = '\0';
- if ((tmp = RMTquery(&mhdl, "remote.put", c->mconn,
qbuf))
- != MAL_SUCCEED)
- {
- mal_unset_lock(c->lock, "remote.put");
- return tmp;
- }
- mapi_close_handle(mhdl);
+ /* write the empty line the server is waiting for, handles
+ * all errors at the same time, if any */
+ qbuf[0] = '\0';
+ if ((tmp = RMTquery(&mhdl, "remote.put", c->mconn, qbuf))
+ != MAL_SUCCEED)
+ {
+ mal_unset_lock(c->lock, "remote.put");
+ return tmp;
}
+ mapi_close_handle(mhdl);
} else {
str val = NULL;
char qbuf[BUFSIZ + 1]; /* FIXME: this should be dynamic */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
