Changeset: 842decdd2ed4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=842decdd2ed4
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: Apr2011
Log Message:
re-aligned specific stable output with standard one
diffs (204 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
@@ -33,8 +33,8 @@
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file1', -1,
0), [ cm_tmp.i ],
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file2', -1,
0), [ cm_tmp.i ]
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file1', -1,
0, 0), [ cm_tmp.i ],
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file2', -1,
0, 0), [ cm_tmp.i ]
| )
)
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -42,40 +42,38 @@
% 0 # length
function user.s2_1{autoCommit=true}():void;
_2 := sql.mvc();
- _3:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",0);
- _8:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",2);
- _10 := algebra.kdifference(_3,_8);
- _11 := algebra.kunion(_10,_8);
- _12:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",1);
- _14 := algebra.kunion(_11,_12);
- _15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","t2564",1);
- _16 := bat.reverse(_15);
- _17 := algebra.kdifference(_14,_16);
- (ext20,grp18) := group.new(_17);
- _20:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",0);
- _22:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",2);
- _23 := algebra.kdifference(_20,_22);
- _24 := algebra.kunion(_23,_22);
- _25:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",1);
- _26 := algebra.kunion(_24,_25);
- _27 := algebra.kdifference(_26,_16);
- (ext33,grp31) := group.derive(ext20,grp18,_27);
- _30:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",0);
- _32:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",2);
- _35 := algebra.kdifference(_30,_32);
- _36 := algebra.kunion(_35,_32);
- _37:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",1);
- _38 := algebra.kunion(_36,_37);
- _39:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","t2564",1);
- _40 := bat.reverse(_39);
- _41 := algebra.kdifference(_38,_40);
- (ext48,grp46) := group.done(ext33,grp31,_41);
- _44 := bat.mirror(ext48);
- _45:bat[:oid,:wrd] := aggr.count(grp46,grp46,_44);
- _46 := sql.resultSet(1,1,_45);
- sql.rsColumn(_46,"sys.t2564","L4","wrd",32,0,_45);
- _54 := io.stdout();
- sql.exportResult(_54,_46);
+ _30:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",0);
+ _29:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",2);
+ _32 := algebra.kdifference(_30,_29);
+ _33 := algebra.kunion(_32,_29);
+ _28:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",1);
+ _34 := algebra.kunion(_33,_28);
+ _5:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","t2564",1);
+ _8 := bat.reverse(_5);
+ _35 := algebra.kdifference(_34,_8);
+ (ext53,grp51) := group.new(_35);
+ _21:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",0);
+ _20:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",2);
+ _22 := algebra.kdifference(_21,_20);
+ _23 := algebra.kunion(_22,_20);
+ _19:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",1);
+ _24 := algebra.kunion(_23,_19);
+ _25 := algebra.kdifference(_24,_8);
+ (ext56,grp54) := group.derive(ext53,grp51,_25);
+ _12:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",0);
+ _10:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",2);
+ _14 := algebra.kdifference(_12,_10);
+ _15 := algebra.kunion(_14,_10);
+ _9:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",1);
+ _16 := algebra.kunion(_15,_9);
+ _17 := algebra.kdifference(_16,_8);
+ (ext59,grp57) := group.done(ext56,grp54,_17);
+ _42 := bat.mirror(ext59);
+ _43:bat[:oid,:wrd] := aggr.count(grp57,grp57,_42);
+ _44 := sql.resultSet(1,1,_43);
+ sql.rsColumn(_44,"sys.t2564","L4":str,"wrd",32,0,_43);
+ _52 := io.stdout();
+ sql.exportResult(_52,_44);
end s2_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -30,9 +30,9 @@
# 13:30:19 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
rig -p 39462 -d mTests_src_test_BugTracker -f
"../../../../../source/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql"
# 13:30:19 >
-+-----------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------+
| rel
|
-+=================================================================================================================+
++==================================================================================================================+
| project (
|
| | group by (
|
| | | project (
|
@@ -40,18 +40,18 @@
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] |
-| | | | | | ) [ p.type < convert(2) ]
|
+| | | | | | ) [ p.type < convert(2 from tinyint to smallint) ]
|
| | | | | ) [ p.id, p.type ],
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] |
-| | | | | | ) [ t.type < convert(2) ]
|
+| | | | | | ) [ t.type < convert(2 from tinyint to smallint) ]
|
| | | | | ) [ t.id, t.type ]
|
| | | | ) [ id as tables.id, type as tables.type ]
|
| | | ) [ tables.id ]
|
| | ) [ ] [ count NOT NULL as L1 ]
|
| ) [ L1 NOT NULL ]
|
-+-----------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------+
18 rows
+--------+
@@ -59,41 +59,41 @@
+========+
| function user.s3_1{autoCommit=true}():void; |
| _2 := sql.mvc(); |
-| _19:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0); |
-| _21 := algebra.thetauselect(_19,2:sht,"<"); |
-| _22:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); |
-| _24 := algebra.kdifference(_21,_22); |
-| _25 := algebra.thetauselect(_22,2:sht,"<"); |
-| _26 := algebra.kunion(_24,_25); |
-| _27:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); |
-| _28 := algebra.thetauselect(_27,2:sht,"<"); |
-| _29 := algebra.kunion(_26,_28); |
-| _30:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); |
-| _32 := bat.reverse(_30); |
-| _33 := algebra.kdifference(_29,_32); |
-| _34 := algebra.markT(_33,0@0:oid); |
-| _35 := bat.reverse(_34); |
-| _36:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",0); |
-| _38:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",2); |
-| _39 := algebra.kdifference(_36,_38); |
-| _40 := algebra.kunion(_39,_38); |
-| _41:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",1); |
-| _43 := algebra.kunion(_40,_41); |
-| _44 := algebra.leftjoin(_35,_43); |
-| _3:bat[:oid,:sht] := sql.bind(_2,"tmp","_tables","type",0); |
-| _8 := algebra.thetauselect(_3,2:sht,"<"); |
-| _10:bat[:oid,:oid] := sql.bind_dbat(_2,"tmp","_tables",1); |
-| _12 := bat.reverse(_10); |
-| _13 := algebra.kdifference(_8,_12); |
-| _14 := algebra.markT(_13,0@0:oid); |
-| _15 := bat.reverse(_14); |
-| _16:bat[:oid,:int] := sql.bind(_2,"tmp","_tables","id",0); |
-| _18 := algebra.leftjoin(_15,_16); |
-| _45:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
-| _48 := bat.append(_45,_44,true); |
-| _50 := bat.append(_48,_18,true); |
-| _51 := aggr.count(_50); |
-| sql.exportValue(1,".tables","L2","wrd",32,0,6,_51,""); |
+| _37:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0); |
+| _39 := algebra.thetauselect(_37,2:sht,"<"); |
+| _35:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); |
+| _41 := algebra.kdifference(_39,_35); |
+| _36 := algebra.thetauselect(_35,2:sht,"<"); |
+| _42 := algebra.kunion(_41,_36); |
+| _31:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); |
+| _34 := algebra.thetauselect(_31,2:sht,"<"); |
+| _43 := algebra.kunion(_42,_34); |
+| _28:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); |
+| _30 := bat.reverse(_28); |
+| _44 := algebra.kdifference(_43,_30); |
+| _45 := algebra.markT(_44,0@0:oid); |
+| _46 := bat.reverse(_45); |
+| _24:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",0); |
+| _22:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",2); |
+| _25 := algebra.kdifference(_24,_22); |
+| _26 := algebra.kunion(_25,_22); |
+| _20:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",1); |
+| _27 := algebra.kunion(_26,_20); |
+| _47 := algebra.leftjoin(_46,_27); |
+| _12:bat[:oid,:sht] := sql.bind(_2,"tmp","_tables","type",0); |
+| _13 := algebra.thetauselect(_12,2:sht,"<"); |
+| _9:bat[:oid,:oid] := sql.bind_dbat(_2,"tmp","_tables",1); |
+| _11 := bat.reverse(_9); |
+| _15 := algebra.kdifference(_13,_11); |
+| _16 := algebra.markT(_15,0@0:oid); |
+| _17 := bat.reverse(_16); |
+| _4:bat[:oid,:int] := sql.bind(_2,"tmp","_tables","id",0); |
+| _18 := algebra.leftjoin(_17,_4); |
+| _48:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
+| _51 := bat.append(_48,_47,true); |
+| _53 := bat.append(_51,_18,true); |
+| _54 := aggr.count(_53); |
+| sql.exportValue(1,".tables","L2":str,"wrd",32,0,6,_54,""); |
| end s3_1; |
+--------+
38 rows
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
