MonetDB: leftmart - Naming issues for MAL.

[lsidir]

Changeset: 37d17ef428d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37d17ef428d4
Modified Files:
        monetdb5/modules/mal/Tests/arrange00.mal
        monetdb5/modules/mal/orderidx.c
        monetdb5/modules/mal/orderidx.mal
Branch: leftmart
Log Message:

Naming issues for MAL.


diffs (52 lines):

diff --git a/monetdb5/modules/mal/Tests/arrange00.mal 
b/monetdb5/modules/mal/Tests/arrange00.mal
--- a/monetdb5/modules/mal/Tests/arrange00.mal
+++ b/monetdb5/modules/mal/Tests/arrange00.mal
@@ -2,7 +2,7 @@
 
 bv:= bat.new(:oid,:int);
 barrier v:= 0:int;
-       w:= mmath.rand();
+    w:= mmath.rand();
     bat.append(bv,w);
     redo v:= iterator.next(1:int,10:int);
 exit v;
diff --git a/monetdb5/modules/mal/orderidx.c b/monetdb5/modules/mal/orderidx.c
--- a/monetdb5/modules/mal/orderidx.c
+++ b/monetdb5/modules/mal/orderidx.c
@@ -93,12 +93,12 @@ ARNGcreate(Client cntxt, MalBlkPtr mb, M
        }
        for (i=0; i< pieces; i++) {
                // add sort instruction
-               q = newStmt(smb, putName("algebra",7), putName("arrangeorder", 
9));
+               q = newStmt(smb, putName("algebra",7), putName("orderidx", 9));
                setVarType(smb, getArg(q, 0), newBatType(TYPE_oid, TYPE_oid));
                setVarFixed(smb, getArg(q, 0));
                q = pushArgument(smb, q, pack->argv[2+i]);
                q = pushBit(smb, q, 0);
-               q = pushBit(smb, q, 0);
+               q = pushBit(smb, q, 1);
                pack->argv[2+i] = getArg(q, 0);
        }
        // finalize, check, and evaluate
@@ -398,7 +398,7 @@ do {                                                        
                                                                                
        \
                        BBPunfix(bid);
                        throw(MAL,"bat.arrange", OPERATION_FAILED);
                }
-               BBPunfix(m->batCacheid);
+               //BBPunfix(m->batCacheid);
        }
 
        for (i = 0; i < n_ar; i++) {
diff --git a/monetdb5/modules/mal/orderidx.mal 
b/monetdb5/modules/mal/orderidx.mal
--- a/monetdb5/modules/mal/orderidx.mal
+++ b/monetdb5/modules/mal/orderidx.mal
@@ -10,7 +10,7 @@ pattern bat.arrange(bv:bat[:oid,:any_1],
 address ARNGmerge
 comment "Consolidates the OID index arrangement";
 
-function algebra.arrangeorder(bv:bat[:oid,:any_1], reverse:bit, stable:bit 
):bat[:oid,:oid];
+function algebra.orderidx(bv:bat[:oid,:any_1], reverse:bit, stable:bit 
):bat[:oid,:oid];
        (v,o):= algebra.subsort(bv,reverse,stable);
        return sortorder:= o;
-end arrangeorder;
+end orderidx;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list