Changeset: bab0b4231ed8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bab0b4231ed8
Modified Files:
MonetDB5/src/optimizer/opt_emptySet.mx
MonetDB5/src/optimizer/opt_mitosis.mx
Branch: Jun2010
Log Message:
fixed more compilation issues
diffs (42 lines):
diff -r 99a895214174 -r bab0b4231ed8 MonetDB5/src/optimizer/opt_emptySet.mx
--- a/MonetDB5/src/optimizer/opt_emptySet.mx Thu Aug 05 22:08:01 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_emptySet.mx Thu Aug 05 22:12:38 2010 +0200
@@ -320,7 +320,6 @@
printFunction(cntxt->fdout, mb,0, LIST_MAL_ALL);
#endif
for (i = 0; i < mb->vtop; i++) {
- VarPtr rowsp;
if (getVarRows(mb, i) == 0) {
#ifdef DEBUG_OPT_EMPTYSET
stream_printf(cntxt->fdout, "START emptyset optimizer %d", i);
diff -r 99a895214174 -r bab0b4231ed8 MonetDB5/src/optimizer/opt_mitosis.mx
--- a/MonetDB5/src/optimizer/opt_mitosis.mx Thu Aug 05 22:08:01 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mitosis.mx Thu Aug 05 22:12:38 2010 +0200
@@ -66,7 +66,7 @@
#include "mal_interpreter.h"
/* #define _DEBUG_OPT_MITOSIS*/
-#define PARTITION_THRESHOLD (BUN) GDKnr_threads /* should be increased
in production version */
+#define PARTITION_THRESHOLD (wrd) GDKnr_threads /* should be increased
in production version */
static int eligible(MalBlkPtr mb )
{
@@ -91,9 +91,8 @@
str schema=0, table=0;
VarRecord low,hgh;
oid slice;
- BUN r=0,rowcnt=0; /* table should be sizeable to consider
parallel execution*/
+ wrd r = 0, rowcnt=0; /* table should be sizeable to consider
parallel execution*/
InstrPtr q,*old, target= 0, matq;
- VarPtr v;
size_t typewidth= 3 *sizeof(lng); /* 2 arguments and a result */
(void)cntxt;
@@ -123,6 +122,7 @@
estimate++;
r = 0;
}
+ }
if (target == 0)
return 0;
@-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
