Changeset: 729b8cd0e1b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=729b8cd0e1b9
Modified Files:
sql/src/backends/monet5/sql_gencode.mx
sql/src/server/bin_optimizer.mx
Branch: Oct2010
Log Message:
removed no longer correct (and not useful) optimization
diffs (43 lines):
diff -r d5874f99b4fb -r 729b8cd0e1b9 sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mx Wed Sep 15 11:21:09 2010 +0200
+++ b/sql/src/backends/monet5/sql_gencode.mx Wed Sep 15 12:24:39 2010 +0200
@@ -779,16 +779,6 @@
q = pushInt(mb, q, 1);
len = getDestVar(q);
-/*
- if ((s->flag-1) > 0) {
- q = newStmt2(mb, algebraRef,
sortTailRef);
- } else {
- q = newStmt2(mb, algebraRef,
sortReverseTailRef);
- }
- q = pushArgument(mb, q, l);
- l = getDestVar(q);
-*/
-
q = newStmt1(mb, algebraRef, "slice");
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, offset);
diff -r d5874f99b4fb -r 729b8cd0e1b9 sql/src/server/bin_optimizer.mx
--- a/sql/src/server/bin_optimizer.mx Wed Sep 15 11:21:09 2010 +0200
+++ b/sql/src/server/bin_optimizer.mx Wed Sep 15 12:24:39 2010 +0200
@@ -324,19 +324,6 @@
os->optimized = ns->optimized = 3;
return ns;
}
- /* try to push the limit through the order */
- if (!s->op4.stval && j->type == st_order) {
- s = stmt_order(stmt_limit(stmt_dup(j->op1.stval),
- stmt_dup(s->op2.stval),
- stmt_dup(s->op3.stval),
- LIMIT_DIRECTION(j->flag,1,0)), j->flag);
- ns = bin_optimizer(c, s);
- stmt_destroy(s);
- assert(os->rewritten==NULL);
- os->rewritten = stmt_dup(ns);
- os->optimized = ns->optimized = 3;
- return ns;
- }
/* try to push the limit through the reverse */
if (!s->op4.stval && !s->flag && j->type == st_reverse) {
s = stmt_reverse(stmt_limit(stmt_dup(j->op1.stval),
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
