Changeset: ff5dbffd61bd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ff5dbffd61bd
Modified Files:
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_prop.c
sql/server/rel_prop.h
Branch: default
Log Message:
FETCH property is no longer used too
diffs (63 lines):
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
@@ -915,12 +915,6 @@ read_exp_properties(mvc *sql, sql_exp *e
exp->p = prop_create(sql->sa, PROP_HASHCOL,
exp->p);
skipWS(r,pos);
found = true;
- } else if (strncmp(r+*pos, "FETCH", strlen("FETCH")) == 0) {
- (*pos)+= (int) strlen("FETCH");
- if (!find_prop(exp->p, PROP_FETCH))
- exp->p = prop_create(sql->sa, PROP_FETCH,
exp->p);
- skipWS(r,pos);
- found = true;
}
if (!read_prop(sql, exp, r, pos, &found))
return NULL;
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
@@ -2158,21 +2158,6 @@ rel_push_topn_and_sample_down(visitor *v
v->changes++;
return rel;
}
-/* TODO */
-#if 0
- /* duplicate topn/sample + [ project-order ] under join on
independend always matching joins */
- if (r)
- rp = r->l;
- if (r && r->exps && is_simple_project(r->op) &&
!(rel_is_ref(r)) && r->r && r->l &&
- rp->op == op_join && rp->exps && rp->exps->h &&
((prop*)((sql_exp*)rp->exps->h->data)->p)->kind == PROP_FETCH &&
- ((sql_rel *)rp->l)->op != rel->op && ((sql_rel *)rp->r)->op
!= rel->op) {
- /* TODO check if order by columns are independend of
join conditions */
- r->l = func(v->sql->sa, r->l, sum_limit_offset(v->sql,
rel));
- r->r = func(v->sql->sa, r->r, sum_limit_offset(v->sql,
rel));
- v->changes++;
- return rel;
- }
-#endif
}
return rel;
}
diff --git a/sql/server/rel_prop.c b/sql/server/rel_prop.c
--- a/sql/server/rel_prop.c
+++ b/sql/server/rel_prop.c
@@ -71,7 +71,6 @@ propkind2string( prop *p)
PT(JOINIDX);
PT(HASHIDX);
PT(HASHCOL);
- PT(FETCH);
PT(REMOTE);
PT(USED);
PT(GROUPINGS);
diff --git a/sql/server/rel_prop.h b/sql/server/rel_prop.h
--- a/sql/server/rel_prop.h
+++ b/sql/server/rel_prop.h
@@ -14,7 +14,6 @@ typedef enum rel_prop {
PROP_JOINIDX, /* could use join idx */
PROP_HASHIDX, /* is hash idx */
PROP_HASHCOL, /* could use hash idx */
- PROP_FETCH, /* fetchjoin */
PROP_REMOTE, /* uri for remote execution */
PROP_USED, /* number of times exp is used */
PROP_GROUPINGS /* used by ROLLUP/CUBE/GROUPING SETS, value contains
the list of sets */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
