Changeset: 4a7779ca24cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a7779ca24cd
Modified Files:
monetdb5/mal/Tests/tst1200.stable.out
Branch: default
Log Message:
approved output after manifold changes
diffs (truncated from 888 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,296 +651,72 @@ 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.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;
+ na_a:bat[:oid,:int] := mal.manifold("mtime","month",rule_bat);
oa_a := bat.setColumn(na_a,"month");
# [month](rule_bat).bat.setColumn("month"),
- 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;
+ pa_a:bat[:oid,:int] := mal.manifold("mtime","weekday",rule_bat);
qa_a := bat.setColumn(pa_a,"weekday");
# [weekday](rule_bat).bat.setColumn("weekday"),
- 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;
+ ra_a:bat[:oid,:int] := mal.manifold("mtime","day",rule_bat);
sa_a := bat.setColumn(ra_a,"day");
# [day](rule_bat).bat.setColumn("day"),
- 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;
+ ta_a:bat[:oid,:int] := mal.manifold("mtime","minutes",rule_bat);
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_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;
+ xa_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,2001);
ya_a := bat.setColumn(xa_a,"2001");
# [compute](rule_bat, 2001).bat.setColumn("2001"),
- 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);
- 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;
+ ab_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,2001);
+ bb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",ab_a);
+ cb_a:bat[:oid,:str] := mal.manifold("mtime","dayname",bb_a);
bat.setColumn(cb_a,"2001");
# [dayname]([dayofweek]([compute](rule_bat,
2001))).bat.setColumn("2001"),
- 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;
+ eb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1999);
bat.setColumn(eb_a,"1999");
# [compute](rule_bat, 1999).bat.setColumn("1999"),
- 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;
+ gb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1999);
+ hb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",gb_a);
+ ib_a:bat[:oid,:str] := mal.manifold("mtime","dayname",hb_a);
bat.setColumn(ib_a,"1999");
# [dayname]([dayofweek]([compute](rule_bat,
1999))).bat.setColumn("1999"),
- 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;
+ kb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1992);
bat.setColumn(kb_a,"1992");
# [compute](rule_bat, 1992).bat.setColumn("1992"),
- 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;
+ mb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1992);
+ nb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",mb_a);
+ ob_a:bat[:oid,:str] := mal.manifold("mtime","dayname",nb_a);
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_1088 := bat.reverse(rule_bat);
- X_1090 := bat.new(nil:oid,nil:date);
-barrier (X_1093,X_1094) := iterator.new(rule_bat);
- X_1096 := mtime.compute(X_1094,1572);
- X_1097 := algebra.fetch(X_1088,X_1093);
- bat.insert(X_1090,X_1097,X_1096);
- redo (X_1093,X_1094) := iterator.next(rule_bat);
-exit (X_1093,X_1094);
- sb_a:bat[:oid,:date] := X_1090;
+ sb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1572);
tb_a := bat.setColumn(sb_a,"1572");
# [compute](rule_bat, 1572).bat.setColumn("1572"),
- X_1103 := bat.reverse(rule_bat);
- X_1105 := bat.new(nil:oid,nil:date);
-barrier (X_1107,X_1108) := iterator.new(rule_bat);
- X_1110 := mtime.compute(X_1108,1572);
- X_1111 := algebra.fetch(X_1103,X_1107);
- bat.insert(X_1105,X_1111,X_1110);
- redo (X_1107,X_1108) := iterator.next(rule_bat);
-exit (X_1107,X_1108);
- ub_a:bat[:oid,:date] := X_1105;
- X_1117 := bat.reverse(ub_a);
- X_1119 := bat.new(nil:oid,nil:int);
-barrier (X_1123,X_1124) := iterator.new(ub_a);
- X_1126 := mtime.dayofweek(X_1124);
- X_1127 := algebra.fetch(X_1117,X_1123);
- bat.insert(X_1119,X_1127,X_1126);
- redo (X_1123,X_1124) := iterator.next(ub_a);
-exit (X_1123,X_1124);
- vb_a:bat[:oid,:int] := X_1119;
- X_1133 := bat.reverse(vb_a);
- X_1135 := bat.new(nil:oid,nil:str);
-barrier (X_1138,X_1139) := iterator.new(vb_a);
- X_1141 := mtime.dayname(X_1139);
- X_1142 := algebra.fetch(X_1133,X_1138);
- bat.insert(X_1135,X_1142,X_1141);
- redo (X_1138,X_1139) := iterator.next(vb_a);
-exit (X_1138,X_1139);
- wb_a:bat[:oid,:str] := X_1135;
+ ub_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1572);
+ vb_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",ub_a);
+ wb_a:bat[:oid,:str] := mal.manifold("mtime","dayname",vb_a);
xb_a := bat.setColumn(wb_a,"1572");
# [dayname]([dayofweek]([compute](rule_bat,
1572))).bat.setColumn("1572"),
- X_1148 := bat.reverse(rule_bat);
- X_1150 := bat.new(nil:oid,nil:date);
-barrier (X_1153,X_1154) := iterator.new(rule_bat);
- X_1156 := mtime.compute(X_1154,1);
- X_1157 := algebra.fetch(X_1148,X_1153);
- bat.insert(X_1150,X_1157,X_1156);
- redo (X_1153,X_1154) := iterator.next(rule_bat);
-exit (X_1153,X_1154);
- yb_a:bat[:oid,:date] := X_1150;
+ yb_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1);
ac_a := bat.setColumn(yb_a,"1");
# [compute](rule_bat, 1).bat.setColumn("1"),
- X_1163 := bat.reverse(rule_bat);
- X_1165 := bat.new(nil:oid,nil:date);
-barrier (X_1168,X_1169) := iterator.new(rule_bat);
- X_1171 := mtime.compute(X_1169,1);
- X_1172 := algebra.fetch(X_1163,X_1168);
- bat.insert(X_1165,X_1172,X_1171);
- redo (X_1168,X_1169) := iterator.next(rule_bat);
-exit (X_1168,X_1169);
- bc_a:bat[:oid,:date] := X_1165;
- X_1178 := bat.reverse(bc_a);
- X_1180 := bat.new(nil:oid,nil:int);
-barrier (X_1183,X_1184) := iterator.new(bc_a);
- X_1186 := mtime.dayofweek(X_1184);
- X_1187 := algebra.fetch(X_1178,X_1183);
- bat.insert(X_1180,X_1187,X_1186);
- redo (X_1183,X_1184) := iterator.next(bc_a);
-exit (X_1183,X_1184);
- cc_a:bat[:oid,:int] := X_1180;
- X_1193 := bat.reverse(cc_a);
- X_1195 := bat.new(nil:oid,nil:str);
-barrier (X_1198,X_1199) := iterator.new(cc_a);
- X_1201 := mtime.dayname(X_1199);
- X_1202 := algebra.fetch(X_1193,X_1198);
- bat.insert(X_1195,X_1202,X_1201);
- redo (X_1198,X_1199) := iterator.next(cc_a);
-exit (X_1198,X_1199);
- dc_a:bat[:oid,:str] := X_1195;
+ bc_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,1);
+ cc_a:bat[:oid,:int] := mal.manifold("mtime","dayofweek",bc_a);
+ dc_a:bat[:oid,:str] := mal.manifold("mtime","dayname",cc_a);
ec_a := bat.setColumn(dc_a,"1");
# [dayname]([dayofweek]([compute](rule_bat, 1))).bat.setColumn("1"),
- X_1208 := bat.reverse(rule_bat);
- X_1210 := bat.new(nil:oid,nil:date);
-barrier (X_1214,X_1215) := iterator.new(rule_bat);
- X_1217 := mtime.compute(X_1215,-2000);
- X_1218 := algebra.fetch(X_1208,X_1214);
- bat.insert(X_1210,X_1218,X_1217);
- redo (X_1214,X_1215) := iterator.next(rule_bat);
-exit (X_1214,X_1215);
- fc_a:bat[:oid,:date] := X_1210;
+ fc_a:bat[:oid,:date] := mal.manifold("mtime","compute",rule_bat,-2000);
gc_a := bat.setColumn(fc_a,"-2000");
# [compute](rule_bat, -2000).bat.setColumn("-2000"),
- X_1224 := bat.reverse(rule_bat);
- X_1226 := bat.new(nil:oid,nil:date);
-barrier (X_1228,X_1229) := iterator.new(rule_bat);
- X_1231 := mtime.compute(X_1229,-2000);
- X_1232 := algebra.fetch(X_1224,X_1228);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
