Changeset: f9ecf1c2d596 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9ecf1c2d596
Modified Files:
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/Tests/tst1201.stable.out
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1205.stable.out
monetdb5/mal/Tests/tst850.stable.out
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst905.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/remap.stable.out
Branch: default
Log Message:
Approved after changesets 3db75b2ec791 and bcf39e917224.
Also fixed an incorrect approval in changeset 95370bb07d9f.
diffs (truncated from 2564 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst1200.stable.out
b/monetdb5/mal/Tests/tst1200.stable.out
--- a/monetdb5/mal/Tests/tst1200.stable.out
+++ b/monetdb5/mal/Tests/tst1200.stable.out
@@ -651,240 +651,296 @@ function user.main():void;
## test the operations on rules
ma_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_847 := bat.new(nil:oid,nil:int);
-barrier (X_851,X_852) := iterator.new(rule_bat);
- X_854 := mtime.month(X_852);
- bat.insert(X_847,X_851,X_854);
- redo (X_851,X_852) := iterator.next(rule_bat);
-exit (X_851,X_852);
- na_a:bat[:oid,:int] := X_847;
+ X_847 := bat.reverse(rule_bat);
+ X_849 := bat.new(nil:oid,nil:int);
+barrier (X_853,X_854) := iterator.new(rule_bat);
+ X_856 := mtime.month(X_854);
+ X_857 := algebra.fetch(X_847,X_853);
+ bat.insert(X_849,X_857,X_856);
+ redo (X_853,X_854) := iterator.next(rule_bat);
+exit (X_853,X_854);
+ na_a:bat[:oid,:int] := X_849;
oa_a := bat.setColumn(na_a,"month");
# [month](rule_bat).bat.setColumn("month"),
- X_859 := bat.new(nil:oid,nil:int);
-barrier (X_861,X_862) := iterator.new(rule_bat);
- X_864 := mtime.weekday(X_862);
- bat.insert(X_859,X_861,X_864);
- redo (X_861,X_862) := iterator.next(rule_bat);
-exit (X_861,X_862);
- pa_a:bat[:oid,:int] := X_859;
+ X_863 := bat.reverse(rule_bat);
+ X_865 := bat.new(nil:oid,nil:int);
+barrier (X_867,X_868) := iterator.new(rule_bat);
+ X_870 := mtime.weekday(X_868);
+ X_871 := algebra.fetch(X_863,X_867);
+ bat.insert(X_865,X_871,X_870);
+ redo (X_867,X_868) := iterator.next(rule_bat);
+exit (X_867,X_868);
+ pa_a:bat[:oid,:int] := X_865;
qa_a := bat.setColumn(pa_a,"weekday");
# [weekday](rule_bat).bat.setColumn("weekday"),
- X_869 := bat.new(nil:oid,nil:int);
-barrier (X_871,X_872) := iterator.new(rule_bat);
- X_874 := mtime.day(X_872);
- bat.insert(X_869,X_871,X_874);
- redo (X_871,X_872) := iterator.next(rule_bat);
-exit (X_871,X_872);
- ra_a:bat[:oid,:int] := X_869;
+ X_877 := bat.reverse(rule_bat);
+ X_879 := bat.new(nil:oid,nil:int);
+barrier (X_881,X_882) := iterator.new(rule_bat);
+ X_884 := mtime.day(X_882);
+ X_885 := algebra.fetch(X_877,X_881);
+ bat.insert(X_879,X_885,X_884);
+ redo (X_881,X_882) := iterator.next(rule_bat);
+exit (X_881,X_882);
+ ra_a:bat[:oid,:int] := X_879;
sa_a := bat.setColumn(ra_a,"day");
# [day](rule_bat).bat.setColumn("day"),
- X_879 := bat.new(nil:oid,nil:int);
-barrier (X_881,X_882) := iterator.new(rule_bat);
- X_884 := mtime.minutes(X_882);
- bat.insert(X_879,X_881,X_884);
- redo (X_881,X_882) := iterator.next(rule_bat);
-exit (X_881,X_882);
- ta_a:bat[:oid,:int] := X_879;
+ X_891 := bat.reverse(rule_bat);
+ X_893 := bat.new(nil:oid,nil:int);
+barrier (X_897,X_898) := iterator.new(rule_bat);
+ X_900 := mtime.minutes(X_898);
+ X_901 := algebra.fetch(X_891,X_897);
+ bat.insert(X_893,X_901,X_900);
+ redo (X_897,X_898) := iterator.next(rule_bat);
+exit (X_897,X_898);
+ ta_a:bat[:oid,:int] := X_893;
ua_a := bat.setColumn(ta_a,"minutes");
io.print("rule_bat,na_a,pa_a,ra_a,ta_a");
va_a := io.print(month_bat,rule_bat,na_a,pa_a,ra_a,ta_a);
# [minutes](rule_bat).bat.setColumn("minutes"));
bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_889 := bat.new(nil:oid,nil:date);
-barrier (X_893,X_894) := iterator.new(rule_bat);
- X_896 := mtime.compute(X_894,2001);
- bat.insert(X_889,X_893,X_896);
- redo (X_893,X_894) := iterator.next(rule_bat);
-exit (X_893,X_894);
- xa_a:bat[:oid,:date] := X_889;
+ X_907 := bat.reverse(rule_bat);
+ X_909 := bat.new(nil:oid,nil:date);
+barrier (X_912,X_913) := iterator.new(rule_bat);
+ X_915 := mtime.compute(X_913,2001);
+ X_916 := algebra.fetch(X_907,X_912);
+ bat.insert(X_909,X_916,X_915);
+ redo (X_912,X_913) := iterator.next(rule_bat);
+exit (X_912,X_913);
+ xa_a:bat[:oid,:date] := X_909;
ya_a := bat.setColumn(xa_a,"2001");
# [compute](rule_bat, 2001).bat.setColumn("2001"),
- X_901 := bat.new(nil:oid,nil:date);
-barrier (X_903,X_904) := iterator.new(rule_bat);
- X_906 := mtime.compute(X_904,2001);
- bat.insert(X_901,X_903,X_906);
- redo (X_903,X_904) := iterator.next(rule_bat);
-exit (X_903,X_904);
- ab_a:bat[:oid,:date] := X_901;
- X_911 := bat.new(nil:oid,nil:int);
-barrier (X_914,X_915) := iterator.new(ab_a);
- X_917 := mtime.dayofweek(X_915);
- bat.insert(X_911,X_914,X_917);
- redo (X_914,X_915) := iterator.next(ab_a);
-exit (X_914,X_915);
- bb_a:bat[:oid,:int] := X_911;
- X_922 := bat.new(nil:oid,nil:str);
-barrier (X_926,X_927) := iterator.new(bb_a);
- X_929 := mtime.dayname(X_927);
- bat.insert(X_922,X_926,X_929);
- redo (X_926,X_927) := iterator.next(bb_a);
+ X_922 := bat.reverse(rule_bat);
+ X_924 := bat.new(nil:oid,nil:date);
+barrier (X_926,X_927) := iterator.new(rule_bat);
+ X_929 := mtime.compute(X_927,2001);
+ X_930 := algebra.fetch(X_922,X_926);
+ bat.insert(X_924,X_930,X_929);
+ redo (X_926,X_927) := iterator.next(rule_bat);
exit (X_926,X_927);
- cb_a:bat[:oid,:str] := X_922;
+ ab_a:bat[:oid,:date] := X_924;
+ X_936 := bat.reverse(ab_a);
+ X_938 := bat.new(nil:oid,nil:int);
+barrier (X_942,X_943) := iterator.new(ab_a);
+ X_945 := mtime.dayofweek(X_943);
+ X_946 := algebra.fetch(X_936,X_942);
+ bat.insert(X_938,X_946,X_945);
+ redo (X_942,X_943) := iterator.next(ab_a);
+exit (X_942,X_943);
+ bb_a:bat[:oid,:int] := X_938;
+ X_952 := bat.reverse(bb_a);
+ X_954 := bat.new(nil:oid,nil:str);
+barrier (X_957,X_958) := iterator.new(bb_a);
+ X_960 := mtime.dayname(X_958);
+ X_961 := algebra.fetch(X_952,X_957);
+ bat.insert(X_954,X_961,X_960);
+ redo (X_957,X_958) := iterator.next(bb_a);
+exit (X_957,X_958);
+ cb_a:bat[:oid,:str] := X_954;
bat.setColumn(cb_a,"2001");
# [dayname]([dayofweek]([compute](rule_bat,
2001))).bat.setColumn("2001"),
- X_934 := bat.new(nil:oid,nil:date);
-barrier (X_937,X_938) := iterator.new(rule_bat);
- X_940 := mtime.compute(X_938,1999);
- bat.insert(X_934,X_937,X_940);
- redo (X_937,X_938) := iterator.next(rule_bat);
-exit (X_937,X_938);
- eb_a:bat[:oid,:date] := X_934;
+ X_967 := bat.reverse(rule_bat);
+ X_969 := bat.new(nil:oid,nil:date);
+barrier (X_972,X_973) := iterator.new(rule_bat);
+ X_975 := mtime.compute(X_973,1999);
+ X_976 := algebra.fetch(X_967,X_972);
+ bat.insert(X_969,X_976,X_975);
+ redo (X_972,X_973) := iterator.next(rule_bat);
+exit (X_972,X_973);
+ eb_a:bat[:oid,:date] := X_969;
bat.setColumn(eb_a,"1999");
# [compute](rule_bat, 1999).bat.setColumn("1999"),
- X_945 := bat.new(nil:oid,nil:date);
-barrier (X_947,X_948) := iterator.new(rule_bat);
- X_950 := mtime.compute(X_948,1999);
- bat.insert(X_945,X_947,X_950);
- redo (X_947,X_948) := iterator.next(rule_bat);
-exit (X_947,X_948);
- gb_a:bat[:oid,:date] := X_945;
- X_955 := bat.new(nil:oid,nil:int);
-barrier (X_959,X_960) := iterator.new(gb_a);
- X_962 := mtime.dayofweek(X_960);
- bat.insert(X_955,X_959,X_962);
- redo (X_959,X_960) := iterator.next(gb_a);
-exit (X_959,X_960);
- hb_a:bat[:oid,:int] := X_955;
- X_967 := bat.new(nil:oid,nil:str);
-barrier (X_970,X_971) := iterator.new(hb_a);
- X_973 := mtime.dayname(X_971);
- bat.insert(X_967,X_970,X_973);
- redo (X_970,X_971) := iterator.next(hb_a);
-exit (X_970,X_971);
- ib_a:bat[:oid,:str] := X_967;
+ X_982 := bat.reverse(rule_bat);
+ X_984 := bat.new(nil:oid,nil:date);
+barrier (X_987,X_988) := iterator.new(rule_bat);
+ X_990 := mtime.compute(X_988,1999);
+ X_991 := algebra.fetch(X_982,X_987);
+ bat.insert(X_984,X_991,X_990);
+ redo (X_987,X_988) := iterator.next(rule_bat);
+exit (X_987,X_988);
+ gb_a:bat[:oid,:date] := X_984;
+ X_997 := bat.reverse(gb_a);
+ X_999 := bat.new(nil:oid,nil:int);
+barrier (X_1002,X_1003) := iterator.new(gb_a);
+ X_1005 := mtime.dayofweek(X_1003);
+ X_1006 := algebra.fetch(X_997,X_1002);
+ bat.insert(X_999,X_1006,X_1005);
+ redo (X_1002,X_1003) := iterator.next(gb_a);
+exit (X_1002,X_1003);
+ hb_a:bat[:oid,:int] := X_999;
+ X_1012 := bat.reverse(hb_a);
+ X_1014 := bat.new(nil:oid,nil:str);
+barrier (X_1017,X_1018) := iterator.new(hb_a);
+ X_1020 := mtime.dayname(X_1018);
+ X_1021 := algebra.fetch(X_1012,X_1017);
+ bat.insert(X_1014,X_1021,X_1020);
+ redo (X_1017,X_1018) := iterator.next(hb_a);
+exit (X_1017,X_1018);
+ ib_a:bat[:oid,:str] := X_1014;
bat.setColumn(ib_a,"1999");
# [dayname]([dayofweek]([compute](rule_bat,
1999))).bat.setColumn("1999"),
- X_978 := bat.new(nil:oid,nil:date);
-barrier (X_981,X_982) := iterator.new(rule_bat);
- X_984 := mtime.compute(X_982,1992);
- bat.insert(X_978,X_981,X_984);
- redo (X_981,X_982) := iterator.next(rule_bat);
-exit (X_981,X_982);
- kb_a:bat[:oid,:date] := X_978;
+ X_1027 := bat.reverse(rule_bat);
+ X_1029 := bat.new(nil:oid,nil:date);
+barrier (X_1033,X_1034) := iterator.new(rule_bat);
+ X_1036 := mtime.compute(X_1034,1992);
+ X_1037 := algebra.fetch(X_1027,X_1033);
+ bat.insert(X_1029,X_1037,X_1036);
+ redo (X_1033,X_1034) := iterator.next(rule_bat);
+exit (X_1033,X_1034);
+ kb_a:bat[:oid,:date] := X_1029;
bat.setColumn(kb_a,"1992");
# [compute](rule_bat, 1992).bat.setColumn("1992"),
- X_989 := bat.new(nil:oid,nil:date);
-barrier (X_992,X_993) := iterator.new(rule_bat);
- X_995 := mtime.compute(X_993,1992);
- bat.insert(X_989,X_992,X_995);
- redo (X_992,X_993) := iterator.next(rule_bat);
-exit (X_992,X_993);
- mb_a:bat[:oid,:date] := X_989;
- X_1000 := bat.new(nil:oid,nil:int);
-barrier (X_1003,X_1004) := iterator.new(mb_a);
- X_1006 := mtime.dayofweek(X_1004);
- bat.insert(X_1000,X_1003,X_1006);
- redo (X_1003,X_1004) := iterator.next(mb_a);
-exit (X_1003,X_1004);
- nb_a:bat[:oid,:int] := X_1000;
- X_1011 := bat.new(nil:oid,nil:str);
-barrier (X_1014,X_1015) := iterator.new(nb_a);
- X_1017 := mtime.dayname(X_1015);
- bat.insert(X_1011,X_1014,X_1017);
- redo (X_1014,X_1015) := iterator.next(nb_a);
-exit (X_1014,X_1015);
- ob_a:bat[:oid,:str] := X_1011;
+ X_1043 := bat.reverse(rule_bat);
+ X_1045 := bat.new(nil:oid,nil:date);
+barrier (X_1047,X_1048) := iterator.new(rule_bat);
+ X_1050 := mtime.compute(X_1048,1992);
+ X_1051 := algebra.fetch(X_1043,X_1047);
+ bat.insert(X_1045,X_1051,X_1050);
+ redo (X_1047,X_1048) := iterator.next(rule_bat);
+exit (X_1047,X_1048);
+ mb_a:bat[:oid,:date] := X_1045;
+ X_1057 := bat.reverse(mb_a);
+ X_1059 := bat.new(nil:oid,nil:int);
+barrier (X_1062,X_1063) := iterator.new(mb_a);
+ X_1065 := mtime.dayofweek(X_1063);
+ X_1066 := algebra.fetch(X_1057,X_1062);
+ bat.insert(X_1059,X_1066,X_1065);
+ redo (X_1062,X_1063) := iterator.next(mb_a);
+exit (X_1062,X_1063);
+ nb_a:bat[:oid,:int] := X_1059;
+ X_1072 := bat.reverse(nb_a);
+ X_1074 := bat.new(nil:oid,nil:str);
+barrier (X_1078,X_1079) := iterator.new(nb_a);
+ X_1081 := mtime.dayname(X_1079);
+ X_1082 := algebra.fetch(X_1072,X_1078);
+ bat.insert(X_1074,X_1082,X_1081);
+ redo (X_1078,X_1079) := iterator.next(nb_a);
+exit (X_1078,X_1079);
+ ob_a:bat[:oid,:str] := X_1074;
bat.setColumn(ob_a,"1992");
io.print("rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a");
qb_a := io.print(rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a);
# [dayname]([dayofweek]([compute](rule_bat,
1992))).bat.setColumn("1992"));
rb_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- X_1022 := bat.new(nil:oid,nil:date);
-barrier (X_1026,X_1027) := iterator.new(rule_bat);
- X_1029 := mtime.compute(X_1027,1572);
- bat.insert(X_1022,X_1026,X_1029);
- redo (X_1026,X_1027) := iterator.next(rule_bat);
-exit (X_1026,X_1027);
- sb_a:bat[:oid,:date] := X_1022;
+ X_1088 := bat.reverse(rule_bat);
+ X_1090 := bat.new(nil:oid,nil:date);
+barrier (X_1093,X_1094) := iterator.new(rule_bat);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
