Changeset: 9c24a4b61282 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c24a4b61282
Modified Files:
MonetDB5/src/optimizer/opt_tarantula.mx
sql/src/backends/monet5/sql_optimizer.mx
Branch: default
Log Message:
Compiler complaint and bbp commit
diffs (39 lines):
diff -r ceba40a1071d -r 9c24a4b61282 MonetDB5/src/optimizer/opt_tarantula.mx
--- a/MonetDB5/src/optimizer/opt_tarantula.mx Sun Oct 03 20:37:17 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_tarantula.mx Sun Oct 03 20:50:35 2010 +0200
@@ -416,7 +416,7 @@
Second stage would be to transport intermediates throught the file system as
well.
@c
void pushTARinstruction(MalBlkPtr tm, InstrPtr p){
- VarPtr loc,rows,low,hgh;
+ VarPtr loc,low,hgh;
InstrPtr q;
if (strategy & SHAREDDISK &&
diff -r ceba40a1071d -r 9c24a4b61282 sql/src/backends/monet5/sql_optimizer.mx
--- a/sql/src/backends/monet5/sql_optimizer.mx Sun Oct 03 20:37:17 2010 +0200
+++ b/sql/src/backends/monet5/sql_optimizer.mx Sun Oct 03 20:50:35 2010 +0200
@@ -365,6 +365,11 @@
varSetProp(mb, k, fileProp,
op_eq, VALset(&vr, TYPE_str, loc));
cnt = BATcount(b);
BATsave(b); /* make sure it is visible
elsewhere */
+ { bat list[2];
+ list[0] = 0; /* dummy */
+ list[1] = b->batCacheid;
+ BBPdir(2,list);
+ }
BBPreleaseref(b->batCacheid);
}
rows = (wrd) cnt;
@@ -389,6 +394,11 @@
varSetProp(mb, k,
fileProp, op_eq, VALset(&vr, TYPE_str, loc));
cnt = BATcount(b);
BATsave(b); /* make sure it is
visible elsewhere */
+ { bat list[2];
+ list[0] = 0; /*
dummy */
+ list[1] = b->batCacheid;
+ BBPdir(2,list);
+ }
BBPreleaseref(b->batCacheid);
}
rows = (wrd) cnt;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
