Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16770/src/server
Modified Files:
rel_subquery.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_subquery.mx,1.12.2.1
the select statements didn't get pushed through the diffs and unions anymore.
Reason we added lots of 'st_alias'es around statements during the development
of the relational version. These st_aliases are now handled correctly fixing
the push down.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_subquery.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_subquery.mx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rel_subquery.mx 7 Jan 2010 15:24:32 -0000 1.12
+++ rel_subquery.mx 31 Jan 2010 12:44:51 -0000 1.13
@@ -27,7 +27,6 @@
#include "sql_semantic.h"
extern stmt *select_into(mvc *sql, symbol *sq, exp_kind ek );
-extern stmt *flat_subquery(mvc *sql, symbol *sq);
extern stmt *value_exp(mvc *sql, symbol *se, int f, exp_kind knd);
extern stmt *logical_value_exp(mvc *sql, symbol *sc, int f, exp_kind knd);
@@ -346,21 +345,6 @@
}
stmt *
-flat_subquery(mvc *sql, symbol *sq)
-{
- stmt *s = NULL;
- exp_kind ek = {type_value, card_relation, TRUE};
-
- s = _subquery(sql, sq, ek);
- if (s && s->type == st_ordered) {
- stmt *n = sql_reorder(stmt_dup(s->op1.stval),
stmt_dup(s->op2.stval));
- stmt_destroy(s);
- s = n;
- }
- return s;
-}
-
-stmt *
value_exp(mvc *sql, symbol *sq, int f, exp_kind ek)
{
int is_last = 0;
------------------------------------------------------------------------------
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
