Changeset: a035a0351643 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a035a0351643
Modified Files:
clients/mapiclient/tomograph.c
common/utils/msabaoth.c
gdk/gdk_storage.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_remap.c
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (84 lines):
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1144,7 +1144,7 @@ static void showcolormap(char *filename,
* "*.*" stays first (colors[0]) */
_clrs_ = (Color*) malloc (sizeof(colors));
if (_clrs_) {
- memcpy (_clrs_, colors, sizeof(colors));
+ *_clrs_ = *colors;
qsort (_clrs_, NUM_COLORS, sizeof(Color), cmp_clr);
clrs = _clrs_;
}
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -763,7 +763,7 @@ msab_getUplogInfo(sabuplog *ret, const s
/* early bailout if cached */
if (db->uplog != NULL) {
- memcpy(ret, db->uplog, sizeof(sabuplog));
+ *ret = *db->uplog;
return(NULL);
}
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -43,7 +43,7 @@ eligible(MalBlkPtr mb)
int
OPTmitosisImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
- int i, j, limit, estimate = 0, pieces = 1, mito_parts = 0, mito_size =
0, row_size = 0;
+ int i, j, limit, slimit, estimate = 0, pieces = 1, mito_parts = 0,
mito_size = 0, row_size = 0;
str schema = 0, table = 0;
wrd r = 0, rowcnt = 0; /* table should be sizeable to consider
parallel execution*/
InstrPtr q, *old, target = 0;
@@ -167,6 +167,7 @@ OPTmitosisImplementation(Client cntxt, M
return 0;
limit = mb->stop;
+ slimit = mb->ssize;
if (newMalBlkStmt(mb, mb->ssize + 2 * estimate) < 0)
return 0;
estimate = 0;
@@ -247,6 +248,9 @@ OPTmitosisImplementation(Client cntxt, M
for (; i<limit; i++)
if (old[i])
pushInstruction(mb,old[i]);
+ for (; i<slimit; i++)
+ if (old[i])
+ freeInstruction(old[i]);
GDKfree(old);
return 1;
}
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -529,8 +529,6 @@ addOptimizerPipe(Client cntxt, MalBlkPtr
InstrPtr p;
str msg = MAL_SUCCEED;
- (void) cntxt;
-
for (i = 0; i < MAXOPTPIPES && pipes[i].name; i++)
if (strcmp(pipes[i].name, name) == 0)
break;
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -451,13 +451,8 @@ OPTremapImplementation(Client cntxt, Mal
printFunction(cntxt->fdout, mb, 0, LIST_MAL_ALL);
}
- if (doit) {
+ if (doit)
chkTypes(cntxt->fdout, cntxt->nspace,mb,TRUE);
- /* clean out on errors by resetting the block */
- if ( mb->errors)
- for( i=1;i<slimit; i++){
- }
- }
return mb->errors? 0: doit;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
