MonetDB: data-vaults - Fix compilation issue, after merge

[Panagiotis Koutsourakis]

Changeset: 040345afeb28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=040345afeb28
Modified Files:
        monetdb5/optimizer/opt_datavaults.c
Branch: data-vaults
Log Message:

Fix compilation issue, after merge


diffs (47 lines):

diff --git a/monetdb5/optimizer/opt_datavaults.c 
b/monetdb5/optimizer/opt_datavaults.c
--- a/monetdb5/optimizer/opt_datavaults.c
+++ b/monetdb5/optimizer/opt_datavaults.c
@@ -44,9 +44,7 @@ checkTable(int *res, int *action, MalBlk
     }
     for(i = 0; i < num_tabs; i++) {
         if ( tabs[i]->sname && (strcmp(tabs[i]->sname, sname) == 0) && 
(strcmp(tabs[i]->tname, tname) == 0)) { 
-            r = newInstruction(mb,ASSIGNsymbol);
-            setModuleId(r, vaultRef);
-            setFunctionId(r, getFunctionId(p));
+            r = newInstruction(0, vaultRef, getFunctionId(p));
             getArg(r,0) = getArg(p,0);
             for (j = 1; j < p->retc; j++) {
                 r = pushArgument(mb, r, getArg(p,j));
@@ -63,9 +61,7 @@ checkTable(int *res, int *action, MalBlk
         }
     }
 
-    c = newInstruction(mb,ASSIGNsymbol);
-    setModuleId(c, vaultRef);
-    setFunctionId(c, checktableRef);
+    c = newInstruction(0, vaultRef, checktableRef);
     getArg(c,0) = newTmpVariable(mb, TYPE_int);
        setVarUDFtype(mb,getArg(c,0));
        setVarFixed(mb,getArg(c,0));
@@ -78,9 +74,7 @@ checkTable(int *res, int *action, MalBlk
     c->argc = 4;
     pushInstruction(mb,c);
 
-    a = newInstruction(mb,ASSIGNsymbol);
-    setModuleId(a, vaultRef);
-    setFunctionId(a, analyzetableRef);
+    a = newInstruction(0, vaultRef, analyzetableRef);
     getArg(a,0) = newTmpVariable(mb, TYPE_int);
        setVarUDFtype(mb,getArg(a,0));
        setVarFixed(mb,getArg(a,0));
@@ -90,9 +84,7 @@ checkTable(int *res, int *action, MalBlk
     a->retc = 1;
     pushInstruction(mb,a);
 
-    r = newInstruction(mb,ASSIGNsymbol);
-    setModuleId(r, vaultRef);
-    setFunctionId(r, getFunctionId(p));
+    r = newInstruction(0, vaultRef, getFunctionId(p));
     getArg(r,0) = getArg(p,0);
     for (j = 1; j < p->retc; j++) {
         r = pushArgument(mb, r, getArg(p,j));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list