Changeset: 28e63bd4be70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/28e63bd4be70
Modified Files:
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_project.c
Branch: Jul2021
Log Message:
A little cleanup.
diffs (87 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -201,31 +201,31 @@ gettailname(const BAT *b)
void
settailname(Heap *restrict tail, const char *restrict physnme, int tt, int
width)
{
- strconcat_len(tail->filename, sizeof(tail->filename), physnme,
- ".tail", NULL);
if (tt == TYPE_str) {
switch (width) {
case 1:
strconcat_len(tail->filename,
sizeof(tail->filename), physnme,
".tail1", NULL);
- break;
+ return;
case 2:
strconcat_len(tail->filename,
sizeof(tail->filename), physnme,
".tail2", NULL);
- break;
+ return;
#if SIZEOF_VAR_T == 8
case 4:
strconcat_len(tail->filename,
sizeof(tail->filename), physnme,
".tail4", NULL);
- break;
+ return;
#endif
default:
break;
}
}
+ strconcat_len(tail->filename, sizeof(tail->filename), physnme,
+ ".tail", NULL);
}
/*
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -340,7 +340,7 @@ insert_string_bat(BAT *b, BAT *n, struct
p = canditer_next(ci) - hseq;
tp = BUNtvar(ni, p);
if (bunfastappVAR(b, tp) != GDK_SUCCEED)
- goto bunins_failed;
+ return GDK_FAIL;
r++;
}
} else {
@@ -393,7 +393,7 @@ insert_string_bat(BAT *b, BAT *n, struct
b->batCount++;
} else {
if (bunfastappVAR(b, tp) != GDK_SUCCEED)
- goto bunins_failed;
+ return GDK_FAIL;
}
r++;
}
@@ -405,10 +405,6 @@ insert_string_bat(BAT *b, BAT *n, struct
HASHappend(b, r, Tbase(b) + VarHeapVal(Tloc(b, 0), r,
b->twidth));
}
return GDK_SUCCEED;
- bunins_failed:
- b->tvarsized = true;
- b->ttype = TYPE_str;
- return GDK_FAIL;
}
static gdk_return
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -86,8 +86,9 @@ project_##TYPE(BAT *restrict bn, BAT *re
oid r1seq, r1end; \
oid r2seq, r2end; \
\
- if ((!ci || (ci->tpe == cand_dense && BATtdense(l))) && \
- l->tnonil && r1->ttype && !BATtdense(r1) && !r2) \
+ if (r2 == NULL && \
+ (!ci || (ci->tpe == cand_dense && BATtdense(l))) && \
+ l->tnonil && r1->ttype && !BATtdense(r1)) \
return project1_##TYPE(bn, l, r1); \
MT_thread_setalgorithm(__func__); \
r1t = (const TYPE *) Tloc(r1, 0); \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
