MonetDB: string_imprints - Expose strimp construction to MAL

[Panagiotis Koutsourakis]

Changeset: 532b3fb7b9ff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=532b3fb7b9ff
Modified Files:
        monetdb5/modules/mal/batExtensions.c
Branch: string_imprints
Log Message:

Expose strimp construction to MAL


diffs (33 lines):

diff --git a/monetdb5/modules/mal/batExtensions.c 
b/monetdb5/modules/mal/batExtensions.c
--- a/monetdb5/modules/mal/batExtensions.c
+++ b/monetdb5/modules/mal/batExtensions.c
@@ -402,7 +402,7 @@ PATstrimp_makehist(Client cntxt, MalBlkP
 }
 
 static str
-PATstrimp_makeheader(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+PATstrimp(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        bat bid;
        BAT *b;
@@ -413,9 +413,10 @@ PATstrimp_makeheader(Client cntxt, MalBl
        if ((b = BATdescriptor(bid)) == NULL)
                throw(MAL, "bat.strimpHeader", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
 
-       if(GDKstrimp_make_header(b) != GDK_SUCCEED)
+       if(GDKstrimp_create_strimp(b) != GDK_SUCCEED)
                throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002) 
OPERATION_FAILED);
 
+       // *getArgReference_lng(stk, pci, 0) = 0;
        return MAL_SUCCEED;
 }
 
@@ -452,7 +453,7 @@ mel_func batExtensions_init_funcs[] = {
  /* String imprints */
  pattern("bat", "strimpNDigrams", PATstrimp_ndigrams, false, "count digrams in 
a string bat", args(1,2,arg("",lng),batarg("b",str))),
  pattern("bat", "strimpHistogram", PATstrimp_makehist, false, "make a 
histogram of all the byte pairs in a BAT", args(2,3,arg("",lng), 
batarg("",lng),batarg("b",str))),
- pattern("bat", "strimpHeader", PATstrimp_makeheader, false, "construct the 
strimp header from a BAT", args(1,2,arg("",void),batarg("b",str))),
+ pattern("bat", "strimp", PATstrimp, false, "construct the strimp a BAT", 
args(1,2,arg("",void),batarg("b",str))),
  { .imp=NULL }
 };
 #include "mal_import.h"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list