Changeset: a1feb6786225 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1feb6786225
Modified Files:
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_partition.c
sql/server/rel_rel.c
Branch: graph0
Log Message:
Dummy switches for op_spfw to allow to compile ftb
The new operator would cause build errors in switches (due to -Werror=switch),
as this case is not handled yet
diffs (194 lines):
diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c
--- a/sql/server/rel_distribute.c
+++ b/sql/server/rel_distribute.c
@@ -65,6 +65,8 @@ has_remote_or_replica( sql_rel *rel )
if (rel->r && has_remote_or_replica( rel->r ))
return 1;
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return 0;
}
@@ -175,6 +177,8 @@ replica(mvc *sql, sql_rel *rel, char *ur
case op_delete:
rel->r = replica(sql, rel->r, uri);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return rel;
}
@@ -270,6 +274,8 @@ distribute(mvc *sql, sql_rel *rel)
case op_delete:
rel->r = distribute(sql, rel->r);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return rel;
}
@@ -316,6 +322,8 @@ rel_remote_func(mvc *sql, sql_rel *rel)
case op_delete:
rel->r = rel_remote_func(sql, rel->r);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
if (find_prop(rel->p, PROP_REMOTE) != NULL) {
list *exps = rel_projections(sql, rel, NULL, 1, 1);
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
@@ -577,6 +577,8 @@ rel_print_refs(mvc *sql, stream* fout, s
list_append(refs, rel->r);
}
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
}
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
@@ -155,6 +155,8 @@ name_find_column( sql_rel *rel, char *rn
case op_update:
case op_delete:
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
if (alias) { /* we found an expression with the correct name, but
we need sql_columns */
@@ -256,6 +258,8 @@ rel_properties(mvc *sql, global_props *g
if (rel->r)
rel_properties(sql, gp, rel->r);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
switch (rel->op) {
@@ -290,6 +294,8 @@ rel_properties(mvc *sql, global_props *g
case op_delete:
case op_ddl:
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
}
@@ -1094,6 +1100,8 @@ rel_join_order(mvc *sql, sql_rel *rel)
rel->l = rel_join_order(sql, rel->l);
rel->r = rel_join_order(sql, rel->r);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
if (is_join(rel->op) && rel->exps && !rel_is_ref(rel)) {
rel = rewrite(sql, rel, &rel_remove_empty_select, &e_changes);
@@ -5665,6 +5673,8 @@ rel_mark_used(mvc *sql, sql_rel *rel, in
break;
case op_apply:
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
}
@@ -5771,6 +5781,8 @@ rel_remove_unused(mvc *sql, sql_rel *rel
case op_anti:
case op_ddl:
return rel;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return rel;
}
@@ -5850,6 +5862,8 @@ rel_dce_down(mvc *sql, sql_rel *rel, lis
if (rel->r)
rel->r = rel_dce_down(sql, rel->r, refs, 0);
return rel;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
case op_apply:
assert(0);
}
@@ -5943,6 +5957,8 @@ rel_add_projects(mvc *sql, sql_rel *rel)
if (rel->r)
rel->r = rel_add_projects(sql, rel->r);
return rel;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return rel;
}
@@ -7570,6 +7586,8 @@ rel_uses_exps(sql_rel *rel, list *exps )
case op_update:
case op_delete:
return rel_uses_exps(rel->r, exps);
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return 0;
}
@@ -7756,6 +7774,8 @@ rel_rename(mvc *sql, sql_rel *rel, list
nrel->r = rel_rename(sql, rel->r, naliases);
nrel->exps = exps_rename_up(sql, rel->exps, naliases);
return nrel;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
assert(0);
return nrel;
@@ -7817,6 +7837,8 @@ rel_apply_rename(mvc *sql, sql_rel *rel)
case op_delete:
rel->r = rel_apply_rename(sql, rel->r);
return rel;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
assert(0);
return rel;
@@ -8173,6 +8195,8 @@ rewrite(mvc *sql, sql_rel *rel, rewrite_
rel->l = rewrite(sql, rel->l, rewriter, has_changes);
rel->r = rewrite(sql, rel->r, rewriter, has_changes);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
rel = rewriter(&changes, sql, rel);
if (changes) {
@@ -8230,6 +8254,8 @@ rewrite_topdown(mvc *sql, sql_rel *rel,
rel->l = rewrite_topdown(sql, rel->l, rewriter, has_changes);
rel->r = rewrite_topdown(sql, rel->r, rewriter, has_changes);
break;
+ case op_spfw:
+ break; // TODO, just allow to compile ftb
}
return rel;
}
diff --git a/sql/server/rel_partition.c b/sql/server/rel_partition.c
--- a/sql/server/rel_partition.c
+++ b/sql/server/rel_partition.c
@@ -59,6 +59,7 @@ find_basetables( sql_rel *rel, list *tab
case op_left:
case op_right:
case op_full:
+ case op_spfw:
case op_semi:
case op_anti:
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -868,6 +868,8 @@ rel_bind_path_(sql_rel *rel, sql_exp *e,
break;
case op_ddl:
break;
+ case op_spfw:
+ break; // TODO
}
if (found)
list_prepend(path, rel);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
