Changeset: d34eb86293b1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d34eb86293b1 Modified Files: monetdb5/modules/mal/Tests/LICENSE monetdb5/modules/mal/Tests/bpt01.mal monetdb5/modules/mal/Tests/bpt01.stable.err monetdb5/modules/mal/Tests/bpt01.stable.out monetdb5/modules/mal/Tests/bpt02.mal monetdb5/modules/mal/Tests/bpt02.stable.err monetdb5/modules/mal/Tests/bpt02.stable.out monetdb5/modules/mal/Tests/bpt10.mal monetdb5/modules/mal/Tests/bpt10.stable.err monetdb5/modules/mal/Tests/bpt10.stable.out Branch: default Log Message:
removed "bpt" tests that require partitions optimizer that has recently been removed diffs (truncated from 381 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/LICENSE b/monetdb5/modules/mal/Tests/LICENSE --- a/monetdb5/modules/mal/Tests/LICENSE +++ b/monetdb5/modules/mal/Tests/LICENSE @@ -45,15 +45,6 @@ bpm10.mal bpm12.mal bpmUpdate.mal -bpt01.mal -bpt01.stable.err -bpt01.stable.out -bpt02.mal -bpt02.stable.err -bpt02.stable.out -bpt10.mal -bpt10.stable.err -bpt10.stable.out call00.mal call00.stable.err call00.stable.out diff --git a/monetdb5/modules/mal/Tests/bpt01.mal b/monetdb5/modules/mal/Tests/bpt01.mal deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt01.mal +++ /dev/null @@ -1,25 +0,0 @@ -#testing the BAT partition table -a1:= bat.new(:oid,:int); -bat.insert(a1,0@0,0); -a2:= bat.new(:oid,:int); -bat.insert(a2,10@0,0); -a3:= bat.new(:oid,:int); -bat.insert(a3,20@0,0); - -barrier (go,i):= language.newRange(1); - bat.append(a1,i); - bat.append(a2,i); - bat.append(a3,i); - redo (go,i):= language.nextElement(1,10); -exit (go,i); - -# add it -partitions.deposit(a1); -partitions.deposit(a1,a2); -partitions.deposit(a1,a3); -partitions.dump(); - -# make some errors -partitions.deposit(a1,a1); - - diff --git a/monetdb5/modules/mal/Tests/bpt01.stable.err b/monetdb5/modules/mal/Tests/bpt01.stable.err deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt01.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'bpt01` in directory 'modules/mal` itself: - - -# 00:03:57 > -# 00:03:57 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=33330 --set sql_port=49911 --set xquery_port=56575 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpt01.mal </dev/null -# 00:03:57 > - - -# 00:03:57 > -# 00:03:57 > Done. -# 00:03:57 > - diff --git a/monetdb5/modules/mal/Tests/bpt01.stable.out b/monetdb5/modules/mal/Tests/bpt01.stable.out deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt01.stable.out +++ /dev/null @@ -1,72 +0,0 @@ -stdout of test 'bpt01` in directory 'modules/mal` itself: - - -# 00:03:57 > -# 00:03:57 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=33330 --set sql_port=49911 --set xquery_port=56575 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpt01.mal </dev/null -# 00:03:57 > - -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2005, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 32bit OIDs; dynamically linked. -# config:/ufs/mk/monet5/src/mal/Tests/All.conf -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_modules_mal -# Visit http://monetdb.cwi.nl/ for further information. -##testing the BAT partition table -#a1:= bbp.new(:void,:int); -#bat.setSequenceBase(a1,0@0); -#a2:= bbp.new(:void,:int); -#bat.setSequenceBase(a2,10@0); -#a3:= bbp.new(:void,:int); -#bat.setSequenceBase(a3,20@0); -# -#barrier (go,i):= mal.newRange(0); -# bat.insert(a1,nil,i); -# bat.insert(a2,nil,i); -# bat.insert(a3,nil,i); -# redo (go,i):= language.nextElement(1,10); -#exit (go,i); -# -## add it -#partitions.deposit(a1); -#partitions.deposit(a1,a2); -#partitions.deposit(a1,a3); -#partitions.dump(); -# -## make some errors -#partitions.deposit(a1,a1); -# -# -# -function user.main():void; # 0 (main:void) -#testing the BAT partition table # 1 (_1:str) - a1 := bat.new(:oid,:int); # 2 CMDBATnew (a1:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a1,0@0,0); # 3 BKCinsert_bun (_5:void)<-(a1:bat[:oid,:int])(_6:oid)(_7:int) - a2 := bat.new(:oid,:int); # 4 CMDBATnew (a2:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a2,10@0,0); # 5 BKCinsert_bun (_9:void)<-(a2:bat[:oid,:int])(_10:oid)(_7:int) - a3 := bat.new(:oid,:int); # 6 CMDBATnew (a3:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a3,20@0,0); # 7 BKCinsert_bun (_12:void)<-(a3:bat[:oid,:int])(_13:oid)(_7:int) -barrier (go,i):= language.newRange(1); # 8 RNGnewRange_int (go:bit)(i:int)<-(_16:int) jump 13 - bat.append(a1,i); # 9 BKCappend_val_wrap (_17:void)<-(a1:bat[:oid,:int])(i:int) - bat.append(a2,i); # 10 BKCappend_val_wrap (_18:void)<-(a2:bat[:oid,:int])(i:int) - bat.append(a3,i); # 11 BKCappend_val_wrap (_19:void)<-(a3:bat[:oid,:int])(i:int) - redo (go,i):= language.nextElement(1,10); # 12 RNGnextElement_int (go:bit)(i:int)<-(_16:int)(_20:int) jump 9 -exit (go,i); # 13 (go:bit)(i:int) -# add it # 14 (_21:str) - partitions.deposit(a1); # 15 BPTdeposit (_22:void)<-(a1:bat[:oid,:int]) - partitions.deposit(a1,a2); # 16 BPTdeposit2 (_23:void)<-(a1:bat[:oid,:int])(a2:bat[:oid,:int]) - partitions.deposit(a1,a3); # 17 BPTdeposit2 (_24:void)<-(a1:bat[:oid,:int])(a3:bat[:oid,:int]) - partitions.dump(); # 18 BPTdump (_25:void) -# make some errors # 19 (_26:str) - partitions.deposit(a1,a1); # 20 BPTdeposit2 (_27:void)<-(a1:bat[:oid,:int])(a1:bat[:oid,:int]) -end main; # 21 -ptop=3 plimit=1024 -[0] bid=7 pid=7 f=0, l=10 prv=-1 nxt=1 cap=-1 -[1] bid=7 pid=8 f=10, l=20 prv=0 nxt=2 cap=-1 -[2] bid=7 pid=9 f=20, l=30 prv=1 nxt=-1 cap=-1 -!MALException:partitions.deposit:Partition already known - -# 00:03:57 > -# 00:03:57 > Done. -# 00:03:57 > - diff --git a/monetdb5/modules/mal/Tests/bpt02.mal b/monetdb5/modules/mal/Tests/bpt02.mal deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt02.mal +++ /dev/null @@ -1,24 +0,0 @@ -#testing the BAT partition table -a1:= bat.new(:oid,:int); -bat.insert(a1,0@0,0); -a2:= bat.new(:oid,:int); -bat.insert(a2,10@0,0); -a3:= bat.new(:oid,:int); -bat.insert(a3,20@0,0); - -barrier (go,i):= language.newRange(1); - bat.append(a1,i); - bat.append(a2,i); - bat.append(a3,i); - redo (go,i):= language.nextElement(1,10); -exit (go,i); - -# add it -partitions.deposit(a1); -partitions.deposit(a1,a2); -partitions.dump(); - -# partition without group -partitions.deposit(a3,a1); -partitions.dump(); - diff --git a/monetdb5/modules/mal/Tests/bpt02.stable.err b/monetdb5/modules/mal/Tests/bpt02.stable.err deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt02.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'bpt02` in directory 'modules/mal` itself: - - -# 00:03:57 > -# 00:03:57 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=33330 --set sql_port=49911 --set xquery_port=56575 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpt02.mal </dev/null -# 00:03:57 > - - -# 00:03:57 > -# 00:03:57 > Done. -# 00:03:57 > - diff --git a/monetdb5/modules/mal/Tests/bpt02.stable.out b/monetdb5/modules/mal/Tests/bpt02.stable.out deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt02.stable.out +++ /dev/null @@ -1,70 +0,0 @@ -stdout of test 'bpt02` in directory 'modules/mal` itself: - - -# 00:03:57 > -# 00:03:57 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=33330 --set sql_port=49911 --set xquery_port=56575 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpt02.mal </dev/null -# 00:03:57 > - -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2005, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 32bit OIDs; dynamically linked. -# config:/ufs/mk/monet5/src/mal/Tests/All.conf -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_modules_mal -# Visit http://monetdb.cwi.nl/ for further information. -##testing the BAT partition table -#a1:= bbp.new(:void,:int); -#bat.setSequenceBase(a1,0@0); -#a2:= bbp.new(:void,:int); -#bat.setSequenceBase(a2,10@0); -#a3:= bbp.new(:void,:int); -#bat.setSequenceBase(a3,20@0); -# -#barrier (go,i):= mal.newRange(0); -# bat.insert(a1,nil,i); -# bat.insert(a2,nil,i); -# bat.insert(a3,nil,i); -# redo (go,i):= language.nextElement(1,10); -#exit (go,i); -# -## add it -#partitions.deposit(a1); -#partitions.deposit(a1,a2); -#partitions.dump(); -# -## partition without group -#partitions.deposit(a3,a1); -#partitions.dump(); -# -# -function user.main():void; # 0 (main:void) -#testing the BAT partition table # 1 (_1:str) - a1 := bat.new(:oid,:int); # 2 CMDBATnew (a1:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a1,0@0,0); # 3 BKCinsert_bun (_5:void)<-(a1:bat[:oid,:int])(_6:oid)(_7:int) - a2 := bat.new(:oid,:int); # 4 CMDBATnew (a2:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a2,10@0,0); # 5 BKCinsert_bun (_9:void)<-(a2:bat[:oid,:int])(_10:oid)(_7:int) - a3 := bat.new(:oid,:int); # 6 CMDBATnew (a3:bat[:oid,:int])<-(_3:oid)(_4:int) - bat.insert(a3,20@0,0); # 7 BKCinsert_bun (_12:void)<-(a3:bat[:oid,:int])(_13:oid)(_7:int) -barrier (go,i):= language.newRange(1); # 8 RNGnewRange_int (go:bit)(i:int)<-(_16:int) jump 13 - bat.append(a1,i); # 9 BKCappend_val_wrap (_17:void)<-(a1:bat[:oid,:int])(i:int) - bat.append(a2,i); # 10 BKCappend_val_wrap (_18:void)<-(a2:bat[:oid,:int])(i:int) - bat.append(a3,i); # 11 BKCappend_val_wrap (_19:void)<-(a3:bat[:oid,:int])(i:int) - redo (go,i):= language.nextElement(1,10); # 12 RNGnextElement_int (go:bit)(i:int)<-(_16:int)(_20:int) jump 9 -exit (go,i); # 13 (go:bit)(i:int) -# add it # 14 (_21:str) - partitions.deposit(a1); # 15 BPTdeposit (_22:void)<-(a1:bat[:oid,:int]) - partitions.deposit(a1,a2); # 16 BPTdeposit2 (_23:void)<-(a1:bat[:oid,:int])(a2:bat[:oid,:int]) - partitions.dump(); # 17 BPTdump (_24:void) -# partition without group # 18 (_25:str) - partitions.deposit(a3,a1); # 19 BPTdeposit2 (_26:void)<-(a3:bat[:oid,:int])(a1:bat[:oid,:int]) - partitions.dump(); # 20 BPTdump (_27:void) -end main; # 21 -ptop=2 plimit=1024 -[0] bid=7 pid=7 f=0, l=10 prv=-1 nxt=1 cap=-1 -[1] bid=7 pid=8 f=10, l=20 prv=0 nxt=-1 cap=-1 -!MALException:partitions.deposit:BAT group unknown - -# 00:03:57 > -# 00:03:57 > Done. -# 00:03:57 > - diff --git a/monetdb5/modules/mal/Tests/bpt10.mal b/monetdb5/modules/mal/Tests/bpt10.mal deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt10.mal +++ /dev/null @@ -1,22 +0,0 @@ -#testing the BAT partition table -# nothing is saved because the bats are not persistent -a1:= bat.new(:oid,:int); -bat.insert(a1,0@0,0); -a2:= bat.new(:oid,:int); -bat.insert(a2,10@0,10); -a3:= bat.new(:oid,:int); -bat.insert(a3,20@0,20); - -barrier (go,i):= language.newRange(1); - bat.append(a1,i); - bat.append(a2,i); - bat.append(a3,i); - redo (go,i):= language.nextElement(1,10); -exit (go,i); - -# now really add it -partitions.deposit(a1); -partitions.deposit(a1,a2); -partitions.deposit(a1,a3); -partitions.dump(); -partitions.close(); diff --git a/monetdb5/modules/mal/Tests/bpt10.stable.err b/monetdb5/modules/mal/Tests/bpt10.stable.err deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/bpt10.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'bpt10` in directory 'modules/mal` itself: - - -# 00:03:58 > _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
