MonetDB: default - Use addArgument in the situation where you ha...

[Martin Kersten]

Changeset: e14bc864d0ae for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e14bc864d0ae
Modified Files:
        monetdb5/optimizer/opt_remoteQueries.c
Branch: default
Log Message:

Use addArgument in the situation where you have constructed a private 
instruction


diffs (60 lines):

diff --git a/monetdb5/optimizer/opt_remoteQueries.c 
b/monetdb5/optimizer/opt_remoteQueries.c
--- a/monetdb5/optimizer/opt_remoteQueries.c
+++ b/monetdb5/optimizer/opt_remoteQueries.c
@@ -100,7 +100,7 @@ RQcall2str(MalBlkPtr mb, InstrPtr p)
                if( k== dbtop){\
                        r= newInstruction(mb,mapiRef,lookupRef);\
                        j= getArg(r,0)= newTmpVariable(mb, TYPE_int);\
-                       r= pushArgument(mb,r, getArg(p,X));\
+                       r= addArgument(mb,r, getArg(p,X));\
                        pushInstruction(mb,r);\
                        dbalias[dbtop].dbhdl= j;\
                        dbalias[dbtop++].dbname= db;\
@@ -112,16 +112,16 @@ RQcall2str(MalBlkPtr mb, InstrPtr p)
 #define prepareRemote(X)\
        r= newInstruction(mb,mapiRef,rpcRef);\
        getArg(r,0)= newTmpVariable(mb, X);\
-       r= pushArgument(mb,r,j);
+       r= addArgument(mb,r,j);
 
 #define putRemoteVariables()\
        for(j=p->retc; j<p->argc; j++)\
        if( location[getArg(p,j)] == 0 && !isVarConstant(mb,getArg(p,j)) ){\
                q= newInstruction(0, mapiRef, putRef);\
                getArg(q,0)= newTmpVariable(mb, TYPE_void);\
-               q= pushArgument(mb,q,location[getArg(p,j)]);\
+               q= addArgument(mb,q,location[getArg(p,j)]);\
                q= pushStr(mb,q, getVarName(mb,getArg(p,j)));\
-               (void) pushArgument(mb,q,getArg(p,j));\
+               (void) addArgument(mb,q,getArg(p,j));\
                pushInstruction(mb,q);\
        }
 
@@ -308,7 +308,7 @@ OPTremoteQueriesImplementation(Client cn
                                if( location[getArg(p,j)]){
                                        q= newInstruction(0,mapiRef,rpcRef);
                                        getArg(q,0)= getArg(p,j);
-                                       q= 
pushArgument(mb,q,location[getArg(p,j)]);
+                                       q= 
addArgument(mb,q,location[getArg(p,j)]);
                                        snprintf(buf,BUFSIZ,"io.print(%s);",
                                                getVarName(mb,getArg(p,j)) );
                                        q=  pushStr(mb,q,buf);
@@ -323,15 +323,15 @@ OPTremoteQueriesImplementation(Client cn
                                /* single remote site involved */
                                r= newInstruction(mb,mapiRef,rpcRef);
                                getArg(r,0)= newTmpVariable(mb, TYPE_void);
-                               r= pushArgument(mb, r, remoteSite);
+                               r= addArgument(mb, r, remoteSite);
 
                                for(j=p->retc; j<p->argc; j++)
                                if( location[getArg(p,j)] == 0 && 
!isVarConstant(mb,getArg(p,j)) ){
                                        q= newInstruction(0,mapiRef,putRef);
                                        getArg(q,0)= newTmpVariable(mb, 
TYPE_void);
-                                       q= pushArgument(mb, q, remoteSite);
+                                       q= addArgument(mb, q, remoteSite);
                                        q= pushStr(mb,q, 
getVarName(mb,getArg(p,j)));
-                                       (void) pushArgument(mb, q, getArg(p,j));
+                                       (void) addArgument(mb, q, getArg(p,j));
                                        pushInstruction(mb,q);
                                }
                                s= RQcall2str(mb, p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list