Changeset: c04fb60ab025 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c04fb60ab025
Modified Files:
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_select.c
Branch: nested
Log Message:
as in default remove settname
diffs (57 lines):
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
@@ -1087,25 +1087,6 @@ noninternexp_setname(mvc *sql, sql_exp *
}
void
-noninternexp_settname(mvc *sql, sql_exp *e, sql_alias *rname)
-{
- char *name = NULL;
-
- if (!e->alias.label && e->type == e_psm && e->l) {
- sql_rel *r = e->l;
- if (is_project(r->op)) {
- sql_exp *ie = r->exps->t->data;
- e->alias = ie->alias;
- e->alias.parent = rname;
- return;
- }
- }
- if (!exp_name(e))
- name = make_label(sql->sa, ++sql->label);
- noninternexp_setname(sql, e, rname, name);
-}
-
-void
exp_setalias(sql_exp *e, int label, sql_alias *p, const char *name )
{
e->alias.label = label;
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
@@ -122,7 +122,6 @@ extern void exp_setalias(sql_exp *e, int
extern void exp_prop_alias(allocator *sa, sql_exp *e, sql_exp *oe);
extern void noninternexp_setname(mvc *sql, sql_exp *e, sql_alias *p, const
char *name );
-extern void noninternexp_settname(mvc *sql, sql_exp *e, sql_alias *p);
extern char* make_label(allocator *sa, int nr);
extern sql_exp* exp_label(allocator *sa, sql_exp *e, int nr);
extern list* exps_label(mvc *sql, list *exps);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -209,9 +209,12 @@ rel_table_optname(mvc *sql, sql_rel *sq,
list_hash_clear(sq->exps);
for (; ne; ne = ne->next) {
sql_exp *e = ne->data;
+ char *name = NULL;
if (!is_intern(e)) {
- noninternexp_settname(sql, e, ta);
+ if (!exp_name(e))
+ name = make_label(sql->sa,
++sql->label);
+ noninternexp_setname(sql, e, ta, name);
set_basecol(e);
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
