MonetDB: mosaic - Avoid the use of ALGjoin2: it's on its way out.

[Sjoerd Mullender]

Changeset: 584998c85268 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=584998c85268
Modified Files:
        monetdb5/modules/mal/mosaic.c
Branch: mosaic
Log Message:

Avoid the use of ALGjoin2: it's on its way out.


diffs (16 lines):

diff --git a/monetdb5/modules/mal/mosaic.c b/monetdb5/modules/mal/mosaic.c
--- a/monetdb5/modules/mal/mosaic.c
+++ b/monetdb5/modules/mal/mosaic.c
@@ -1181,8 +1181,10 @@ MOSjoin(Client cntxt, MalBlkPtr mb, MalS
        lid = getArgReference_bat(stk,pci,2);
        rid = getArgReference_bat(stk,pci,3);
 
-       if( !isCompressed(*lid) && !isCompressed(*rid))
-               return ALGjoin2(ret,ret2,lid,rid);
+       if( !isCompressed(*lid) && !isCompressed(*rid)) {
+               bit nil_matches = 0;
+               return ALGsubjoin(ret,ret2,lid,rid,NULL,NULL,&nil_matches,NULL);
+       }
 
        bl = BATdescriptor(*lid);
        if( bl == NULL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list