Changeset: 98fc65e67386 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98fc65e67386
Modified Files:
monetdb5/optimizer/opt_pushselect.c
Branch: default
Log Message:
Use addArgument in the situation where you have constructed a private
instruction
diffs (45 lines):
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -315,11 +315,11 @@ OPTpushselectImplementation(Client cntxt
int a, anti = (getFunctionId(q)[0] == 'n'),
ignore_case = (getFunctionId(q)[anti?4:0] == 'i');
getArg(r,0) = getArg(p,0);
- r = pushArgument(mb, r, getArg(q, 1));
+ r = addArgument(mb, r, getArg(q, 1));
if (has_cand)
- r = pushArgument(mb, r, getArg(p, 2));
+ r = addArgument(mb, r, getArg(p, 2));
for(a = 2; a<q->argc; a++)
- r = pushArgument(mb, r, getArg(q, a));
+ r = addArgument(mb, r, getArg(q, a));
if (r->argc < (4+has_cand))
r = pushStr(mb, r, ""); /* default esc
*/
if (r->argc < (5+has_cand))
@@ -396,7 +396,7 @@ OPTpushselectImplementation(Client cntxt
InstrPtr q = newAssignment(mb);
getArg(q, 0) = getArg(p, 0);
- (void) pushArgument(mb, q, getArg(p, 2));
+ (void) addArgument(mb, q, getArg(p, 2));
actions++;
freeInstruction(p);
continue;
@@ -413,7 +413,7 @@ OPTpushselectImplementation(Client cntxt
/* TODO: check result */
getArg(qq, 0) = getArg(p, 0);
- (void) pushArgument(mb, qq, getArg(p,
1));
+ (void) addArgument(mb, qq, getArg(p,
1));
actions++;
freeInstruction(p);
continue;
@@ -581,7 +581,7 @@ OPTpushselectImplementation(Client cntxt
}
q = newAssignment(mb);
getArg(q, 0) = getArg(p, 0);
- (void) pushArgument(mb, q, getArg(p, 2));
+ (void) addArgument(mb, q, getArg(p, 2));
if (nvars[getArg(p, 2)] > 0)
getArg(q, 1) = nvars[getArg(p, 2)];
oclean[i] = 1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
