Changeset: 52aa4edebd24 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52aa4edebd24
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: Jun2020
Log Message:
when not using 'besteffort' we exit the loader on the first incorrect field
diffs (29 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
@@ -1074,7 +1074,6 @@ SQLworker(void *arg)
while (task->top[task->cur] >= 0) {
MT_sema_down(&task->sema);
-
/* stage one, break the lines spread the worker over the
workers */
switch (task->state) {
case BREAKLINE:
@@ -1093,6 +1092,8 @@ SQLworker(void *arg)
task->wtime = GDKusec() - t0;
break;
case UPDATEBAT:
+ if (!task->besteffort && task->errorcnt)
+ break;
/* stage two, updating the BATs */
for (i = 0; i < task->as->nr_attrs; i++)
if (task->cols[i]) {
@@ -1105,6 +1106,8 @@ SQLworker(void *arg)
}
break;
case SYNCBAT:
+ if (!task->besteffort && task->errorcnt)
+ break;
for (i = 0; i < task->as->nr_attrs; i++)
if (task->cols[i]) {
BAT *b = task->as->format[task->cols[i]
- 1].c;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
