Changeset: 83da1e29a9df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83da1e29a9df
Modified Files:
Branch: default
Log Message:
merge
diffs (146 lines):
diff -r c0bd93a1fb99 -r 83da1e29a9df .hgeol
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgeol Mon Jun 21 19:12:04 2010 +0200
@@ -0,0 +1,26 @@
+# This file is used in Mercurial 1.5.4 and newer.
+# If you're running such a version, enable the eol extension in your
+# .hgrc file (on Linux and Mac, as well as on Windows), and disable
+# the win32text extension.
+
+[patterns]
+# various binary files
+**.bmp = BIN
+**.bz2 = BIN
+**.dll = BIN
+**.gif = BIN
+**.gz = BIN
+**.ico = BIN
+**.jpg = BIN
+**.pdf = BIN
+**.png = BIN
+**.zip = BIN
+
+# Windows specific files
+**.chm = BIN
+**.rtf = CRLF
+**.sln = CRLF
+**.vdproj = CRLF
+
+# all the rest is text
+** = native
diff -r c0bd93a1fb99 -r 83da1e29a9df .hgtags
--- a/.hgtags Mon Jun 21 19:11:39 2010 +0200
+++ b/.hgtags Mon Jun 21 19:12:04 2010 +0200
@@ -405,3 +405,4 @@
ccf383750d69e9fe0ea9d9a047e8980d9c6d4d1e Jun2007-0_beta1-2
e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root
d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root
+659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
diff -r c0bd93a1fb99 -r 83da1e29a9df MonetDB5/src/mal/Tests/recycle12.mal
--- a/MonetDB5/src/mal/Tests/recycle12.mal Mon Jun 21 19:11:39 2010 +0200
+++ b/MonetDB5/src/mal/Tests/recycle12.mal Mon Jun 21 19:12:04 2010 +0200
@@ -35,7 +35,7 @@
recycle.setAdmPolicy(1);
recycle.setReusePolicy(1);
-recycle.setCachePolicy(3);
+recycle.setCachePolicy(1);
optimizer.recycle("user","qry");
optimizer.recycle("user","qry1");
diff -r c0bd93a1fb99 -r 83da1e29a9df MonetDB5/src/mal/Tests/recycle12.stable.out
--- a/MonetDB5/src/mal/Tests/recycle12.stable.out Mon Jun 21 19:11:39
2010 +0200
+++ b/MonetDB5/src/mal/Tests/recycle12.stable.out Mon Jun 21 19:12:04
2010 +0200
@@ -94,7 +94,7 @@
#inter-query commonality
recycle.setAdmPolicy(1);
recycle.setReusePolicy(1);
- recycle.setCachePolicy(3);
+ recycle.setCachePolicy(1);
user.qry(2,8);
user.qry1(10);
user.qry1(10);
diff -r c0bd93a1fb99 -r 83da1e29a9df MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx Mon Jun 21 19:11:39 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx Mon Jun 21 19:12:04 2010 +0200
@@ -726,9 +726,9 @@
bn->tsorted = 0;
BATkey(BATmirror(bn),FALSE);
- if (b->htype != bn->htype) {
- bn = VIEWcreate(b,bn);
- }
+ if (b->htype != bn->htype) {
+ bn = VIEWcreate(b,bn);
+ }
BBPkeepref(*ret = bn->batCacheid);
if (b != bn)
@@ -780,12 +780,9 @@
}
BATkey(BATmirror(bn),FALSE);
- if (b->htype != bn->htype) {
- BAT *r = VIEWcreate(b,bn);
-
- BBPreleaseref(bn->batCacheid);
- bn = r;
- }
+ if (b->htype != bn->htype) {
+ bn = VIEWcreate(b,bn);
+ }
BBPkeepref(*ret = bn->batCacheid);
if (b != bn)
BBPreleaseref(b->batCacheid);
@@ -830,12 +827,9 @@
}
BATkey(BATmirror(bn),FALSE);
- if (b->htype != bn->htype) {
- BAT *r = VIEWcreate(b,bn);
-
- BBPreleaseref(bn->batCacheid);
- bn = r;
- }
+ if (b->htype != bn->htype) {
+ bn = VIEWcreate(b,bn);
+ }
BBPkeepref(*ret = bn->batCacheid);
if (b != bn)
BBPreleaseref(b->batCacheid);
diff -r c0bd93a1fb99 -r 83da1e29a9df MonetDB5/src/modules/mal/recycle.mx
--- a/MonetDB5/src/modules/mal/recycle.mx Mon Jun 21 19:11:39 2010 +0200
+++ b/MonetDB5/src/modules/mal/recycle.mx Mon Jun 21 19:12:04 2010 +0200
@@ -295,7 +295,7 @@
void
RECYCLEdumpQPat(stream *s)
{
- int i, j;
+ int i;
QryStatPtr qs;
if (!recycleQPat) {
@@ -307,11 +307,8 @@
stream_printf(s,"#RecID\tcalls\tglobRec\tlocRec\tCreditWL\n");
for(i=0; i< recycleQPat->cnt; i++){
qs = recycleQPat->ptrn[i];
- stream_printf(s,"# "LLFMT"\t%2d\t%2d\t%2d\t%2d\n#",
+ stream_printf(s,"# "LLFMT"\t\t%2d\t\t%2d\t\t%2d\t\t%2d\n",
qs->recid, qs->calls, qs->greuse, qs->lreuse, qs->wl);
- for (j=0; j<qs->stop; j++)
- stream_printf(s,"%2d(%1d) ",qs->crd[j],qs->gl[j]);
- stream_printf(s,"\n");
}
}
diff -r c0bd93a1fb99 -r 83da1e29a9df buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c Mon Jun 21 19:11:39 2010 +0200
+++ b/buildtools/Mx/Mx.c Mon Jun 21 19:12:04 2010 +0200
@@ -276,7 +276,6 @@
int i, j;
struct comments *c;
char *s1, *s2;
- Def *d;
/* for each type of file that we're extracting, if we know how
comments are written, and if that particular file type is
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
