Changeset: ee668f067ef7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee668f067ef7
Modified Files:
gdk/gdk_join.c
monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:
merged with oct2020
diffs (56 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2994,7 +2994,9 @@ count_unique(BAT *b, BAT *s, BUN *cnt1,
mask = HASHmask(ci.ncand);
if (mask < ((BUN) 1 << 16))
mask = (BUN) 1 << 16;
- if (snprintf(hs.heaplink.filename,
sizeof(hs.heaplink.filename), "%s.thshunil%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs.heaplink.filename) ||
+ if ((hs.heaplink.farmid = BBPselectfarm(TRANSIENT, b->ttype,
hashheap)) < 0 ||
+ (hs.heapbckt.farmid = BBPselectfarm(TRANSIENT, b->ttype,
hashheap)) < 0 ||
+ snprintf(hs.heaplink.filename,
sizeof(hs.heaplink.filename), "%s.thshunil%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs.heaplink.filename) ||
snprintf(hs.heapbckt.filename,
sizeof(hs.heapbckt.filename), "%s.thshunib%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs.heapbckt.filename) ||
HASHnew(&hs, b->ttype, BUNlast(b), mask, BUN_NONE, false)
!= GDK_SUCCEED) {
GDKerror("cannot allocate hash table\n");
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -220,7 +220,9 @@ BATunique(BAT *b, BAT *s)
GDKerror("cannot allocate hash table\n");
goto bunins_failed;
}
- if (snprintf(hs->heaplink.filename,
sizeof(hs->heaplink.filename), "%s.thshunil%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs->heaplink.filename) ||
+ if ((hs->heaplink.farmid = BBPselectfarm(TRANSIENT, b->ttype,
hashheap)) < 0 ||
+ (hs->heapbckt.farmid = BBPselectfarm(TRANSIENT, b->ttype,
hashheap)) < 0 ||
+ snprintf(hs->heaplink.filename,
sizeof(hs->heaplink.filename), "%s.thshunil%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs->heaplink.filename) ||
snprintf(hs->heapbckt.filename,
sizeof(hs->heapbckt.filename), "%s.thshunib%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs->heapbckt.filename) ||
HASHnew(hs, b->ttype, BUNlast(b), mask, BUN_NONE, false) !=
GDK_SUCCEED) {
GDKfree(hs);
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -492,8 +492,7 @@ mat_apply(MalBlkPtr mb, InstrPtr p, matl
}
}
- InstrPtr *r = NULL;
- r = (InstrPtr*) GDKmalloc(sizeof(InstrPtr)* p->retc);
+ InstrPtr *r = (InstrPtr*) GDKmalloc(sizeof(InstrPtr)* p->retc);
if(!r)
return -1;
for(k=0; k < p->retc; k++) {
@@ -532,13 +531,12 @@ mat_apply(MalBlkPtr mb, InstrPtr p, matl
}
}
for(k=0; k < p->retc; k++) {
- if(mat_add_var(ml, r[k], NULL, getArg(r[k], 0), mat_type(ml->v,
matvar[0]), -1, -1, 1)) {
+ if(mat_add_var(ml, r[k], NULL, getArg(r[k], 0), mat_type(ml->v,
matvar[0]), -1, -1, 0)) {
for(l=0; l < k; l++)
freeInstruction(r[l]);
GDKfree(r);
return -1;
}
- pushInstruction(mb, r[k]);
}
GDKfree(r);
return 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
