Changeset: 43d041961376 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43d041961376
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/bpm00.mal
monetdb5/modules/mal/Tests/bpm00.stable.err
monetdb5/modules/mal/Tests/bpm00.stable.out
monetdb5/modules/mal/Tests/bpm01.mal
monetdb5/modules/mal/Tests/bpm01.stable.err
monetdb5/modules/mal/Tests/bpm01.stable.out
monetdb5/modules/mal/Tests/bpm02.mal
monetdb5/modules/mal/Tests/bpm02.stable.err
monetdb5/modules/mal/Tests/bpm02.stable.out
monetdb5/modules/mal/Tests/bpm05.mal
monetdb5/modules/mal/Tests/bpm05.stable.err
monetdb5/modules/mal/Tests/bpm05.stable.out
monetdb5/modules/mal/Tests/bpm06.mal
monetdb5/modules/mal/Tests/bpm06.stable.err
monetdb5/modules/mal/Tests/bpm06.stable.out
monetdb5/modules/mal/Tests/bpm06after.mal
monetdb5/modules/mal/Tests/bpm06after.stable.err
monetdb5/modules/mal/Tests/bpm06after.stable.out
monetdb5/modules/mal/Tests/bpm08.mal
monetdb5/modules/mal/Tests/bpm09.mal
monetdb5/modules/mal/Tests/bpm10.mal
monetdb5/modules/mal/Tests/bpm12.mal
monetdb5/modules/mal/Tests/bpmUpdate.mal
monetdb5/modules/mal/bpm.mx
monetdb5/modules/mal/mal_init.mx
monetdb5/optimizer/opt_dataflow.mx
monetdb5/optimizer/opt_mergetable.mx
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/sensor.c
Branch: Aug2011
Log Message:
Remove obsolete bpm code
and add some comments to the datacell.
diffs (truncated from 5044 to 300 lines):
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -33,7 +33,6 @@
batExtensions.mx \
bbp.mx \
box.mx \
- bpm.mx \
chopper.mx \
clients.mx \
cluster.mx \
@@ -77,7 +76,7 @@
factories.mx groupby.mx mdb.mx pcre.mx tablet.mx mat.mx \
urlbox.mx statistics.mx transaction.mx \
mal_mapi.mx sabaoth.mx remote.mx \
- bpm.mx txtsim.mx recycle.mx \
+ txtsim.mx recycle.mx \
cluster.mx trader.mx pma.mx \
tokenizer.mx zorder.mx
}
diff --git a/monetdb5/modules/mal/Tests/bpm00.mal
b/monetdb5/modules/mal/Tests/bpm00.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm00.mal
+++ /dev/null
@@ -1,31 +0,0 @@
-#testing the BAT partition manager
-R := bat.new(:oid,:int);
-bat.append(R,1);
-bat.append(R,3);
-bat.append(R,5);
-bat.append(R,7);
-bat.append(R,11);
-
-function user.pr(Ra:bat[:any_1,:any_2]):void;
-barrier Rp:= bpm.newIterator(Ra);
- io.print(Rp);
- redo Rp:= bpm.hasMoreElements(Ra);
-exit Rp;
-end pr;
-
-# add the stuff to the BPM and dump it
-Ra:= bpm.deposit("myR",R);
-user.pr(Ra);
-
-io.print("Partition it into two ranges");
-bpm.partition(Ra,6);
-#bpm.dump(Ra);
-user.pr(Ra);
-
-Rrev:= bat.reverse(Ra);
-io.print("Repartition it further into oid ranges");
-bpm.partition(Rrev,1@0);
-# we should have 4 partitions
-#bpm.dump(Ra);
-user.pr(Ra);
-bpm.discard(Ra);
diff --git a/monetdb5/modules/mal/Tests/bpm00.stable.err
b/monetdb5/modules/mal/Tests/bpm00.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm00.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'bpm00` in directory 'modules/mal` itself:
-
-
-# 08:03:50 >
-# 08:03:50 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=39490 --set xrpc_port=49449 --set monet_prompt= --trace
--dbname=mTests_src_modules_mal bpm00.mal
-# 08:03:50 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 08:03:50 >
-# 08:03:50 > Done.
-# 08:03:50 >
-
diff --git a/monetdb5/modules/mal/Tests/bpm00.stable.out
b/monetdb5/modules/mal/Tests/bpm00.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm00.stable.out
+++ /dev/null
@@ -1,123 +0,0 @@
-stdout of test 'bpm00` in directory 'modules/mal` itself:
-
-
-# 08:03:50 >
-# 08:03:50 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=39490 --set xrpc_port=49449 --set monet_prompt= --trace
--dbname=mTests_src_modules_mal bpm00.mal
-# 08:03:50 >
-
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_modules_mal
-# Visit http://monetdb.cwi.nl/ for further information
-##testing the BAT partition manager
-#R := bat.new(:oid,:int);
-#bat.append(R,1);
-#bat.append(R,3);
-#bat.append(R,5);
-#bat.append(R,7);
-#bat.append(R,11);
-#
-#function user.pr(Ra:bat[:any_1,:any_2]):void;
-#barrier Rp:= bpm.newIterator(Ra);
-# io.print(Rp);
-# redo Rp:= bpm.hasMoreElements(Ra);
-#exit Rp;
-#end pr;
-function user.pr(Ra:bat[:any_1,:any_2]):void; # 0
(pr:void)<-(Ra:bat[:any_1,:any_2])
-barrier Rp := bpm.newIterator(Ra); # 1 BPMnewIterator
(Rp:bat[:any,:any])<-(Ra:bat[:any_1,:any_2]) jump 4
- io.print(Rp); # 2 IOprint_val (_3:void)<-(Rp:bat[:any,:any])
- redo Rp := bpm.hasMoreElements(Ra); # 3 BPMhasMoreElements
(Rp:bat[:any,:any])<-(Ra:bat[:any_1,:any_2]) jump 2
-exit Rp; # 4 (Rp:bat[:any,:any])
-end pr; # 5
-#
-## add the stuff to the BPM and dump it
-#Ra:= bpm.deposit("myR",R);
-#user.pr(Ra);
-#
-#io.print("Partition it into two ranges");
-#bpm.partition(Ra,6);
-#bpm.dump(Ra);
-#user.pr(Ra);
-#
-#Rrev:= bat.reverse(Ra);
-#io.print("Repartition it further into oid ranges");
-#bpm.partition(Rrev,1@0);
-## we should have 4 partitions
-#bpm.dump(Ra);
-#user.pr(Ra);
-#bpm.discard(Ra);
-#
-function user.main():void; # 0 (main:void)
-#testing the BAT partition manager # 1 (_1:str)
- R := bat.new(:oid,:int); # 2 CMDBATnew
(R:bat[:oid,:int])<-(_3:oid)(_4:int)
- bat.append(R,1); # 3 BKCappend_val_wrap
(_5:void)<-(R:bat[:oid,:int])(_6:int)
- bat.append(R,3); # 4 BKCappend_val_wrap
(_7:void)<-(R:bat[:oid,:int])(_8:int)
- bat.append(R,5); # 5 BKCappend_val_wrap
(_9:void)<-(R:bat[:oid,:int])(_10:int)
- bat.append(R,7); # 6 BKCappend_val_wrap
(_11:void)<-(R:bat[:oid,:int])(_12:int)
- bat.append(R,11); # 7 BKCappend_val_wrap
(_13:void)<-(R:bat[:oid,:int])(_14:int)
-# add the stuff to the BPM and dump it # 8 (_15:str)
- Ra := bpm.deposit("myR",R); # 9 BPMdeposit
(Ra:bat[:oid,:int])<-(_17:str)(R:bat[:oid,:int])
- user.pr(Ra); # 10 (_18:void)<-(Ra:bat[:oid,:int])
- io.print("Partition it into two ranges"); # 11 IOprint_val
(_19:void)<-(_20:str)
- bpm.partition(Ra,6); # 12 BPMsplitpartition
(_21:void)<-(Ra:bat[:oid,:int])(_22:int)
-#bpm.dump(Ra); # 13 (_23:str)
- user.pr(Ra); # 14 (_24:void)<-(Ra:bat[:oid,:int])
- Rrev := bat.reverse(Ra); # 15 BKCreverse
(Rrev:bat[:int,:oid])<-(Ra:bat[:oid,:int])
- io.print("Repartition it further into oid ranges"); # 16
IOprint_val (_26:void)<-(_27:str)
- bpm.partition(Rrev,1@0); # 17 BPMsplitpartition
(_28:void)<-(Rrev:bat[:int,:oid])(_29:oid)
-# we should have 4 partitions # 18 (_30:str)
-#bpm.dump(Ra); # 19 (_23:str)
- user.pr(Ra); # 20 (_31:void)<-(Ra:bat[:oid,:int])
- bpm.discard(Ra); # 21 BPMdiscard (_32:void)<-(Ra:bat[:oid,:int])
-end main; # 22
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 3 ]
-[ 2@0, 5 ]
-[ 3@0, 7 ]
-[ 4@0, 11 ]
-[ "Partition it into two ranges" ]
-#-----------------#
-# h t # name
-# oid int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 3 ]
-[ 2@0, 5 ]
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 3@0, 7 ]
-[ 4@0, 11 ]
-[ "Repartition it further into oid ranges" ]
-#-----------------#
-# h t # name
-# oid int # type
-#-----------------#
-[ 0@0, 1 ]
-#-----------------#
-# h t # name
-# oid int # type
-#-----------------#
-[ 1@0, 3 ]
-[ 2@0, 5 ]
-#-----------------#
-# h t # name
-# oid int # type
-#-----------------#
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 3@0, 7 ]
-[ 4@0, 11 ]
-
-# 08:03:50 >
-# 08:03:50 > Done.
-# 08:03:50 >
-
diff --git a/monetdb5/modules/mal/Tests/bpm01.mal
b/monetdb5/modules/mal/Tests/bpm01.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm01.mal
+++ /dev/null
@@ -1,41 +0,0 @@
-#testing the Milena BAT partition manager
-R := bat.new(:oid,:int);
-bat.append(R,1);
-bat.append(R,3);
-bat.append(R,5);
-bat.append(R,7);
-bat.append(R,11);
-
-function user.pr(Ra:bat[:any_1,:any_2]):void;
-barrier Rp:= bpm.newIterator(Ra);
- io.print(Rp);
- redo Rp:= bpm.hasMoreElements(Ra);
-exit Rp;
-end pr;
-
-# add the stuff to the BPM and dump it
-Ra:= bpm.deposit("myR",R);
-user.pr(Ra);
-
-io.print("Range partition it ");
-pv:= bat.new(:oid,:int);
-bat.append(pv,0);
-bat.append(pv,5);
-bat.append(pv,nil:int);
-
-bpm.rangePartition(Ra,pv);
-#bpm.dump();
-user.pr(Ra);
-
-#repartition
-pv:= bat.new(:oid,:int);
-bat.append(pv,0);
-bat.append(pv,5);
-bat.append(pv,6);
-bat.append(pv,nil:int);
-
-bpm.rangePartition(Ra,pv);
-#bpm.dump();
-user.pr(Ra);
-
-bpm.discard(Ra);
diff --git a/monetdb5/modules/mal/Tests/bpm01.stable.err
b/monetdb5/modules/mal/Tests/bpm01.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm01.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'bpm01` in directory 'modules/mal` itself:
-
-
-# 08:03:50 >
-# 08:03:50 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=39490 --set xrpc_port=49449 --set monet_prompt= --trace
--dbname=mTests_src_modules_mal bpm01.mal
-# 08:03:50 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 08:03:50 >
-# 08:03:50 > Done.
-# 08:03:50 >
-
diff --git a/monetdb5/modules/mal/Tests/bpm01.stable.out
b/monetdb5/modules/mal/Tests/bpm01.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/bpm01.stable.out
+++ /dev/null
@@ -1,143 +0,0 @@
-stdout of test 'bpm01` in directory 'modules/mal` itself:
-
-
-# 08:03:50 >
-# 08:03:50 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=39490 --set xrpc_port=49449 --set monet_prompt= --trace
--dbname=mTests_src_modules_mal bpm01.mal
-# 08:03:50 >
-
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_modules_mal
-# Visit http://monetdb.cwi.nl/ for further information
-##testing the Milena BAT partition manager
-#R := bat.new(:oid,:int);
-#bat.append(R,1);
-#bat.append(R,3);
-#bat.append(R,5);
-#bat.append(R,7);
-#bat.append(R,11);
-#
-#function user.pr(Ra:bat[:any_1,:any_2]):void;
-#barrier Rp:= bpm.newIterator(Ra);
-# io.print(Rp);
-# redo Rp:= bpm.hasMoreElements(Ra);
-#exit Rp;
-#end pr;
-function user.pr(Ra:bat[:any_1,:any_2]):void; # 0
(pr:void)<-(Ra:bat[:any_1,:any_2])
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
