Changeset: 90170ae1fb10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90170ae1fb10
Modified Files:
MonetDB5/src/optimizer/opt_compression.mx
MonetDB5/src/optimizer/opt_dictionary.mx
MonetDB5/src/optimizer/opt_emptySet.mx
MonetDB5/src/optimizer/opt_heuristics.mx
MonetDB5/src/optimizer/opt_history.mx
MonetDB5/src/optimizer/opt_mergetable.mx
MonetDB5/src/optimizer/opt_multiplex.mx
MonetDB5/src/optimizer/opt_octopus.mx
MonetDB5/src/optimizer/opt_partitions.mx
MonetDB5/src/optimizer/opt_pushranges.mx
MonetDB5/src/optimizer/opt_recycler.mx
MonetDB5/src/optimizer/opt_remoteQueries.mx
Branch: Oct2010
Log Message:
Fixes based on converity complaints
diffs (truncated from 302 to 300 lines):
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_compression.mx
--- a/MonetDB5/src/optimizer/opt_compression.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_compression.mx Sat Jan 15 14:56:50 2011 +0100
@@ -112,8 +112,7 @@
getVarConstant(mb,getArg(p,2)).val.sval,
getVarConstant(mb,getArg(p,3)).val.sval,
getVarConstant(mb,getArg(p,4)).val.ival);
- q= pushStr(mb,q,buf);
- p= q;
+ p= pushStr(mb,q,buf);
actions++;
continue;
}
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_dictionary.mx
--- a/MonetDB5/src/optimizer/opt_dictionary.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_dictionary.mx Sat Jan 15 14:56:50 2011 +0100
@@ -589,7 +589,7 @@
setVarType(mb,getArg(qq,0),
newBatType(getHeadType(getVarType(mb,idx[getArg(q,j)])),
getTailType(getVarType(mb,val[getArg(q,j)]))));
qq= pushArgument(mb,qq,idx[getArg(q,j)]);
qq= pushArgument(mb,qq,val[getArg(q,j)]);
- qq= pushLng(mb,qq, lng_nil);
+ (void) pushLng(mb,qq, lng_nil);
idx[getArg(q,j)] = 0;
val[getArg(q,j)] = 0;
}
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_emptySet.mx
--- a/MonetDB5/src/optimizer/opt_emptySet.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_emptySet.mx Sat Jan 15 14:56:50 2011 +0100
@@ -198,7 +198,7 @@
}
q = newStmt1(mb, constraintsRef, "emptySet");
- q = pushArgument(mb, q, getArg(p,0) );
+ (void) pushArgument(mb, q, getArg(p,0) );
constraints[ctop++]= p;
}
ignoreConstraint:
@@ -216,7 +216,7 @@
setFunctionId(p, NULL);
p->argc = 1;
p->token = ASSIGNsymbol;
- p= pushBit(mb, p, FALSE);
+ (void) pushBit(mb, p, FALSE);
actions++;
break;
}
@@ -277,7 +277,7 @@
setFunctionId(p, newRef);
p= pushArgument(mb, p,
newTypeVariable(mb,
getHeadType(tpe)));
- p= pushArgument(mb, p,
+ (void) pushArgument(mb, p,
newTypeVariable(mb,
getTailType(tpe)));
actions++;
break;
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_heuristics.mx
--- a/MonetDB5/src/optimizer/opt_heuristics.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_heuristics.mx Sat Jan 15 14:56:50 2011 +0100
@@ -92,7 +92,7 @@
setFunctionId(p, putName("reverse_select", 14));
p = pushArgument(mb, p, q->argv[1]);
p = pushArgument(mb, p, q->argv[2]);
- p = pushArgument(mb, p, q->argv[3]);
+ (void) pushArgument(mb, p, q->argv[3]);
removeInstruction(mb, q);
chkFlow(mb);
chkDeclarations(mb);
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_history.mx
--- a/MonetDB5/src/optimizer/opt_history.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_history.mx Sat Jan 15 14:56:50 2011 +0100
@@ -176,7 +176,7 @@
/* run the keepQuery operation once only */
pushInstruction(mb, q = copyInstruction(keepQuery));
q->token = ASSIGNsymbol;
- q = newStmt1(mb, sqlRef, "forgetPrevious");
+ (void) newStmt1(mb, sqlRef, "forgetPrevious");
/* collect the statistics */
@:initCounters@
@@ -194,7 +194,7 @@
}
if (getModuleId(p)==sqlRef &&
idcmp(getFunctionId(p),"resultSet")==0 ){
@:initCounter(tuples,aggr,count,wrd)@
- q= pushArgument(mb,q, getArg(p,3));
+ (void) pushArgument(mb,q, getArg(p,3));
}
if ( p->token== ENDsymbol || p->barrier == RETURNsymbol ||
p->barrier == YIELDsymbol){
if (rtime ){
@@ -230,7 +230,7 @@
q = pushArgument(mb, q, memory);
q = pushArgument(mb, q, tuples);
q = pushArgument(mb, q, inblock);/* inblock */
- q = pushArgument(mb, q, oublock);/* oublock */
+ (void) pushArgument(mb, q, oublock);/* oublock */
pushInstruction(mb,p);
continue;
}
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Sat Jan 15 14:56:50 2011 +0100
@@ -1844,7 +1844,7 @@
mat_mark(MalBlkPtr mb, InstrPtr p, mat_t *mat, int m)
{
int k, tpe = getArgType(mb,p,0), nr = mat[m].mi->argc-1;
- InstrPtr q, r = newInstruction(mb, ASSIGNsymbol);
+ InstrPtr q, r;
OPTDEBUGmergetable {
mnstr_printf(GDKout,"#MAT optimizer, mat_group_union\n");
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_multiplex.mx
--- a/MonetDB5/src/optimizer/opt_multiplex.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_multiplex.mx Sat Jan 15 14:56:50 2011 +0100
@@ -179,7 +179,7 @@
q= pushReturn(mb, q, hvar);
tvar = newTmpVariable(mb, TYPE_any);
q= pushReturn(mb, q, tvar);
- q= pushArgument(mb, q, iter);
+ (void) pushArgument(mb, q, iter);
/* $1:= bat.find(Ai,h) or constant */
alias[i] = tvar;
@@ -190,7 +190,7 @@
alias[i] = newTmpVariable(mb,
getTailType(getArgType(mb, pci, i)));
getArg(q, 0) = alias[i];
q= pushArgument(mb, q, getArg(pci, i));
- q= pushArgument(mb, q, hvar);
+ (void) pushArgument(mb, q, hvar);
}
/* cr:= mod.CMD($1,...,$n); */
@@ -210,7 +210,7 @@
q = newFcnCall(mb, batRef, insertRef);
q= pushArgument(mb, q, resB);
q= pushArgument(mb, q, hvar);
- q= pushArgument(mb, q, cr);
+ (void) pushArgument(mb, q, cr);
/* redo (mloop,h,r):= hasMoreElements(refBat); */
q = newFcnCall(mb, batRef, "hasMoreElements");
@@ -218,17 +218,17 @@
getArg(q, 0) = mloop;
q= pushReturn(mb, q, hvar);
q= pushReturn(mb, q, tvar);
- q= pushArgument(mb, q, iter);
+ (void) pushArgument(mb, q, iter);
q = newAssignment(mb);
q->barrier = EXITsymbol;
getArg(q, 0) = mloop;
q= pushReturn(mb, q, hvar);
- q= pushReturn(mb, q, tvar);
+ (void) pushReturn(mb, q, tvar);
q = newAssignment(mb);
getArg(q, 0) = getArg(pci, 0);
- q= pushArgument(mb, q, resB);
+ (void) pushArgument(mb, q, resB);
GDKfree(alias);
return MAL_SUCCEED;
}
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_octopus.mx
--- a/MonetDB5/src/optimizer/opt_octopus.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_octopus.mx Sat Jan 15 14:56:50 2011 +0100
@@ -502,7 +502,7 @@
/* initialize the result variables */
q= newAssignment(mb);
getArg(q,0)= getArg(p,0);
- q= pushNil(mb,q, resType);
+ (void) pushNil(mb,q, resType);
/* Generate register block */
r = newStmt2(mb,schedulerRef,registerRef);
@@ -662,7 +662,7 @@
q = newStmt(sm, octopusRef,connectRef);
conn= getArg(q,0);
- q = pushArgument(sm, q, dbvar);
+ (void) pushArgument(sm, q, dbvar);
/* v:= remote.put(conn,version) */
q= newFcnCall(sm,remoteRef,putRef);
@@ -757,11 +757,11 @@
getFunctionId(old[j]) ==
putName("reduce", 6)) {
q = newStmt(tmb, optimizerRef,
putName("recycle", 7));
q = pushStr(tmb, q, octopusRef);
- q = pushStr(tmb, q,
getFunctionId(getInstrPtr(tmb, 0)));
+ (void) pushStr(tmb, q,
getFunctionId(getInstrPtr(tmb, 0)));
}
q = newStmt(tmb, getModuleId(old[j]),
getFunctionId(old[j]));
q = pushStr(tmb, q, octopusRef);
- q = pushStr(tmb, q,
getFunctionId(getInstrPtr(tmb, 0)));
+ (void) pushStr(tmb, q,
getFunctionId(getInstrPtr(tmb, 0)));
}
for (i = 0; i < tn; i++) {
clrDeclarations(tentacle[i]);
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_partitions.mx
--- a/MonetDB5/src/optimizer/opt_partitions.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_partitions.mx Sat Jan 15 14:56:50 2011 +0100
@@ -116,7 +116,7 @@
q->argv[0]= getArg(p,j);
OPTDEBUGpartitions
printf("barrier %d ->%d\n",getArg(p,j),
alias[getArg(p,j)]);
- q= pushArgument(mb, q,
+ (void) pushArgument(mb, q,
(alias[getArg(p,j)]?alias[getArg(p,j)]:getArg(p,j)) );
}
}
@@ -139,7 +139,7 @@
q = newStmt(mb, bpmRef, "hasMoreElements");
q->barrier= REDOsymbol;
q->argv[0]= getArg(p,j);
- q= pushArgument(mb, q,
+ (void) pushArgument(mb, q,
(alias[getArg(p,j)]?alias[getArg(p,j)]:getArg(p,j)) );
}
@@ -178,7 +178,7 @@
/* save the temporary partitions */
q = newStmt(mb,"bpm","addPartition");
q= pushArgument(mb,q,getArg(anchor,0));
- q= pushArgument(mb,q,getArg(p,0));
+ (void) pushArgument(mb,q,getArg(p,0));
OPTredoList(mb,p,alias);
}
@@ -334,7 +334,7 @@
if( garbage[k]){
q=newStmt(mb,bpmRef,"garbage");
setVarType(mb,getArg(q,0),TYPE_void);
- q= pushArgument(mb,q,k);
+ (void) pushArgument(mb,q,k);
}
q= newAssignment(mb);
getArg(q,0)= j;
@@ -348,7 +348,7 @@
if( garbage[k]){
q=newStmt(mb,bpmRef,"garbage");
setVarType(mb,getArg(q,0),TYPE_void);
- q= pushArgument(mb,q,k);
+ (void) pushArgument(mb,q,k);
}
for(;i< limit; i++)
pushInstruction(mb,old[i]);
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_pushranges.mx
--- a/MonetDB5/src/optimizer/opt_pushranges.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_pushranges.mx Sat Jan 15 14:56:50 2011 +0100
@@ -224,7 +224,7 @@
getModuleId(p)= batRef;
getFunctionId(p)= newRef;
p= pushArgument(mb,p,
newTypeVariable(mb, getHeadType(x)));
- p= pushArgument(mb,p,
newTypeVariable(mb, getTailType(x)));
+ (void) pushArgument(mb,p,
newTypeVariable(mb, getTailType(x)));
actions++;
}
}
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_recycler.mx
--- a/MonetDB5/src/optimizer/opt_recycler.mx Fri Jan 14 15:29:04 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_recycler.mx Sat Jan 15 14:56:50 2011 +0100
@@ -154,7 +154,7 @@
mb->recid = recycleSeq++;
/* create a handle for recycler */
- q= newFcnCall(mb,"recycle","prelude");
+ (void) newFcnCall(mb,"recycle","prelude");
in = 1;
for (i = 1; i<limit; i++) {
p = old[i];
diff -r 951bf06af800 -r 90170ae1fb10 MonetDB5/src/optimizer/opt_remoteQueries.mx
--- a/MonetDB5/src/optimizer/opt_remoteQueries.mx Fri Jan 14 15:29:04
2011 +0100
+++ b/MonetDB5/src/optimizer/opt_remoteQueries.mx Sat Jan 15 14:56:50
2011 +0100
@@ -230,7 +230,7 @@
getArg(q,0)= newTmpVariable(mb, TYPE_void);
q= pushArgument(mb,q,location[getArg(p,j)]);
q= pushStr(mb,q, getRefName(mb,getArg(p,j)));
- q= pushArgument(mb,q,getArg(p,j));
+ (void) pushArgument(mb,q,getArg(p,j));
}
@= remoteAction
s= RQcall2str(mb,p);
@@ -420,7 +420,7 @@
q=
pushArgument(mb,q,location[getArg(p,j)]);
snprintf(buf,BUFSIZ,"io.print(%s);",
getRefName(mb,getArg(p,j)) );
- q= pushStr(mb,q,buf);
+ (void) pushStr(mb,q,buf);
}
pushInstruction(mb,p);
/* as of now all the targets are also local */
@@ -441,11 +441,11 @@
getArg(q,0)= newTmpVariable(mb,
TYPE_void);
q= pushArgument(mb, q, remoteSite);
q= pushStr(mb,q,
getRefName(mb,getArg(p,j)));
- q= pushArgument(mb, q, getArg(p,j));
+ (void) pushArgument(mb, q, getArg(p,j));
}
s= RQcall2str(mb, p);
pushInstruction(mb,r);
- r= pushStr(mb,r,s+1);
+ (void) pushStr(mb,r,s+1);
GDKfree(s);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
