Changeset: 418cf9e340d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/418cf9e340d0
Modified Files:
sql/server/CMakeLists.txt
sql/server/rel_optimize_sel.c
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
Branch: sqloptimizer
Log Message:
Compilation fixes
diffs (65 lines):
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -60,6 +60,7 @@ target_sources(sqlserver
rel_dump.c
rel_dump.h rel_exp.h rel_rel.h
rel_basetable.h
+ rel_rewriter.h
rel_unnest.h
rel_optimizer.h
rel_optimizer_private.h
diff --git a/sql/server/rel_optimize_sel.c b/sql/server/rel_optimize_sel.c
--- a/sql/server/rel_optimize_sel.c
+++ b/sql/server/rel_optimize_sel.c
@@ -931,7 +931,7 @@ rel_optimize_select_and_joins_bottomup_(
{
if (!rel || (!is_join(rel->op) && !is_semi(rel->op) &&
!is_select(rel->op)) || list_empty(rel->exps))
return rel;
- u_int8_t cycle = *(u_int8_t*) v->data;
+ uint8_t cycle = *(uint8_t*) v->data;
rel->exps = exp_merge_range(v, rel, rel->exps);
rel = rel_select_cse(v, rel);
@@ -2597,7 +2597,7 @@ rel_rewrite_semijoin(visitor *v, sql_rel
static inline sql_rel *
rel_push_semijoin_down_or_up(visitor *v, sql_rel *rel)
{
- u_int8_t cycle = *(u_int8_t*) v->data;
+ uint8_t cycle = *(uint8_t*) v->data;
if (rel->op == op_join && rel->exps && rel->l) {
sql_rel *l = rel->l, *r = rel->r;
@@ -3514,7 +3514,7 @@ static sql_rel *
rel_optimize_select_and_joins_topdown_(visitor *v, sql_rel *rel)
{
/* push_join_down introduces semijoins */
- u_int8_t cycle = *(u_int8_t*) v->data;
+ uint8_t cycle = *(uint8_t*) v->data;
if (cycle <= 0) {
rel = rel_semijoin_use_fk(v, rel);
rel = rel_push_join_down(v, rel);
diff --git a/sql/server/rel_rewriter.c b/sql/server/rel_rewriter.c
--- a/sql/server/rel_rewriter.c
+++ b/sql/server/rel_rewriter.c
@@ -195,7 +195,7 @@ rewrite_simplify_exp(visitor *v, sql_rel
}
sql_rel *
-rewrite_simplify(visitor *v, u_int8_t cycle, bool value_based_opt, sql_rel
*rel)
+rewrite_simplify(visitor *v, uint8_t cycle, bool value_based_opt, sql_rel *rel)
{
if (!rel)
return rel;
diff --git a/sql/server/rel_rewriter.h b/sql/server/rel_rewriter.h
--- a/sql/server/rel_rewriter.h
+++ b/sql/server/rel_rewriter.h
@@ -22,7 +22,7 @@
#define is_case_func(sf) (strcmp((sf)->func->base.name, "case") == 0)
extern sql_exp *rewrite_simplify_exp(visitor *v, sql_rel *rel, sql_exp *e, int
depth);
-extern sql_rel *rewrite_simplify(visitor *v, u_int8_t cycle, bool
value_based_opt, sql_rel *rel);
+extern sql_rel *rewrite_simplify(visitor *v, uint8_t cycle, bool
value_based_opt, sql_rel *rel);
static inline sql_rel *
try_remove_empty_select(visitor *v, sql_rel *rel)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
