Changeset: 0166e9d1a0d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0166e9d1a0d1
Modified Files:
sql/server/rel_select.c
Branch: Mar2018
Log Message:
merged with jul2017
diffs (36 lines):
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
@@ -2664,6 +2664,8 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
right =
rel_project(sql->sa, in, rel_projections(sql, right, NULL, 1, 1));
rel_project_add_exp(sql, right, roident);
+ rident =
exp_column(sql->sa, exp_relname(rident), exp_name(rident), exp_subtype(rident),
rident->card, has_nil(rident), is_intern(rident));
+ roident =
exp_column(sql->sa, exp_relname(roident), exp_name(roident),
exp_subtype(roident), roident->card, has_nil(roident), is_intern(roident));
}
}
r = rel_value_exp(sql, &rel,
sval, f, ek);
@@ -2679,8 +2681,12 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
}
rel =
rel_project(sql->sa, rel, NULL);
rel_project_add_exp(sql, rel, r);
- if (rident)
+ if (rident) {
rel_project_add_exp(sql, rel, rident);
+ if (rident ==
roident)
+ roident
= exp_column(sql->sa, exp_relname(roident), exp_name(roident),
exp_subtype(roident), roident->card, has_nil(roident), is_intern(roident));
+ rident =
exp_column(sql->sa, exp_relname(rident), exp_name(rident), exp_subtype(rident),
rident->card, has_nil(rident), is_intern(rident));
+ }
}
z = rel;
correlated = 1;
@@ -2709,8 +2715,8 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
rl =
rel_project(sql->sa, rl, NULL);
rel_project_add_exp(sql, rl, r);
if (roident) {
+
rel_project_add_exp(sql, rl, roident);
roident =
exp_column(sql->sa, exp_relname(roident), exp_name(roident),
exp_subtype(roident), roident->card, has_nil(roident), is_intern(roident));
-
rel_project_add_exp(sql, rl, roident);
}
} else {
rl =
rel_project_exp(sql->sa, exp_label(sql->sa, r, ++sql->label));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
