Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16725/src/server
Modified Files:
rel_optimizer.mx
Log Message:
propagated changes of Saturday Jan 30 2010 - Sunday Jan 31 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/30 - nielsnes: src/server/rel_optimizer.mx,1.81.2.2
fixed warning from valgrind (incorrect read)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/30 - nielsnes: src/server/rel_optimizer.mx,1.81.2.3
backport (no need to propagate) of rewriter reduce_group_by_exps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_optimizer.mx,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- rel_optimizer.mx 18 Jan 2010 19:39:37 -0000 1.83
+++ rel_optimizer.mx 31 Jan 2010 12:44:46 -0000 1.84
@@ -3133,6 +3133,7 @@
}
/* TODO CSE */
+#if 0
static list *
exp_merge(list *exps)
{
@@ -3142,7 +3143,7 @@
/*sql_exp *le = e->l;*/
sql_exp *re = e->r;
- if (e->type == e_cmp && e->flag != cmp_or)
+ if (e->type == e_cmp && e->flag == cmp_or)
continue;
/* only look for gt, gte, lte, lt */
@@ -3160,6 +3161,7 @@
}
return exps;
}
+#endif
static sql_rel *
rel_select_order(int *changes, mvc *sql, sql_rel *rel)
@@ -3171,7 +3173,8 @@
exps = list_sort(rel->exps, (fkeyvalue)&exp_keyvalue,
(fdup)&exp_dup);
list_destroy(rel->exps);
- rel->exps = exp_merge(exps);
+ //rel->exps = exp_merge(exps);
+ rel->exps = exps;
}
return rel;
}
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
