Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10474/src/backends/monet4
Modified Files:
sql_gencode.mx
Log Message:
propagated changes of Tuesday Jun 10 2008 - Wednesday Jun 11 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/10 - romulog:
src/test/Skyserver/Skyserver_dropFunctions_v6.sql,1.1.2.8(SQL_2-24,Stable_DailyBuild-11)
src/test/Skyserver/Skyserver_functions_v6.sql,1.1.2.11(SQL_2-24,Stable_DailyBuild-11)
add missing function...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/11 - nielsnes: src/storage/bat/bat_storage.mx,1.16.2.3(SQL_2-24)
src/storage/bat/bat_utils.mx,1.4.4.1(SQL_2-24)
make all bats read_only, we use forced inserts/appends anyway
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/11 - nielsnes:
src/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err,1.6.4.1(SQL_2-24)
src/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err,1.2.4.1(SQL_2-24)
src/test/copy/Tests/null_as_string_errors.stable.err,1.1.2.1(SQL_2-24)
src/test/copy/Tests/null_as_string_errors.stable.err.Five,1.1.2.1(SQL_2-24)
new asci_io/table error messages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/11 - nielsnes: src/test/bugs/Tests/All,1.112.2.4(SQL_2-24)
src/test/bugs/Tests/order_limit_offset_bug.sql,1.1.2.1(SQL_2-24)
src/test/bugs/Tests/order_limit_offset_bug.stable.err,1.1.2.1(SQL_2-24)
src/test/bugs/Tests/order_limit_offset_bug.stable.out,1.1.2.1(SQL_2-24)
test script for bug in order/limit/offset handling
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/11 - nielsnes: src/backends/monet4/sql_gencode.mx,1.174.2.2(SQL_2-24)
src/backends/monet5/sql_gencode.mx,1.275.2.2(SQL_2-24)
fixes for the limit/offset with order bug
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- sql_gencode.mx 5 Jun 2008 09:22:29 -0000 1.175
+++ sql_gencode.mx 11 Jun 2008 21:38:18 -0000 1.176
@@ -570,20 +570,26 @@
break;
case st_limit:{
int l = backend_dumpstmt_(s->op1.stval, nr, sql);
- int r1 = backend_dumpstmt_(s->op2.stval, nr, sql);
- int r2 = backend_dumpstmt_(s->op3.stval, nr, sql);
+ int offset = backend_dumpstmt_(s->op2.stval, nr, sql);
+ int topn = backend_dumpstmt_(s->op3.stval, nr, sql);
if (s->flag) { /* topN direction */
buf = NEW_ARRAY(char, BUFSIZ + 1);
- len = snprintf(buf, BUFSIZ, "var s%d :=
s%d.pqueue_topn(s%d + s%d, %d);\n", -s->nr, l, r1, r2, s->flag-1);
- if (s->op2.stval->op1.aval->data.val.ival)
- len += snprintf(buf+len, BUFSIZ-len,
"s%d := s%d.pqueue_topn(s%d, %d);\n", -s->nr, -s->nr, r2, (s->flag-1)?0:1);
+ len = snprintf(buf, BUFSIZ, "var s%d :=
s%d.pqueue_topn(s%d + s%d, %d);\n", -s->nr, l, offset, topn, s->flag-1);
+ if (s->op2.stval->op1.aval->data.val.ival) {
+ if ((s->flag-1) > 0)
+ len += snprintf(buf+len,
BUFSIZ-len, "s%d := s%d.reverse().sort()", -s->nr, -s->nr);
+ else
+ len += snprintf(buf+len,
BUFSIZ-len, "s%d := s%d.reverse().sort_rev()", -s->nr, l);
+ len += snprintf(buf + len, BUFSIZ -
len, ".reverse();\n");
+ len += snprintf(buf+len, BUFSIZ-len,
"s%d := s%d.slice(s%d, s%d + s%d - 1);\n", -s->nr, -s->nr, offset, offset, topn
);
+ }
dump(sql, buf, len, -s->nr);
} else {
buf = NEW_ARRAY(char, BUFSIZ + 1);
- len = snprintf(buf, BUFSIZ, "var s%d :=
s%d.slice(s%d, s%d + s%d - 1);\n", -s->nr, l, r1, r1, r2);
+ len = snprintf(buf, BUFSIZ, "var s%d :=
s%d.slice(s%d, s%d + s%d - 1);\n", -s->nr, l, offset, offset, topn);
dump(sql, buf, len, -s->nr);
}
_DELETE(buf);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
