Changeset: ba56ca38f22f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba56ca38f22f Removed Files: monetdb5/mal/Tests/tst1501.mal monetdb5/mal/Tests/tst1501.stable.err monetdb5/mal/Tests/tst1501.stable.out monetdb5/mal/Tests/tst654.mal monetdb5/mal/Tests/tst654.stable.err monetdb5/mal/Tests/tst654.stable.out monetdb5/mal/Tests/tst655.mal monetdb5/mal/Tests/tst655.stable.err monetdb5/mal/Tests/tst655.stable.out Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst233.mal monetdb5/mal/Tests/tst234.mal monetdb5/mal/Tests/tst235.mal Branch: default Log Message:
Remove old stuff diffs (truncated from 579 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 @@ -93,7 +93,6 @@ tst120b tst130 tst150 tst1500 -tst1501 tst1502 tst1503 tst1504 diff --git a/monetdb5/mal/Tests/tst1501.mal b/monetdb5/mal/Tests/tst1501.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/tst1501.mal +++ /dev/null @@ -1,44 +0,0 @@ - x := bat.new(:oid,:bte); - de_a := bat.append(x,1:bte); - ee_a := bat.append(x,1:bte); - fe_a := bat.append(x,2:bte); - ge_a := bat.append(x,2:bte); - he_a := bat.append(x,2:bte); - ie_a := bat.append(x,2:bte); - je_a := bat.append(x,3:bte); - ke_a := bat.append(x,3:bte); - - y := bat.new(:oid,:dbl); - le_a := calc.dbl(1.0); - me_a := bat.append(y,le_a); - ne_a := calc.dbl(2.0); - oe_a := bat.append(y,ne_a); - pe_a := calc.dbl(2.0); - qe_a := bat.append(y,pe_a); - re_a := calc.dbl(2.0); - se_a := bat.append(y,re_a); - te_a := calc.dbl(2.0); - ue_a := bat.append(y,te_a); - ve_a := calc.dbl(3.0); - we_a := bat.append(y,ve_a); - xe_a := calc.dbl(1.0); - ye_a := bat.append(y,xe_a); - af_a := calc.dbl(1.0); - bf_a := bat.append(y,af_a); - - z := bat.new(:oid,:str); - cf_a := bat.append(z,"c"); - df_a := bat.append(z,"a"); - ef_a := bat.append(z,"b"); - ff_a := bat.append(z,"c"); - gf_a := bat.append(z,"a"); - hf_a := bat.append(z,"a"); - if_a := bat.append(z,"c"); - jf_a := bat.append(z,"a"); -o:= bat.mirror(x); -io.print(x,y); -io.table(o,y); -io.table(o,x,y); -io.print(x,y,z); -io.table(o,x,y,z); - diff --git a/monetdb5/mal/Tests/tst1501.stable.err b/monetdb5/mal/Tests/tst1501.stable.err deleted file mode 100644 --- a/monetdb5/mal/Tests/tst1501.stable.err +++ /dev/null @@ -1,1 +0,0 @@ -stderr of test 'tst1501` in directory 'monetdb5/mal` itself: diff --git a/monetdb5/mal/Tests/tst1501.stable.out b/monetdb5/mal/Tests/tst1501.stable.out deleted file mode 100644 --- a/monetdb5/mal/Tests/tst1501.stable.out +++ /dev/null @@ -1,167 +0,0 @@ -stdout of test 'tst1501` in directory 'monetdb5/mal` itself: - - -# 07:59:06 > -# 07:59:06 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst1501.mal </dev/null -# 07:59:06 > - -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information -# x := bat.new(:oid,:chr); -# de_a := bat.insert(x,1@0,'a'); -# ee_a := bat.insert(x,2@0,'a'); -# fe_a := bat.insert(x,3@0,'b'); -# ge_a := bat.insert(x,4@0,'b'); -# he_a := bat.insert(x,5@0,'b'); -# ie_a := bat.insert(x,6@0,'b'); -# je_a := bat.insert(x,7@0,'c'); -# ke_a := bat.insert(x,8@0,'c'); -# -# y := bat.new(:oid,:dbl); -# le_a := calc.dbl(1.0); -# me_a := bat.insert(y,1@0,le_a); -# ne_a := calc.dbl(2.0); -# oe_a := bat.insert(y,2@0,ne_a); -# pe_a := calc.dbl(2.0); -# qe_a := bat.insert(y,3@0,pe_a); -# re_a := calc.dbl(2.0); -# se_a := bat.insert(y,4@0,re_a); -# te_a := calc.dbl(2.0); -# ue_a := bat.insert(y,5@0,te_a); -# ve_a := calc.dbl(3.0); -# we_a := bat.insert(y,6@0,ve_a); -# xe_a := calc.dbl(1.0); -# ye_a := bat.insert(y,7@0,xe_a); -# af_a := calc.dbl(1.0); -# bf_a := bat.insert(y,8@0,af_a); -# -# z := bat.new(:oid,:str); -# cf_a := bat.insert(z,1@0,"c"); -# df_a := bat.insert(z,2@0,"a"); -# ef_a := bat.insert(z,3@0,"b"); -# ff_a := bat.insert(z,4@0,"c"); -# gf_a := bat.insert(z,5@0,"a"); -# hf_a := bat.insert(z,6@0,"a"); -# if_a := bat.insert(z,7@0,"c"); -# jf_a := bat.insert(z,8@0,"a"); -#o:= bat.mirror(x); -#io.print(x,y); -#io.table(o,y); -#io.table(o,x,y); -#io.print(x,y,z); -#io.table(o,x,y,z); -# -# -function user.main():void; - x := bat.new(:oid,:bte); - de_a := bat.append(x,1:bte); - ee_a := bat.append(x,1:bte); - fe_a := bat.append(x,2:bte); - ge_a := bat.append(x,2:bte); - he_a := bat.append(x,2:bte); - ie_a := bat.append(x,2:bte); - je_a := bat.append(x,3:bte); - ke_a := bat.append(x,3:bte); - y := bat.new(:oid,:dbl); - le_a := calc.dbl(1); - me_a := bat.append(y,le_a); - ne_a := calc.dbl(2); - oe_a := bat.append(y,ne_a); - pe_a := calc.dbl(2); - qe_a := bat.append(y,pe_a); - re_a := calc.dbl(2); - se_a := bat.append(y,re_a); - te_a := calc.dbl(2); - ue_a := bat.append(y,te_a); - ve_a := calc.dbl(3); - we_a := bat.append(y,ve_a); - xe_a := calc.dbl(1); - ye_a := bat.append(y,xe_a); - af_a := calc.dbl(1); - bf_a := bat.append(y,af_a); - z := bat.new(:oid,:str); - cf_a := bat.append(z,"c"); - df_a := bat.append(z,"a"); - ef_a := bat.append(z,"b"); - ff_a := bat.append(z,"c"); - gf_a := bat.append(z,"a"); - hf_a := bat.append(z,"a"); - if_a := bat.append(z,"c"); - jf_a := bat.append(z,"a"); - o := bat.mirror(x); - io.print(x,y); - io.table(o,y); - io.table(o,x,y); - io.print(x,y,z); - io.table(o,x,y,z); -end user.main; -#--------------------------# -# h t t # name -# void bte dbl # type -#--------------------------# -[ 0@0, 1, 1 ] -[ 1@0, 1, 2 ] -[ 2@0, 2, 2 ] -[ 3@0, 2, 2 ] -[ 4@0, 2, 2 ] -[ 5@0, 2, 3 ] -[ 6@0, 3, 1 ] -[ 7@0, 3, 1 ] -#--------------------------# -# t t # name -# void dbl # type -#--------------------------# -[ 0@0, 1 ] -[ 1@0, 2 ] -[ 2@0, 2 ] -[ 3@0, 2 ] -[ 4@0, 2 ] -[ 5@0, 3 ] -[ 6@0, 1 ] -[ 7@0, 1 ] -#--------------------------# -# t t t # name -# void bte dbl # type -#--------------------------# -[ 0@0, 1, 1 ] -[ 1@0, 1, 2 ] -[ 2@0, 2, 2 ] -[ 3@0, 2, 2 ] -[ 4@0, 2, 2 ] -[ 5@0, 2, 3 ] -[ 6@0, 3, 1 ] -[ 7@0, 3, 1 ] -#--------------------------# -# h t t t # name -# void bte dbl str # type -#--------------------------# -[ 0@0, 1, 1, "c" ] -[ 1@0, 1, 2, "a" ] -[ 2@0, 2, 2, "b" ] -[ 3@0, 2, 2, "c" ] -[ 4@0, 2, 2, "a" ] -[ 5@0, 2, 3, "a" ] -[ 6@0, 3, 1, "c" ] -[ 7@0, 3, 1, "a" ] -#--------------------------# -# t t t t # name -# void bte dbl str # type -#--------------------------# -[ 0@0, 1, 1, "c" ] -[ 1@0, 1, 2, "a" ] -[ 2@0, 2, 2, "b" ] -[ 3@0, 2, 2, "c" ] -[ 4@0, 2, 2, "a" ] -[ 5@0, 2, 3, "a" ] -[ 6@0, 3, 1, "c" ] -[ 7@0, 3, 1, "a" ] - -# 07:59:06 > -# 07:59:06 > Done. -# 07:59:06 > - diff --git a/monetdb5/mal/Tests/tst233.mal b/monetdb5/mal/Tests/tst233.mal --- a/monetdb5/mal/Tests/tst233.mal +++ b/monetdb5/mal/Tests/tst233.mal @@ -5,7 +5,7 @@ function dir():void; dl:=bbp.getLRefCount(); dn:= bbp.getNames(); ds:= algebra.subsort(dn,false,false); - io.table(ds,d,dl); + io.print(ds,d,dl); end dir; diff --git a/monetdb5/mal/Tests/tst234.mal b/monetdb5/mal/Tests/tst234.mal --- a/monetdb5/mal/Tests/tst234.mal +++ b/monetdb5/mal/Tests/tst234.mal @@ -5,7 +5,7 @@ function dir():void; dl:=bbp.getLRefCount(); dn:= bbp.getNames(); ds:= algebra.subsort(dn,false,false); - io.table(ds,d,dl); + io.print(ds,d,dl); end dir; diff --git a/monetdb5/mal/Tests/tst235.mal b/monetdb5/mal/Tests/tst235.mal --- a/monetdb5/mal/Tests/tst235.mal +++ b/monetdb5/mal/Tests/tst235.mal @@ -6,7 +6,7 @@ function dir():void; dl:=bbp.getLRefCount(); dn:= bbp.getNames(); ds:= algebra.subsort(dn,false,false); - io.table(ds,d,dl); + io.print(ds,d,dl); end dir; function createBAT(name:str):bat[:oid,:int]; diff --git a/monetdb5/mal/Tests/tst654.mal b/monetdb5/mal/Tests/tst654.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/tst654.mal +++ /dev/null @@ -1,48 +0,0 @@ -# An extensive test for the new tablet layout -tablet.display(2,"strong"); -tablet.display(2,"strong",true); -first:=1; -last:= 2; -tablet.display(first,last); - -tablet.setFormat(first,last); -tablet.setProperties("name,type"); -tablet.setName(0,"Eerste"); -#tablet.setRowBracket("|","|"); - -b1:= bat.new(:oid,:int); -bat.append(b1,42); -bat.append(b1,49); -b2:= bat.new(:oid,:str); -bat.append(b2,"hello world"); -bat.append(b2,"goodbye world"); -bat.setName(b1,"BAT_b1"); -bat.setName(b2,"BAT_b2"); - _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
