Changeset: 9e3624ff3f28 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9e3624ff3f28
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: client_interrupts
Log Message:
Reduce the amount of polling: the poor mac couldn't handle it.
diffs (39 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -414,7 +414,7 @@ output_file_default(Tablet *as, BAT *ord
}
for (q = offset + as->nr, p = offset, id = order->hseqbase + offset; p
< q;
p++, id++) {
- if (bstream_getoob(in)) {
+ if (((p - offset) & 8191) == 8191 && bstream_getoob(in)) {
res = -5;
break;
}
@@ -442,7 +442,7 @@ output_file_dense(Tablet *as, stream *fd
return -1;
}
for (i = 0; i < as->nr; i++) {
- if (bstream_getoob(in)) {
+ if ((i & 8191) == 8191 && bstream_getoob(in)) {
res = -5; /* "Query aborted" */
break;
}
@@ -470,7 +470,7 @@ output_file_ordered(Tablet *as, BAT *ord
for (q = offset + as->nr, p = offset; p < q; p++, i++) {
oid h = order->hseqbase + p;
- if (bstream_getoob(in)) {
+ if (((p - offset) & 8191) == 8191 && bstream_getoob(in)) {
res = -5;
break;
}
@@ -1265,7 +1265,7 @@ SQLproducer(void *p)
// we may be reading from standard input and may be out of input
// warn the consumers
- if (task->aborted || bstream_getoob(task->cntxt->fdin)) {
+ if (task->aborted || ((lineno & 8191) == 0 &&
bstream_getoob(task->cntxt->fdin))) {
tablet_error(task, rowno, lineno, int_nil,
"problem reported by client",
s);
ateof[cur] = true;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
