Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30059/server
Modified Files:
Tag: Nov2008
rel_bin.mx rel_optimizer.mx rel_select.mx sql_scan.mx
sql_semantic.mx sql_updates.mx
Log Message:
Comment the code in the proper way...
...at least I learn that with the "scanning office" ;)
U sql_semantic.mx
Index: sql_semantic.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_semantic.mx,v
retrieving revision 1.189
retrieving revision 1.189.2.1
diff -u -d -r1.189 -r1.189.2.1
--- sql_semantic.mx 22 Oct 2008 07:10:12 -0000 1.189
+++ sql_semantic.mx 23 Dec 2008 10:43:18 -0000 1.189.2.1
@@ -409,8 +409,8 @@
table_add_column(tv, sc, NULL, c->base.name);
}
- //node *m, *n;
- //assert(temp_table->type == st_list);
+ /*node *m, *n;
+ assert(temp_table->type == st_list);*/
/* foreach column add column name */
/*
U sql_updates.mx
Index: sql_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_updates.mx,v
retrieving revision 1.153.2.1
retrieving revision 1.153.2.2
diff -u -d -r1.153.2.1 -r1.153.2.2
--- sql_updates.mx 14 Nov 2008 13:51:47 -0000 1.153.2.1
+++ sql_updates.mx 23 Dec 2008 10:43:18 -0000 1.153.2.2
@@ -1110,7 +1110,7 @@
if (updates[c->colnr]) {
char *cn = _strdup(c->base.name);
stmt *h = stmt_dup(updates[c->colnr]->op2.stval);
- //stmt *updated =
stmt_dup(updates[c->colnr]->op1.stval);
+ /*stmt *updated =
stmt_dup(updates[c->colnr]->op1.stval);*/
stmt *updated = stmt_bat(c, stmt_dup(tv->s), RDONLY);
updated = stmt_semijoin(updated, h);
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.92.2.4
retrieving revision 1.92.2.5
diff -u -d -r1.92.2.4 -r1.92.2.5
--- rel_select.mx 23 Nov 2008 17:48:11 -0000 1.92.2.4
+++ rel_select.mx 23 Dec 2008 10:43:18 -0000 1.92.2.5
@@ -2274,8 +2274,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_label(rel, ++sql->label);
U rel_optimizer.mx
Index: rel_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_optimizer.mx,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- rel_optimizer.mx 28 Oct 2008 20:05:04 -0000 1.25
+++ rel_optimizer.mx 23 Dec 2008 10:43:18 -0000 1.25.2.1
@@ -30,7 +30,7 @@
#endif /*_REL_OPTIMIZER_H_*/
@c
-//#define DEBUG
+/*#define DEBUG*/
#include "sql_config.h"
#include "rel_optimizer.h"
@@ -1157,7 +1157,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);
@@ -1333,7 +1333,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);
@@ -1341,12 +1341,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 rel_bin.mx
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -d -r1.56.2.1 -r1.56.2.2
--- rel_bin.mx 23 Nov 2008 16:17:21 -0000 1.56.2.1
+++ rel_bin.mx 23 Dec 2008 10:43:18 -0000 1.56.2.2
@@ -1233,7 +1233,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) {
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.139.2.1
diff -u -d -r1.139 -r1.139.2.1
--- sql_scan.mx 3 Nov 2008 15:32:04 -0000 1.139
+++ sql_scan.mx 23 Dec 2008 10:43:18 -0000 1.139.2.1
@@ -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;
------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
