MonetDB: mosaic - Use MAL command instead of MAL pattern.

[Aris Koning]

Changeset: 7ce14e520e5c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ce14e520e5c
Modified Files:
        monetdb5/modules/mosaic/mosaic.c
        monetdb5/modules/mosaic/mosaic.h
        monetdb5/modules/mosaic/mosaic.mal
Branch: mosaic
Log Message:

Use MAL command instead of MAL pattern.


diffs (53 lines):

diff --git a/monetdb5/modules/mosaic/mosaic.c b/monetdb5/modules/mosaic/mosaic.c
--- a/monetdb5/modules/mosaic/mosaic.c
+++ b/monetdb5/modules/mosaic/mosaic.c
@@ -618,14 +618,10 @@ MOSdecompressInternal(BAT** res, BAT* bs
 
 // decompression does not change the BAT id
 str
-MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{      
-       bat *bid = getArgReference_bat(stk,pci,1);
+MOSdecompress(bat* ret, const bat* bid)
+{
        BAT *b;
 
-       (void) cntxt;
-       (void) mb;
-
        if ((b = BATdescriptor(*bid)) == NULL)
                throw(MAL, "mosaic.decompress", INTERNAL_BAT_ACCESS);
 
@@ -637,7 +633,7 @@ MOSdecompress(Client cntxt, MalBlkPtr mb
 
        BBPkeepref(res->batCacheid);
 
-       *getArgReference_bat(stk,pci,0) = res->batCacheid;
+       *ret = res->batCacheid;
 
        // TODO: handle errors
 
diff --git a/monetdb5/modules/mosaic/mosaic.h b/monetdb5/modules/mosaic/mosaic.h
--- a/monetdb5/modules/mosaic/mosaic.h
+++ b/monetdb5/modules/mosaic/mosaic.h
@@ -191,7 +191,7 @@ if ( task->n && task->cl ){\
 mal_export char *MOSfiltername[];
 mal_export bool type_allowed(int compression, BAT* b);
 mal_export str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-mal_export str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str MOSdecompress(bat* ret, const bat* bid);
 mal_export str MOScompressInternal(BAT* bsrc, const char* compressions);
 mal_export str MOSselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 mal_export str MOSthetaselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
diff --git a/monetdb5/modules/mosaic/mosaic.mal 
b/monetdb5/modules/mosaic/mosaic.mal
--- a/monetdb5/modules/mosaic/mosaic.mal
+++ b/monetdb5/modules/mosaic/mosaic.mal
@@ -8,7 +8,7 @@ pattern compress(b:bat[:any_1]) :bat[:an
 address MOScompress
 comment "Apply dynamic compression producing a temporary";
 
-pattern decompress(b:bat[:any_1]) :bat[:any_1]
+command decompress(b:bat[:any_1]) :bat[:any_1]
 address MOSdecompress
 comment "Apply dynamic decompression over chunks producing a temporary 
version";
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list