Changeset: 5733c6d8219b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5733c6d8219b Modified Files: sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out Branch: default Log Message:
merge from Jun2010: disable mitosis optimizer to avoid non-deterministic output diffs (142 lines): diff -r 8d21c4ba4845 -r 5733c6d8219b sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql --- a/sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql Mon Jul 12 17:16:49 2010 +0200 +++ b/sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql Mon Jul 12 19:59:02 2010 +0200 @@ -1,1 +1,2 @@ +set optimizer='no_mitosis_pipe'; -- disable mitosis to avoid non-deterministic output EXPLAIN SELECT "name" FROM "tables"; diff -r 8d21c4ba4845 -r 5733c6d8219b sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out --- a/sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out Mon Jul 12 17:16:49 2010 +0200 +++ b/sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out Mon Jul 12 19:59:02 2010 +0200 @@ -34,96 +34,52 @@ +--------+ | mal | +========+ -| function user.s1_1{autoCommit=true}():void; | +| function user.s2_1{autoCommit=true}():void; | | _2 := sql.mvc(); | -| barrier _143 := language.dataflow(); | -| _23:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); | -| _24 := algebra.thetauselect(_23,2:sht,"<"); | -| _25:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); | -| _27 := bat.reverse(_25); | -| _97 := algebra.kdifference(_24,_27); | -| _110 := algebra.markT(_97,5,4); | -| _117 := bat.reverse(_110); | -| _30:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",1); | -| _142 := algebra.leftjoin(_117,_30); | -| _64:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0,7...@0,nil:oid); | -| _72 := algebra.thetauselect(_64,2:sht,"<"); | -| _20:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); | -| _76 := algebra.kdifference(_72,_20); | -| _22 := algebra.thetauselect(_20,2:sht,"<"); | -| _80 := algebra.semijoin(_22,_64); | -| _85 := algebra.kunion(_76,_80); | -| _96 := algebra.kdifference(_85,_27); | -| _107 := algebra.markT(_96,5,3); | -| _116 := bat.reverse(_107); | -| _68:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",0,7...@0,nil:oid); | -| _29:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",2); | -| _122 := algebra.kdifference(_68,_29); | -| _129 := algebra.semijoin(_29,_68); | -| _133 := algebra.kunion(_122,_129); | -| _140 := algebra.leftjoin(_116,_133); | -| _62:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0,5...@0,7...@0); | -| _71 := algebra.thetauselect(_62,2:sht,"<"); | -| _75 := algebra.kdifference(_71,_20); | -| _79 := algebra.semijoin(_22,_62); | -| _84 := algebra.kunion(_75,_79); | -| _94 := algebra.kdifference(_84,_27); | -| _104 := algebra.markT(_94,5,2); | -| _115 := bat.reverse(_104); | -| _67:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",0,5...@0,7...@0); | -| _121 := algebra.kdifference(_67,_29); | -| _127 := algebra.semijoin(_29,_67); | -| _132 := algebra.kunion(_121,_127); | -| _138 := algebra.leftjoin(_115,_132); | -| _60:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0,2...@0,5...@0); | -| _70 := algebra.thetauselect(_60,2:sht,"<"); | -| _74 := algebra.kdifference(_70,_20); | -| _78 := algebra.semijoin(_22,_60); | -| _83 := algebra.kunion(_74,_78); | -| _92 := algebra.kdifference(_83,_27); | -| _101 := algebra.markT(_92,5,1); | -| _114 := bat.reverse(_101); | -| _66:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",0,2...@0,5...@0); | -| _120 := algebra.kdifference(_66,_29); | -| _125 := algebra.semijoin(_29,_66); | -| _131 := algebra.kunion(_120,_125); | -| _136 := algebra.leftjoin(_114,_131); | -| _58:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0,0...@0,2...@0); | -| _69 := algebra.thetauselect(_58,2:sht,"<"); | -| _73 := algebra.kdifference(_69,_20); | -| _77 := algebra.semijoin(_22,_58); | -| _81 := algebra.kunion(_73,_77); | -| _90 := algebra.kdifference(_81,_27); | -| _98 := algebra.markT(_90,5,0); | -| _113 := bat.reverse(_98); | -| _65:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",0,0...@0,2...@0); | -| _118 := algebra.kdifference(_65,_29); | -| _123 := algebra.semijoin(_29,_65); | -| _130 := algebra.kunion(_118,_123); | -| _134 := algebra.leftjoin(_113,_130); | +| barrier _70 := language.dataflow(); | +| _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,:str] := sql.bind(_2,"sys","_tables","name",0); | +| _38:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",2); | +| _39 := algebra.kdifference(_36,_38); | +| _40 := algebra.kunion(_39,_38); | +| _41:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",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); | +| _14 := algebra.markT(_13,0...@0:oid); | | _15 := bat.reverse(_14); | | _16:bat[:oid,:str] := sql.bind(_2,"tmp","_tables","name",0); | | _18 := algebra.leftjoin(_15,_16); | -| exit _143; | -| _33:bat[:oid,:str] := bat.new(nil:oid,nil:str); | -| barrier _146 := language.dataflow(); | -| _32 := mat.pack(_134,_136,_138,_140,_142); | -| _36 := bat.append(_33,_32,true); | -| _38 := bat.append(_36,_18,true); | -| exit _146; | -| _39 := sql.resultSet(1,1,_38); | -| sql.rsColumn(_39,".tables","name","varchar",1024,0,_38); | -| _45 := io.stdout(); | -| sql.exportResult(_45,_39); | -| end s1_1; | +| exit _70; | +| _45:bat[:oid,:str] := bat.new(nil:oid,nil:str); | +| barrier _73 := language.dataflow(); | +| _48 := bat.append(_45,_44,true); | +| _50 := bat.append(_48,_18,true); | +| exit _73; | +| _51 := sql.resultSet(1,1,_50); | +| sql.rsColumn(_51,".tables","name","varchar",1024,0,_50); | +| _57 := io.stdout(); | +| sql.exportResult(_57,_51); | +| end s2_1; | +--------+ -88 rows +44 rows # 15:15:37 > _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list