Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16448/src/backends/monet5
Modified Files:
sql.mx sql_scenario.mx
Log Message:
expressions can now have relation and expression aliases
also added more checks for the correct cardinality, we leads to
earlier (clearer) errors
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- sql_scenario.mx 28 Jan 2008 16:25:52 -0000 1.294
+++ sql_scenario.mx 29 Jan 2008 15:02:21 -0000 1.295
@@ -940,6 +940,16 @@
in->pos = in->len; /* HACK: should use parsed
lenght */
return NULL;
}
+ if( strncmp(in->buf+in->pos,"algebra ", 8)==0 ){
+ v= (int) strtol(in->buf+in->pos+8,NULL,10);
+ if (v) {
+ m->debug |= 16384;
+ } else {
+ m->debug &= (~16384);
+ }
+ in->pos = in->len; /* HACK: should use parsed
lenght */
+ return NULL;
+ }
if( strncmp(in->buf+in->pos,"reply_size ", 11)==0 ){
v= (int) strtol(in->buf+in->pos+11,NULL,10);
m->reply_size = v;
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- sql.mx 28 Jan 2008 16:25:52 -0000 1.249
+++ sql.mx 29 Jan 2008 15:02:21 -0000 1.250
@@ -906,12 +906,9 @@
if (mvc_debug_on(c,16384)) {
int status = c->session->status;
- sql_rel *r;
- printf("# semantic relational algebra\n");
- r = rel_semantic(c, sym);
+ sql_rel *r = rel_semantic(c, sym);
if (!r) {
if (c->errstr[0]) {
- printf("# %s\n", c->errstr);
return NULL;
} else {
c->session->status = status;
@@ -933,7 +930,6 @@
}
}
} else {
- /*printf("# semantic binary algebra\n");*/
s = output_semantic(c, NULL, sym);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
