Changeset: 68e680001a8f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68e680001a8f
Modified Files:
sql/server/rel_optimizer.c
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
Branch: Mar2018
Log Message:
fixes for bug 6581
diffs (59 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -4367,7 +4367,7 @@ rel_push_semijoin_down(int *changes, mvc
(void)*changes;
/* first push down the expressions involving only A */
- if (is_semi(rel->op) && rel->exps && rel->l) {
+ if (rel->op == op_semi && rel->exps && rel->l) {
list *exps = rel->exps, *nexps = sa_list(sql->sa);
node *n;
@@ -4386,7 +4386,7 @@ rel_push_semijoin_down(int *changes, mvc
}
rel->exps = nexps;
}
- if (is_semi(rel->op) && rel->exps && rel->l) {
+ if (rel->op == op_semi && rel->exps && rel->l) {
operator_type op = rel->op, lop;
node *n;
sql_rel *l = rel->l, *ll = NULL, *lr = NULL;
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -654,13 +654,13 @@ Cleanup
[ "triggers", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "functions", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "idxs", "dependency_tables_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "columns", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "idxs", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "objects", "dependency_columns_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_columns_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "tables", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "keys", "dependency_keys_on_foreignkeys", "DEP_VIEW" ]
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
@@ -654,13 +654,13 @@ Cleanup
[ "triggers", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "functions", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "idxs", "dependency_tables_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "columns", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "idxs", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "objects", "dependency_columns_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_columns_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "tables", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "keys", "dependency_keys_on_foreignkeys", "DEP_VIEW" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
