Changeset: 2ff48d74f62e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ff48d74f62e Removed Files: monetdb5/mal/Tests/tst240.mal monetdb5/mal/Tests/tst240.stable.err monetdb5/mal/Tests/tst240.stable.out Modified Files: monetdb5/mal/Tests/All monetdb5/modules/mal/batExtensions.mal monetdb5/optimizer/Makefile.ag Branch: default Log Message:
Move non-used algebra operators to attic These functions were once used for experimentation. They can be removed according to the test set. diffs (129 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -119,7 +119,6 @@ tst232 tst233 tst234 tst235 -tst240 tst250 tst2500 tst2501 diff --git a/monetdb5/mal/Tests/tst240.mal b/monetdb5/mal/Tests/tst240.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/tst240.mal +++ /dev/null @@ -1,9 +0,0 @@ -# testing pack/unpack of bats -i:= 1; -j:= 2; -b:= bat.pack(i,j); -io.print(b); - -(g,h):= bat.unpack(b); -io.print(g); -io.print(h); diff --git a/monetdb5/mal/Tests/tst240.stable.err b/monetdb5/mal/Tests/tst240.stable.err deleted file mode 100644 --- a/monetdb5/mal/Tests/tst240.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'tst240` in directory 'mal` itself: - - -# 18:22:21 > -# 18:22:21 > 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=39583 --set sql_port=47272 --set xquery_port=57837 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst240.mal </dev/null -# 18:22:21 > - - -# 18:22:21 > -# 18:22:21 > Done. -# 18:22:21 > - diff --git a/monetdb5/mal/Tests/tst240.stable.out b/monetdb5/mal/Tests/tst240.stable.out deleted file mode 100644 --- a/monetdb5/mal/Tests/tst240.stable.out +++ /dev/null @@ -1,46 +0,0 @@ -stdout of test 'tst240` in directory 'mal` itself: - - -# 18:22:21 > -# 18:22:21 > 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=39583 --set sql_port=47272 --set xquery_port=57837 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst240.mal </dev/null -# 18:22:21 > - -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2005, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# config:/ufs/mk/monet5/src/mal/Tests/All.conf -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## testing pack/unpack of bats -#i:= 1; -#j:= 2; -#b:= bbp.pack(i,j); -#io.print(b); -# -#(g,h):= bbp.unpack(b); -#io.print(g); -#io.print(h); -# -function user.main():void; -# testing pack/unpack of bats - i := 1; - j := 2; - b := bat.pack(i,j); - io.print(b); - (g,h) := bat.unpack(b); - io.print(g); - io.print(h); -end main; -#-----------------# -# h t # name -# int int # type -#-----------------# -[ 1, 2 ] -[ 1 ] -[ 2 ] - -# 18:22:21 > -# 18:22:21 > Done. -# 18:22:21 > - diff --git a/monetdb5/modules/mal/batExtensions.mal b/monetdb5/modules/mal/batExtensions.mal --- a/monetdb5/modules/mal/batExtensions.mal +++ b/monetdb5/modules/mal/batExtensions.mal @@ -60,21 +60,4 @@ pattern bat.partition(b:bat[:any_1,:any_ address CMDbatpartition2 comment "Create a series of cheap slices over the first argument. The BUNs are distributed evenly."; -pattern bat.unpack(b:bat[:any_1,:any_2])(h:any_1,t:any_2) -address CMDbatunpack -comment "Extract the first tuple from a BAT."; -pattern bat.pack(h:any_1,t:any_2):bat[:any_1,:any_2] -address CMDbatpack -comment "Pack a pair of values into a BAT."; -pattern bat.pack(v:any_1):bat[:oid,:any_1] -address CMDbatsingleton -comment "Create a BAT and store the value"; -module algebra; -pattern algebra.project( b:bat[:any_1,:any_3], val:any_2) :bat[:any_1,:any_2] -address ALGprojectCst -comment "Fill the tail column with a newly typed constant."; -pattern algebra.project(b:bat[:any_1,:any_3], val:bat[:any_1,:any_2]) :bat[:any_1,:any_2] -address ALGprojectCst -comment "Fill the tail column with a constant taken from the aligned BAT."; - diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag --- a/monetdb5/optimizer/Makefile.ag +++ b/monetdb5/optimizer/Makefile.ag @@ -65,7 +65,6 @@ lib_optimizer = { opt_remap.c opt_remap.h \ opt_remoteQueries.c opt_remoteQueries.h \ opt_reorder.c opt_reorder.h \ - opt_singleton.c opt_singleton.h \ opt_statistics.c opt_statistics.h \ opt_strengthReduction.c opt_strengthReduction.h \ opt_support.c opt_support.h \ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
