MonetDB: gdk_tracer - Compilation issue

[Martin Kersten]

Changeset: f9d6179bdba4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9d6179bdba4
Modified Files:
        monetdb5/mal/mal_function.c
        monetdb5/modules/mal/orderidx.c
Branch: gdk_tracer
Log Message:

Compilation issue


diffs (54 lines):

diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -206,9 +206,8 @@ chkFlow(MalBlkPtr mb)
        if(lastInstruction < mb->stop-1 )
                throw(MAL, buf, "instructions after END");
        
-       if( endseen)
-               for(btop--; btop>=0;btop--)
-                       throw(MAL, buf, "barrier '%s' without exit in %s[%d]", 
getVarName(mb,var[btop]),getFcnName(mb),i);
+       if( endseen && btop  > 0)
+                       throw(MAL, buf, "barrier '%s' without exit in %s[%d]", 
getVarName(mb,var[btop - 1]),getFcnName(mb),i);
        p= getInstrPtr(mb,0);
        if( !isaSignature(p))
                throw( MAL, buf, "signature missing");
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
@@ -167,24 +167,18 @@ OIDXcreateImplementation(Client cntxt, i
        msg = chkProgram(cntxt->usermodule, smb);
        if( msg )
                goto bailout;
-       //printFunction(THRdata[0], smb, 0 , 23);
-       if (smb->errors) {
-               msg = createException(MAL, "bat.orderidx",
-                                          "Type errors in generated code");
-       } else {
-               /* evaluate MAL block and keep the ordered OID bat */
-               newstk = prepareMALstack(smb, smb->vsize);
-               if (newstk == NULL) {
-                       msg = createException(MAL, "bat.orderidx", 
SQLSTATE(HY013) MAL_MALLOC_FAIL);
-                       goto bailout;
-               }
-               newstk->up = 0;
-               newstk->stk[arg].vtype= TYPE_bat;
-               newstk->stk[arg].val.bval= b->batCacheid;
-               BBPretain(newstk->stk[arg].val.bval);
-               msg = runMALsequence(cntxt, smb, 1, 0, newstk, 0, 0);
-               freeStack(newstk);
+       /* evaluate MAL block and keep the ordered OID bat */
+       newstk = prepareMALstack(smb, smb->vsize);
+       if (newstk == NULL) {
+               msg = createException(MAL, "bat.orderidx", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
+               goto bailout;
        }
+       newstk->up = 0;
+       newstk->stk[arg].vtype= TYPE_bat;
+       newstk->stk[arg].val.bval= b->batCacheid;
+       BBPretain(newstk->stk[arg].val.bval);
+       msg = runMALsequence(cntxt, smb, 1, 0, newstk, 0, 0);
+       freeStack(newstk);
 
        /* get rid of temporary MAL block */
 bailout:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list