Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29219/server
Modified Files:
rel_bin.mx rel_optimizer.mx rel_select.mx sql_mvc.mx
sql_scan.mx sql_schema.mx
Log Message:
Comment the code in the proper way,
at least I learn that from the "scanning office" ;)
U sql_schema.mx
Index: sql_schema.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_schema.mx,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- sql_schema.mx 21 Dec 2008 19:38:22 -0000 1.159
+++ sql_schema.mx 23 Dec 2008 10:30:07 -0000 1.160
@@ -1915,7 +1915,7 @@
assert(l->h->next->next->next->type ==
type_int);
assert(l->h->next->next->next->next->type ==
type_int);
- //res = create_view(sql, ss, l->h->data.lval,
l->h->next->data.lval, l->h->next->next->data.sym,
l->h->next->next->next->data.i_val, l->h->next->next->next->next->data.i_val);
+ /*res = create_view(sql, ss, l->h->data.lval,
l->h->next->data.lval, l->h->next->next->data.sym,
l->h->next->next->next->data.i_val, l->h->next->next->next->next->data.i_val);*/
}
if (!res) {
list_destroy(table_elements);
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- rel_select.mx 22 Dec 2008 09:23:22 -0000 1.106
+++ rel_select.mx 23 Dec 2008 10:30:07 -0000 1.107
@@ -2246,8 +2246,8 @@
return NULL;
return rel_or(sql, lr, rr, f);
- //char *name;
-// sql_rel *lr, *rr;
+ /*char *name;
+ sql_rel *lr, *rr;*/
/* don't name them, else rel_bin cannot find the correct stmts
rel = rel_label(sql, rel);
@@ -4526,10 +4526,10 @@
return sql_error(sql, 01, "CREATE VIEW: ORDER
BY not supported");
}
- //if (!instantiate)
- // sql->emode = m_instantiate;
- //if (instantiate) /* we also need the other views instantiated
*/
- // sql->emode = 0;
+ /*if (!instantiate)
+ sql->emode = m_instantiate;*/
+ /*if (instantiate) we also need the other views instantiated
+ sql->emode = 0;*/
if (create) /* for subtable we only need direct dependencies */
sql->emode = m_deps;
sq = rel_subquery(sql, NULL, query, ek);
U rel_optimizer.mx
Index: rel_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_optimizer.mx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- rel_optimizer.mx 21 Dec 2008 19:38:22 -0000 1.33
+++ rel_optimizer.mx 23 Dec 2008 10:30:07 -0000 1.34
@@ -30,7 +30,7 @@
#endif /*_REL_OPTIMIZER_H_*/
@c
-//#define DEBUG
+/*#define DEBUG*/
#include "sql_config.h"
#include "rel_optimizer.h"
@@ -1252,7 +1252,7 @@
}
if (is_join(rel->op)) {
/* push join's left side (as semijoin) down
group by */
- //l = rel_copy(rel->l);
+ /*l = rel_copy(rel->l);*/
l = rel_dup(rel_dup(rel->l));
/* now we need to translate the names using the
join expressions */
gb->l = rel_crossproduct(gb->l, l, op_semi);
@@ -1566,7 +1566,7 @@
node *n, *m;
for (n=exps->h; n && n->next; n = n->next) {
sql_exp *e = n->data;
- //sql_exp *le = e->l;
+ /*sql_exp *le = e->l;*/
sql_exp *re = e->r;
assert(e->type == e_cmp);
@@ -1574,12 +1574,12 @@
if (re->card == CARD_ATOM && e->flag < cmp_equal) {
for (m=n->next; m; m = m->next) {
sql_exp *f = m->data;
- //sql_exp *lf = f->l;
+ /*sql_exp *lf = f->l;*/
sql_exp *rf = f->r;
assert(f->type == e_cmp);
if (rf->card == CARD_ATOM && e->flag <
cmp_equal) {
- //printf("possible candidate\n");
+ /*printf("possible candidate\n");*/
}
}
}
U sql_mvc.mx
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- sql_mvc.mx 12 Dec 2008 22:28:26 -0000 1.215
+++ sql_mvc.mx 23 Dec 2008 10:30:07 -0000 1.216
@@ -1496,7 +1496,7 @@
while(sql->vars[--sql->topvars].s) {
sql_var *v = &sql->vars[sql->topvars];
- //stmt_destroy(v->s);
+ /*stmt_destroy(v->s);*/
_DELETE(v->name);
VALclear(&v->value);
v->value.vtype = 0;
U sql_scan.mx
Index: sql_scan.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_scan.mx,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- sql_scan.mx 3 Nov 2008 15:32:04 -0000 1.139
+++ sql_scan.mx 23 Dec 2008 10:30:07 -0000 1.140
@@ -427,7 +427,7 @@
s->rs->pos++;
cur = s->rs->buf[s->rs->pos];
}
-// assert(s->rs->pos <= s->rs->len);
+ /*assert(s->rs->pos <= s->rs->len);*/
s->yycur = 0;
s->key = 0; /* keep a hash key of the query */
s->started = 0;
U rel_bin.mx
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- rel_bin.mx 22 Dec 2008 09:21:54 -0000 1.63
+++ rel_bin.mx 23 Dec 2008 10:30:07 -0000 1.64
@@ -648,7 +648,7 @@
join = s;
} else if (s->type != st_join && s->type != st_join2) {
/* handle select expressions */
- //assert(0);
+ /*assert(0);*/
if (s->h == join->h) {
join = stmt_semijoin(join,s);
} else {
@@ -1352,7 +1352,7 @@
}
sel = stmt_relselect_init();
for( en = rel->exps->h; en; en = en->next ) {
- //stmt *s = exp_bin(sql, en->data, sub, NULL, NULL, sel);
+ /*stmt *s = exp_bin(sql, en->data, sub, NULL, NULL, sel);*/
stmt *s = exp_bin(sql, en->data, sub, NULL, NULL, NULL);
if (!s) {
------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
