Changeset: d3918481778e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3918481778e
Modified Files:
sql/src/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
Branch: Oct2010
Log Message:
approved output
diffs (truncated from 317 to 300 lines):
diff -r b3f860694c8a -r d3918481778e
sql/src/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
---
a/sql/src/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
Wed Sep 15 15:12:37 2010 +0200
+++
b/sql/src/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
Wed Sep 15 15:18:49 2010 +0200
@@ -174,10 +174,12 @@
_22 := calc.+(_18,_20);
_23 := calc.-(_22,1);
_24 := algebra.slice(_17,_18,_23);
- _25 := sql.resultSet(1,1,_24);
- sql.rsColumn(_25,"sys.oblo","a","int",32,0,_24);
- _30 := io.stdout();
- sql.exportResult(_30,_25);
+ _25 := bat.mirror(_24);
+ _26 := algebra.leftjoin(_25,_17);
+ _27 := sql.resultSet(1,1,_26);
+ sql.rsColumn(_27,"sys.oblo","a","int",32,0,_26);
+ _32 := io.stdout();
+ sql.exportResult(_32,_27);
end s2_1;
#EXPLAIN select * from oblo LIMIT 2;
% .explain # table_name
@@ -200,15 +202,19 @@
_22 := calc.+(_18,_20);
_23 := calc.-(_22,1);
_24 := algebra.slice(_17,_18,_23);
- _25 := calc.wrd(0:wrd);
- _26 := calc.wrd(2:wrd);
- _27 := calc.+(_25,_26);
- _28 := calc.-(_27,1);
- _29 := algebra.slice(_24,_25,_28);
- _30 := sql.resultSet(1,1,_29);
- sql.rsColumn(_30,"sys.oblo","a","int",32,0,_29);
- _35 := io.stdout();
- sql.exportResult(_35,_30);
+ _25 := bat.mirror(_24);
+ _26 := algebra.leftjoin(_25,_17);
+ _27 := calc.wrd(0:wrd);
+ _28 := calc.wrd(2:wrd);
+ _29 := calc.+(_27,_28);
+ _30 := calc.-(_29,1);
+ _31 := algebra.slice(_26,_27,_30);
+ _32 := bat.mirror(_31);
+ _33 := algebra.leftjoin(_32,_26);
+ _34 := sql.resultSet(1,1,_33);
+ sql.rsColumn(_34,"sys.oblo","a","int",32,0,_33);
+ _39 := io.stdout();
+ sql.exportResult(_39,_34);
end s3_1;
#EXPLAIN select * from oblo LIMIT 1 OFFSET 2;
% .explain # table_name
@@ -231,15 +237,19 @@
_22 := calc.+(_18,_20);
_23 := calc.-(_22,1);
_24 := algebra.slice(_17,_18,_23);
- _25 := calc.wrd(2:wrd);
- _27 := calc.wrd(1:wrd);
- _29 := calc.+(_25,_27);
- _30 := calc.-(_29,1);
- _31 := algebra.slice(_24,_25,_30);
- _32 := sql.resultSet(1,1,_31);
- sql.rsColumn(_32,"sys.oblo","a","int",32,0,_31);
- _37 := io.stdout();
- sql.exportResult(_37,_32);
+ _25 := bat.mirror(_24);
+ _26 := algebra.leftjoin(_25,_17);
+ _27 := calc.wrd(2:wrd);
+ _29 := calc.wrd(1:wrd);
+ _31 := calc.+(_27,_29);
+ _32 := calc.-(_31,1);
+ _33 := algebra.slice(_26,_27,_32);
+ _34 := bat.mirror(_33);
+ _35 := algebra.leftjoin(_34,_26);
+ _36 := sql.resultSet(1,1,_35);
+ sql.rsColumn(_36,"sys.oblo","a","int",32,0,_35);
+ _43 := io.stdout();
+ sql.exportResult(_43,_36);
end s4_1;
#EXPLAIN select * from oblo LIMIT 2 OFFSET 1;
% .explain # table_name
@@ -262,15 +272,19 @@
_22 := calc.+(_18,_20);
_23 := calc.-(_22,1);
_24 := algebra.slice(_17,_18,_23);
- _25 := calc.wrd(1:wrd);
- _27 := calc.wrd(2:wrd);
- _29 := calc.+(_25,_27);
- _30 := calc.-(_29,1);
- _31 := algebra.slice(_24,_25,_30);
- _32 := sql.resultSet(1,1,_31);
- sql.rsColumn(_32,"sys.oblo","a","int",32,0,_31);
- _37 := io.stdout();
- sql.exportResult(_37,_32);
+ _25 := bat.mirror(_24);
+ _26 := algebra.leftjoin(_25,_17);
+ _27 := calc.wrd(1:wrd);
+ _29 := calc.wrd(2:wrd);
+ _31 := calc.+(_27,_29);
+ _32 := calc.-(_31,1);
+ _33 := algebra.slice(_26,_27,_32);
+ _34 := bat.mirror(_33);
+ _35 := algebra.leftjoin(_34,_26);
+ _36 := sql.resultSet(1,1,_35);
+ sql.rsColumn(_36,"sys.oblo","a","int",32,0,_35);
+ _43 := io.stdout();
+ sql.exportResult(_43,_36);
end s5_1;
#EXPLAIN select * from oblo ORDER BY a;
% .explain # table_name
@@ -310,15 +324,15 @@
_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","oblo",1);
_16 := bat.reverse(_15);
_17 := algebra.kdifference(_14,_16);
- _18 := calc.wrd(2:wrd);
- _20 := calc.wrd(nil:wrd);
- _22 := calc.+(_18,_20);
- _23 := pqueue.topn_max(_17,_22);
- _24 := calc.-(_22,1);
- _25 := algebra.sortTail(_23);
- _26 := algebra.slice(_25,_18,_24);
- _27 := algebra.sortTail(_26);
- _28 := algebra.semijoin(_17,_27);
+ _18 := algebra.sortTail(_17);
+ _19 := calc.wrd(2:wrd);
+ _21 := calc.wrd(nil:wrd);
+ _23 := calc.+(_19,_21);
+ _24 := calc.-(_23,1);
+ _25 := algebra.slice(_18,_19,_24);
+ _26 := bat.mirror(_25);
+ _27 := algebra.leftjoin(_26,_18);
+ _28 := algebra.leftjoin(_26,_17);
_29 := sql.resultSet(1,1,_27);
sql.rsColumn(_29,"sys.oblo","a","int",32,0,_28);
_34 := io.stdout();
@@ -344,17 +358,19 @@
_20 := calc.wrd(2:wrd);
_22 := calc.+(_18,_20);
_23 := pqueue.topn_max(_17,_22);
- _24 := algebra.semijoin(_17,_23);
- _25 := calc.wrd(0:wrd);
- _26 := calc.wrd(2:wrd);
- _27 := calc.+(_25,_26);
- _28 := pqueue.topn_max(_24,_27);
- _29 := algebra.sortTail(_28);
- _30 := algebra.semijoin(_24,_29);
- _31 := sql.resultSet(1,1,_29);
- sql.rsColumn(_31,"sys.oblo","a","int",32,0,_30);
- _36 := io.stdout();
- sql.exportResult(_36,_31);
+ _24 := bat.mirror(_23);
+ _25 := algebra.leftjoin(_24,_17);
+ _26 := calc.wrd(0:wrd);
+ _27 := calc.wrd(2:wrd);
+ _28 := calc.+(_26,_27);
+ _29 := calc.-(_28,1);
+ _30 := algebra.slice(_25,_26,_29);
+ _31 := bat.mirror(_30);
+ _32 := algebra.leftjoin(_31,_25);
+ _33 := sql.resultSet(1,1,_32);
+ sql.rsColumn(_33,"sys.oblo","a","int",32,0,_32);
+ _38 := io.stdout();
+ sql.exportResult(_38,_33);
end s8_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2 OFFSET 1;
% .explain # table_name
@@ -378,20 +394,19 @@
_24 := calc.+(_20,_22);
_25 := calc.+(_18,_24);
_26 := pqueue.topn_max(_17,_25);
- _27 := algebra.semijoin(_17,_26);
- _28 := calc.wrd(1:wrd);
- _29 := calc.wrd(2:wrd);
- _30 := calc.+(_28,_29);
- _31 := pqueue.topn_max(_27,_30);
- _32 := calc.-(_30,1);
- _33 := algebra.sortTail(_31);
- _34 := algebra.slice(_33,_28,_32);
- _35 := algebra.sortTail(_34);
- _36 := algebra.semijoin(_27,_35);
- _37 := sql.resultSet(1,1,_35);
- sql.rsColumn(_37,"sys.oblo","a","int",32,0,_36);
- _44 := io.stdout();
- sql.exportResult(_44,_37);
+ _27 := bat.mirror(_26);
+ _28 := algebra.leftjoin(_27,_17);
+ _29 := calc.wrd(1:wrd);
+ _30 := calc.wrd(2:wrd);
+ _31 := calc.+(_29,_30);
+ _32 := calc.-(_31,1);
+ _33 := algebra.slice(_28,_29,_32);
+ _34 := bat.mirror(_33);
+ _35 := algebra.leftjoin(_34,_28);
+ _36 := sql.resultSet(1,1,_35);
+ sql.rsColumn(_36,"sys.oblo","a","int",32,0,_35);
+ _43 := io.stdout();
+ sql.exportResult(_43,_36);
end s9_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 1 OFFSET 2;
% .explain # table_name
@@ -415,20 +430,19 @@
_24 := calc.+(_20,_22);
_25 := calc.+(_18,_24);
_26 := pqueue.topn_max(_17,_25);
- _27 := algebra.semijoin(_17,_26);
- _28 := calc.wrd(2:wrd);
- _29 := calc.wrd(1:wrd);
- _30 := calc.+(_28,_29);
- _31 := pqueue.topn_max(_27,_30);
- _32 := calc.-(_30,1);
- _33 := algebra.sortTail(_31);
- _34 := algebra.slice(_33,_28,_32);
- _35 := algebra.sortTail(_34);
- _36 := algebra.semijoin(_27,_35);
- _37 := sql.resultSet(1,1,_35);
- sql.rsColumn(_37,"sys.oblo","a","int",32,0,_36);
- _44 := io.stdout();
- sql.exportResult(_44,_37);
+ _27 := bat.mirror(_26);
+ _28 := algebra.leftjoin(_27,_17);
+ _29 := calc.wrd(2:wrd);
+ _30 := calc.wrd(1:wrd);
+ _31 := calc.+(_29,_30);
+ _32 := calc.-(_31,1);
+ _33 := algebra.slice(_28,_29,_32);
+ _34 := bat.mirror(_33);
+ _35 := algebra.leftjoin(_34,_28);
+ _36 := sql.resultSet(1,1,_35);
+ sql.rsColumn(_36,"sys.oblo","a","int",32,0,_35);
+ _43 := io.stdout();
+ sql.exportResult(_43,_36);
end s10_1;
#select * from oblo;
diff -r b3f860694c8a -r d3918481778e
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
--- a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
Wed Sep 15 15:12:37 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
Wed Sep 15 15:18:49 2010 +0200
@@ -1,5 +1,5 @@
create table t (c varchar(3));
COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|','
-','"' NULL AS '';"abcd"
-
+','"' NULL AS '';
+"abcd"
diff -r b3f860694c8a -r d3918481778e
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
--- a/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
Wed Sep 15 15:12:37 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
Wed Sep 15 15:18:49 2010 +0200
@@ -112,7 +112,7 @@
% L6 # name
% wrd # type
% 1 # length
-[ 1 ]
+[ 0 ]
#TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test
limit 1;
% sys. # table_name
% concat_concat_x # name
@@ -127,7 +127,7 @@
% L6 # name
% wrd # type
% 1 # length
-[ 1 ]
+[ 0 ]
#drop function GetTrace;
#drop table slice_test;
diff -r b3f860694c8a -r d3918481778e
sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
---
a/sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
Wed Sep 15 15:12:37 2010 +0200
+++
b/sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
Wed Sep 15 15:18:49 2010 +0200
@@ -65,6 +65,10 @@
[ 34 ]
[ 35 ]
[ 36 ]
+[ 37 ]
+[ 38 ]
+[ 39 ]
+[ 40 ]
#WITH t1 (i) AS (SELECT ROW_NUMBER () OVER (ORDER BY id ASC) AS i FROM
_tables) select i from t1;
% .t1 # table_name
% i # name
@@ -109,8 +113,36 @@
[ 37 ]
[ 38 ]
[ 39 ]
+[ 40 ]
+[ 41 ]
+[ 42 ]
+[ 43 ]
+[ 44 ]
+[ 45 ]
+[ 46 ]
+[ 47 ]
+[ 48 ]
+[ 49 ]
+[ 50 ]
+[ 51 ]
+[ 52 ]
+[ 53 ]
+[ 54 ]
+[ 55 ]
+[ 56 ]
+[ 57 ]
+[ 58 ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
