Changeset: edd6718c3fcd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edd6718c3fcd
Removed Files:
monetdb5/mal/Tests/tst1201.malC
monetdb5/mal/Tests/tst1201.stable.err
monetdb5/mal/Tests/tst1201.stable.out
monetdb5/mal/Tests/tst1202.malC
monetdb5/mal/Tests/tst1202.stable.err
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/mal/Tests/tst1203.malC
monetdb5/mal/Tests/tst1203.stable.err
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1205.malC
monetdb5/mal/Tests/tst1205.stable.err
monetdb5/mal/Tests/tst1205.stable.out
monetdb5/mal/Tests/tst1225.malC
monetdb5/mal/Tests/tst1225.stable.err
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/modules/atoms/Tests/time00.malC
monetdb5/modules/atoms/Tests/time00.stable.err
monetdb5/modules/atoms/Tests/time00.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst1200.malC
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/modules/kernel/Tests/time01.stable.out
monetdb5/optimizer/Tests/commonTerms.stable.out
Branch: mtime
Log Message:
Removed duplicate tests, removed timzeone tests and approved output.
diffs (truncated from 4117 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -81,12 +81,7 @@ tst116
tst1150
#tst120 files are not located in module and paths are runtime dependent
tst1200
-tst1201
-tst1202
-tst1203
tst1204
-tst1205
-tst1225
tst120a
tst120b
tst130
diff --git a/monetdb5/mal/Tests/tst1200.malC b/monetdb5/mal/Tests/tst1200.malC
--- a/monetdb5/mal/Tests/tst1200.malC
+++ b/monetdb5/mal/Tests/tst1200.malC
@@ -8,54 +8,7 @@
#
#
#
-lzone:= mtime.timezone("GMT+01:00");
-mtime.timezone_local(lzone);
-##line 535 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx"
-## test the various ways to create rules
- rule_jan:= mtime.rule("1st MON from start of JAN@01:15");
-#var rule_jan := mtime.rule("1st MON from start of JAN@01:15");
- rule_mar:= mtime.rule("first WEDNE on or after march 10@01:15");
-#var rule_mar := mtime.rule("first WEDNE on or after march 10@01:15");
- rule_apr:= mtime.rule("last THU on or before aPr 1@01:15");
-#var rule_apr := mtime.rule("last THU on or before aPr 1@01:15");
- rule_may:= mtime.rule("MAY 26@01:15");
-#var rule_may := mtime.rule("MAY 26@01:15");
- rule_jun:= mtime.rule("2nd TUE from end of june@01:15");
-#var rule_jun := mtime.rule("2nd TUE from end of june@01:15");
- rule_jul:= mtime.rule(7,1,7,75);
-#var rule_jul := mtime.rule(7,1,7,75);
- rule_aug:= mtime.rule(8,-1,7,75);
-#var rule_aug := mtime.rule(8,-1,7,75);
- rule_sep:= mtime.rule(9,-10,2,75);
-#var rule_sep := mtime.rule(9,-10,2,75);
- rule_oct:= mtime.rule(10,31,0,75);
-#var rule_oct := mtime.rule(10,31,0,75);
- rule_nov:= mtime.rule(11,-10,-3,75);
-#var rule_nov := mtime.rule(11,-10,-3,75);
-## nil rules
- rule_dec:= mtime.rule(12,-31,0,75);
-#var rule_dec := mtime.rule(12,-31,0,75);
- rule_feb:= mtime.rule("first fRiDaY on or after february 30@01:15");
-#var rule_feb := mtime.rule("first fRiDaY on or after february 30@01:15");
-#
month_bat:= bat.new(:str,10);
- rule_bat:= bat.new(:zrule,10);
-#var rule_bat := bat.new(str,rule,10);
- bat.append(rule_bat,rule_jan);
- bat.append(rule_bat,rule_feb);
- bat.append(rule_bat,rule_mar);
- bat.append(rule_bat,rule_apr);
-#rule_bat.bat.append(rule_apr);
- bat.append(rule_bat,rule_may);
- bat.append(rule_bat,rule_jun);
- bat.append(rule_bat,rule_jul);
- bat.append(rule_bat,rule_aug);
-#rule_bat.bat.append(rule_aug);
- bat.append(rule_bat,rule_sep);
- bat.append(rule_bat,rule_oct);
- bat.append(rule_bat,rule_nov);
- bat.append(rule_bat,rule_dec);
-
bat.append(month_bat,"jan");
bat.append(month_bat,"feb");
bat.append(month_bat,"mar");
@@ -71,176 +24,6 @@ mtime.timezone_local(lzone);
bat.append(month_bat,"nov");
bat.append(month_bat,"dec");
#
-## test the operations on rules
- ma_a := bat.setColumn(rule_bat,"rule");
-#io.print(rule_bat.bat.setColumn("rule"),
- na_a:bat[:int] := mal.multiplex("mtime","month",rule_bat);
- oa_a := bat.setColumn(na_a,"month");
-# [month](rule_bat).bat.setColumn("month"),
- pa_a:bat[:int] := mal.multiplex("mtime","weekday",rule_bat);
- qa_a := bat.setColumn(pa_a,"weekday");
-# [weekday](rule_bat).bat.setColumn("weekday"),
- ra_a:bat[:int] := mal.multiplex("mtime","day",rule_bat);
- sa_a := bat.setColumn(ra_a,"day");
-# [day](rule_bat).bat.setColumn("day"),
- ta_a:bat[:int] := mal.multiplex("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"),
- xa_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,2001);
- ya_a := bat.setColumn(xa_a,"2001");
-# [compute](rule_bat, 2001).bat.setColumn("2001"),
- ab_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,2001);
- bb_a:bat[:int] := mal.multiplex("mtime","dayofweek",ab_a);
- cb_a:bat[:str] := mal.multiplex("mtime","dayname",bb_a);
- bat.setColumn(cb_a,"2001");
-# [dayname]([dayofweek]([compute](rule_bat, 2001))).bat.setColumn("2001"),
- eb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1999);
- bat.setColumn(eb_a,"1999");
-# [compute](rule_bat, 1999).bat.setColumn("1999"),
- gb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1999);
- hb_a:bat[:int] := mal.multiplex("mtime","dayofweek",gb_a);
- ib_a:bat[:str] := mal.multiplex("mtime","dayname",hb_a);
- bat.setColumn(ib_a,"1999");
-# [dayname]([dayofweek]([compute](rule_bat, 1999))).bat.setColumn("1999"),
- kb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1992);
- bat.setColumn(kb_a,"1992");
-# [compute](rule_bat, 1992).bat.setColumn("1992"),
- mb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1992);
- nb_a:bat[:int] := mal.multiplex("mtime","dayofweek",mb_a);
- ob_a:bat[:str] := mal.multiplex("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"),
- sb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1572);
- tb_a := bat.setColumn(sb_a,"1572");
-# [compute](rule_bat, 1572).bat.setColumn("1572"),
- ub_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1572);
- vb_a:bat[:int] := mal.multiplex("mtime","dayofweek",ub_a);
- wb_a:bat[:str] := mal.multiplex("mtime","dayname",vb_a);
- xb_a := bat.setColumn(wb_a,"1572");
-# [dayname]([dayofweek]([compute](rule_bat, 1572))).bat.setColumn("1572"),
- yb_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1);
- ac_a := bat.setColumn(yb_a,"1");
-# [compute](rule_bat, 1).bat.setColumn("1"),
- bc_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,1);
- cc_a:bat[:int] := mal.multiplex("mtime","dayofweek",bc_a);
- dc_a:bat[:str] := mal.multiplex("mtime","dayname",cc_a);
- ec_a := bat.setColumn(dc_a,"1");
-# [dayname]([dayofweek]([compute](rule_bat, 1))).bat.setColumn("1"),
- fc_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,-2000);
- gc_a := bat.setColumn(fc_a,"-2000");
-# [compute](rule_bat, -2000).bat.setColumn("-2000"),
- hc_a:bat[:date] := mal.multiplex("mtime","compute",rule_bat,-2000);
- ic_a:bat[:int] := mal.multiplex("mtime","dayofweek",hc_a);
- jc_a:bat[:str] := mal.multiplex("mtime","dayname",ic_a);
- kc_a := bat.setColumn(jc_a,"-2000");
-io.print("rule_bat,sb_a,wb_a,yb_a,dc_a,fc_a,jc_a");
- lc_a := io.print(month_bat,rule_bat,sb_a,wb_a,yb_a,dc_a,fc_a,jc_a);
-# [dayname]([dayofweek]([compute](rule_bat,
-2000))).bat.setColumn("-2000"));
-#
-#
-#
-##line 580 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx"
-## test the various ways to create timezones, using some of the above created
rules
- tzone_00:= mtime.timezone("GMT");
-#var tzone_00 := mtime.timezone("GMT");
- tzone_01:= mtime.timezone("GMT+01:00");
-#var tzone_01 := mtime.timezone("GMT+01:00");
- tzone_02:= mtime.timezone("GMT+0100");
-#var tzone_02 := mtime.timezone("GMT+0100");
- tzone_03:= mtime.timezone(60,rule_oct,rule_mar);
-#var tzone_03 := mtime.timezone(60, rule_oct, rule_mar);
- tzone_04:= mtime.timezone(0,rule_jan,rule_aug);
-#var tzone_04 := mtime.timezone(0, rule_jan, rule_aug);
- tzone_05:= mtime.timezone(-97,rule_oct,rule_apr);
-#var tzone_05 := mtime.timezone(-97, rule_oct, rule_apr);
- tzone_06:= mtime.timezone(-97,rule_may,rule_sep);
-#var tzone_06 := mtime.timezone(-97, rule_may, rule_sep);
- mc_a := calc.*(23,60);
- tzone_07:= mtime.timezone(mc_a,rule_apr,rule_nov);
-#var tzone_07 := mtime.timezone(23*60, rule_apr, rule_nov);
- nc_a := calc.*(-23,59);
- oc_a := calc.-(nc_a,59);
- tzone_08:= mtime.timezone(oc_a);
-#var tzone_08 := mtime.timezone((-23*59) - 59);
- tzone_09:= mtime.timezone(0);
-#var tzone_09 := mtime.timezone(0);
- tzone_10:= mtime.timezone(-60);
-#var tzone_10 := mtime.timezone(-60);
- pc_a := calc.*(23,60);
- qc_a := calc.+(pc_a,59);
- tzone_11:= mtime.timezone(qc_a);
-#var tzone_11 := mtime.timezone((23*60)+59);
- tzone_12:= mtime.timezone(60);
-#var tzone_12 := mtime.timezone(60);
-## nil tzones
- tzone_13:= mtime.timezone(60,rule_feb,rule_dec);
-#var tzone_13 := mtime.timezone(60, rule_feb, rule_dec);
- rc_a := calc.*(24,60);
- tzone_14:= mtime.timezone(rc_a,rule_apr,rule_nov); # to complete it
- tzone_15:= mtime.timezone(rc_a,rule_apr,rule_nov);
-#var tzone_15 := mtime.timezone(24*60, rule_apr, rule_nov);
-#
-#
- tzone_bat:= bat.new(:timezone);
- bat.append(tzone_bat,tzone_00);
- bat.append(tzone_bat,tzone_01);
- bat.append(tzone_bat,tzone_02);
- bat.append(tzone_bat,tzone_03);
- bat.append(tzone_bat,tzone_04);
- bat.append(tzone_bat,tzone_05);
- bat.append(tzone_bat,tzone_06);
- bat.append(tzone_bat,tzone_07);
- bat.append(tzone_bat,tzone_08);
- bat.append(tzone_bat,tzone_09);
- bat.append(tzone_bat,tzone_10);
- bat.append(tzone_bat,tzone_11);
- bat.append(tzone_bat,tzone_12);
- bat.append(tzone_bat,tzone_13);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
- bat.append(tzone_bat,tzone_15);
-#
-## test the operations on tzones
- bat.setName(tzone_bat,"timezone");
-#io.print(tzone_bat);
-#io.print("start error");
- #x:= getRefCount(tzone_bat);
-#io.print(x);
- #jd_a := io.print(tzone_bat);
-#io.print("end");
-#io.print(x);
- #x:= getRefCount(tzone_bat);
-io.print("tzone_bat");
- io.print(tzone_bat);
-#io.print(tzone_bat.bat.setColumn("tzone"));
- kd_a:bat[:int] := mal.multiplex("mtime","minutes",tzone_bat);
- bat.setColumn(kd_a,"minutes");
-#io.print([minutes](tzone_bat).bat.setColumn("minutes"),
- md_a:bat[:zrule] := mal.multiplex("mtime","start_dst",tzone_bat);
- bat.setColumn(md_a,"start_dst");
-# [start_dst](tzone_bat).bat.setColumn("start_dst"),
- od_a:bat[:zrule] := mal.multiplex("mtime","end_dst",tzone_bat);
- bat.setColumn(od_a,"end_dst");
-io.print("print(kd_a,md_a,od_a)");
- qd_a := io.print(kd_a,md_a,od_a);
-# [end_dst](tzone_bat).bat.setColumn("end_dst"));
-#
-#
-#
##line 614 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx"
## test the various ways to create dates
date_00:= mtime.date(2000,01,01);
@@ -546,116 +329,3 @@ io.print("daytime_bat,bh_a,dh_a,fh_a,hh_
#
#
#
-##line 719 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx"
-## create timestamps in bulk from the above bats with dates, daytimes and
tzones
-# Skipped due to coercion implication
- kh_a:bat[:timestamp] :=
mal.multiplex("mtime","timestamp",date_bat,daytime_bat,tzone_bat);
- timestamp_bat:=kh_a; bat.setAccess(kh_a,"w");
-#var timestamp_bat :=
[timestamp](date_bat,daytime_bat,tzone_bat).access(BAT_WRITE);
-## KILL
-## var timestamp_now := timestamp(epoch());
-#
-## test the timestamp operations
- bat.setColumn(timestamp_bat,"timestamp");
-#io.print(timestamp_bat.bat.setColumn("timestamp"),
- mh_a:bat[:date] :=
mal.multiplex("mtime","date",timestamp_bat,tzone_bat);
- bat.setColumn(mh_a,"date");
-# [date](timestamp_bat,tzone_bat).bat.setColumn("date"),
- oh_a:bat[:daytime] :=
mal.multiplex("mtime","daytime",timestamp_bat,tzone_bat);
- bat.setColumn(oh_a,"daytime");
- io.print("print(timestamp_bat,mh_a,oh_a)");
- io.print(timestamp_bat,mh_a,oh_a);
-# [daytime](timestamp_bat,tzone_bat).bat.setColumn("daytime"));
-#
- rh_a := bat.setColumn(timestamp_bat,"timestamp");
-#io.print(timestamp_bat.bat.setColumn("timestamp"),
- tzname:bat[:str]:= bbp.bind("timezone_name");
- tzdef:bat[:timezone]:= bbp.bind("timezone_def");
- tzn:= tzname;
- io.print("print(timezones)");
- io.print(tzname,tzdef);
- o:= algebra.find(tzn,"Wake Island");
- sh_a:timezone := algebra.fetch(tzdef,o);
- th_a:bat[:date] := mal.multiplex("mtime","date",timestamp_bat,sh_a);
- bat.setColumn(th_a,"Wake Island");
-# [date](timestamp_bat,algebra.find(timezones,"Wake
Island")).bat.setColumn("Wake Island"),
- o := algebra.find(tzn,"Wake Island");
- vh_a:timezone := algebra.fetch(tzdef,o);
- wh_a:bat[:daytime] :=
mal.multiplex("mtime","daytime",timestamp_bat,vh_a);
-# [daytime](timestamp_bat,algebra.find(timezones,"Wake Island")),
- o := algebra.find(tzn,"American Samoa");
- xh_a:timezone := algebra.fetch(tzdef,o);
- yh_a:bat[:date] := mal.multiplex("mtime","date",timestamp_bat,xh_a);
- ai_a := bat.setColumn(yh_a,"American Samoa");
-# [date](timestamp_bat,algebra.find(timezones,"American
Samoa")).bat.setColumn("American Samoa"),
- o := algebra.find(tzn,"American Samoa");
- bi_a:timezone := algebra.fetch(tzdef,o);
- ci_a:bat[:daytime] :=
mal.multiplex("mtime","daytime",timestamp_bat,bi_a);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
