MonetDB: compressedcandidates - Make msk type visible at MAL level

[Martin Kersten]

Changeset: 198c94f81929 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=198c94f81929
Modified Files:
        monetdb5/modules/mal/bitcandidates.mal
        monetdb5/optimizer/opt_bitcandidates.c
Branch: compressedcandidates
Log Message:

Make msk type visible at MAL level


diffs (28 lines):

diff --git a/monetdb5/modules/mal/bitcandidates.mal 
b/monetdb5/modules/mal/bitcandidates.mal
--- a/monetdb5/modules/mal/bitcandidates.mal
+++ b/monetdb5/modules/mal/bitcandidates.mal
@@ -6,10 +6,10 @@
 
 module candidates;
 
-pattern compress(b:bat[:oid]):bat[:oid]
+pattern compress(b:bat[:oid]):bat[:msk]
 address BCLcompress
 comment "Compress the bat into a bitvector";
 
-pattern decompress(b:bat[:oid]):bat[:oid]
+pattern decompress(b:bat[:msk]):bat[:oid]
 address BCLdecompress
 comment "Compress the bat into a bitvector";
diff --git a/monetdb5/optimizer/opt_bitcandidates.c 
b/monetdb5/optimizer/opt_bitcandidates.c
--- a/monetdb5/optimizer/opt_bitcandidates.c
+++ b/monetdb5/optimizer/opt_bitcandidates.c
@@ -69,7 +69,7 @@ OPTbitcandidatesImplementation(Client cn
                                k = newTmpVariable(mb,getArgType(mb,p,j));
                                setVarFixed(mb, k);
                                q= newFcnCall(mb,candidatesRef,compressRef);
-                               setVarType(mb,getArg(q,0), getArgType(mb,p,j));
+                               setVarType(mb,getArg(q,0), 
newBatType(TYPE_msk));
                                setVarFixed(mb, getArg(q,0));
                                q= pushArgument(mb,q, k);
                                alias[getArg(p,j)] = getArg(q,0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list