Changeset: 86c0e6e72feb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86c0e6e72feb
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: subquery
Log Message:
small fix (handle single differences /intersections on values unpartitioned)
diffs (22 lines):
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
@@ -598,6 +598,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
for(k=1; k<mat[m].mi->argc; k++) {
InstrPtr q = copyInstruction(p);
InstrPtr s = newInstruction(mb, matRef, packRef);
+ int ttpe = 0;
if(!q || !s) {
if(q)
@@ -610,8 +611,9 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
getArg(s,0) = newTmpVariable(mb, getArgType(mb,
mat[n].mi, k));
+ ttpe = getArgType(mb, mat[n].mi, 0);
for (j=1; j<mat[n].mi->argc; j++) {
- if (overlap(ml, getArg(mat[m].mi, k),
getArg(mat[n].mi, j), k, j, 1)){
+ if (getBatType(ttpe) != TYPE_oid || overlap(ml,
getArg(mat[m].mi, k), getArg(mat[n].mi, j), k, j, 1)){
s =
pushArgument(mb,s,getArg(mat[n].mi,j));
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
