Changeset: 63440025a309 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/63440025a309
Modified Files:
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
Branch: default
Log Message:
cleanup
diffs (57 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -151,7 +151,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
(void)sql;
if (!e)
return;
- // mnstr_printf(fout, "%p ", e);
+ /*mnstr_printf(fout, "%p ", e);*/
if (mvc_debug_on(sql, 4) && e->alias.label < 0)
mnstr_printf(fout, "%d: ", e->alias.label);
switch(e->type) {
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -3058,30 +3058,6 @@ exps_bind_column2(list *exps, const char
return res;
}
-/* find an column based on the original name, not the alias it got */
-sql_exp *
-exps_bind_alias( list *exps, const char *rname, const char *cname )
-{
- if (exps) {
- node *en;
-
- for (en = exps->h; en; en = en->next ) {
- sql_exp *e = en->data;
-
- if (e && is_column(e->type) && !rname && e->r &&
strcmp(e->r, cname) == 0)
- {
- assert(0);
- return e;
- }
- if (e && e->type == e_column && rname && e->l && e->r
&& strcmp(e->r, cname) == 0 && strcmp(e->l, rname) == 0) {
- assert(0);
- return e;
- }
- }
- }
- return NULL;
-}
-
unsigned int
exps_card( list *l )
{
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -206,7 +206,6 @@ extern sql_exp *exps_bind_nid(list *exps
extern sql_exp *exps_uses_nid(list *exps, int nid); /* get first expression
which references back to nid */
extern sql_exp *exps_bind_column(list *exps, const char *cname, int
*ambiguous, int *multiple, int no_tname /* set if expressions should be without
a tname */);
extern sql_exp *exps_bind_column2(list *exps, const char *rname, const char
*cname, int *multiple);
-extern sql_exp *exps_bind_alias(list *exps, const char *rname, const char
*cname);
extern sql_exp * list_find_exp( list *exps, sql_exp *e);
extern unsigned int exps_card( list *l );
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
