MonetDB: mosaic - Finituning debugging interface

[Martin Kersten]

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

Finituning debugging interface


diffs (56 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
@@ -1375,22 +1375,18 @@ MOSanalyse(Client cntxt, MalBlkPtr mb, M
        (void) mb;
        
 
-       if( pci->argc > 1){
-               if( getArgType(mb,pci,1) == TYPE_lng)
-                       threshold = *(int*) getArgReference(stk,pci,1);
-               if( getArgType(mb,pci,1) == TYPE_str){
-                       c= properties[0] = *(str*) getArgReference(stk,pci,1);
-                       top++;
-                       while ( (c=strchr(c,';'))  && top <32){
-                               *c++ = 0;
-                               properties[top++] = c;
-                       }
+       if(pci->argc > 1 && getArgType(mb,pci,1) == TYPE_str){
+               c= properties[0] = *(str*) getArgReference(stk,pci,1);
+               top++;
+               while ( (c=strchr(c,';'))  && top <32){
+                       *c++ = 0;
+                       properties[top++] = c;
                }
        }
        if( top == 0) { properties[0]="compressed"; top++;}
 
-       if( pci->argc >2 ){
-               bid = *(int*) getArgReference(stk,pci,2);
+       if( pci->argc >1 ){
+               bid = *(int*) getArgReference(stk,pci,pci->argc-1);
                for( j = 0; j < top; j++){
                        x+= MOSanalyseInternal(cntxt, threshold, properties[j], 
bid);
                        xf[j]= xfactor;
diff --git a/monetdb5/modules/mal/mosaic.mal b/monetdb5/modules/mal/mosaic.mal
--- a/monetdb5/modules/mal/mosaic.mal
+++ b/monetdb5/modules/mal/mosaic.mal
@@ -32,14 +32,13 @@ pattern analyse(properties:str)
 address MOSanalyse
 comment "Apply heap compression on all with minimum threshold";
 
-pattern analyse(threshold:int)
+pattern analyse(properties:str,b:int)
 address MOSanalyse
-comment "Apply heap compression on all with minimum threshold";
+comment "Apply heap compression on a single column";
 
-pattern analyse(threshold:int,b:int)
+pattern analyse(b:int)
 address MOSanalyse
-comment "Apply heap compression on all with minimum threshold";
-
+comment "Apply default heap compression on a specific column";
 
 pattern dump(b:bat[:oid,:any])
 address MOSdump
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list