Changeset: a05d7139d1af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a05d7139d1af
Removed Files:
monetdb5/mal/Tests/tst277.mal
monetdb5/mal/Tests/tst277.stable.err
monetdb5/mal/Tests/tst277.stable.out
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.err
monetdb5/optimizer/Tests/tst4300.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst047.mal
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst230.mal
monetdb5/modules/kernel/bat5.mal
monetdb5/optimizer/Tests/All
Branch: default
Log Message:
Remove too old tests
diffs (247 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -137,7 +137,6 @@ tst272
#tst274
# opens /tmp/MonetEvents, i.e. not on Windows:
NOT_WIN32?tst275
-tst277
tst280
tst281
tst292
diff --git a/monetdb5/mal/Tests/tst047.mal b/monetdb5/mal/Tests/tst047.mal
--- a/monetdb5/mal/Tests/tst047.mal
+++ b/monetdb5/mal/Tests/tst047.mal
@@ -6,8 +6,6 @@ bat.append(b,1);
bat.append(b,4);
bat.append(b,9);
io.print(b);
-br:= bat.reverse(b);
-io.print(br);
l0:= algebra.copy(b);
io.print(l0);
diff --git a/monetdb5/mal/Tests/tst047.stable.out
b/monetdb5/mal/Tests/tst047.stable.out
--- a/monetdb5/mal/Tests/tst047.stable.out
+++ b/monetdb5/mal/Tests/tst047.stable.out
@@ -36,8 +36,6 @@ function user.main():void;
bat.append(b,4);
bat.append(b,9);
io.print(b);
- br := bat.reverse(b);
- io.print(br);
l0 := algebra.copy(b);
io.print(l0);
end user.main;
@@ -48,17 +46,10 @@ end user.main;
[ 0@0, 1 ]
[ 1@0, 4 ]
[ 2@0, 9 ]
-#-----------------#
-# t tmp_4 # name
-# int int # type
-#-----------------#
-[ 1, 0@0 ]
-[ 4, 1@0 ]
-[ 9, 2@0 ]
-#-----------------#
-# h tmp_5 # name
-# int int # type
-#-----------------#
+#--------------------------#
+# h t # name
+# void int # type
+#--------------------------#
[ 0@0, 1 ]
[ 1@0, 4 ]
[ 2@0, 9 ]
diff --git a/monetdb5/mal/Tests/tst230.mal b/monetdb5/mal/Tests/tst230.mal
--- a/monetdb5/mal/Tests/tst230.mal
+++ b/monetdb5/mal/Tests/tst230.mal
@@ -11,11 +11,3 @@
io.printf("second refcount =%d\n",i);
j:= bbp.getLRefCount(b);
io.printf("lrefcount =%d\n",j);
-
- # referenceing through mirroring
- b5:= bat.reverse(b);
- i:= bbp.getRefCount(b);
- io.printf("after reverse assignment refcount =%d\n",i);
- j:= bbp.getLRefCount(b);
- io.printf("lrefcount =%d\n",j);
-
diff --git a/monetdb5/mal/Tests/tst277.mal b/monetdb5/mal/Tests/tst277.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst277.mal
+++ /dev/null
@@ -1,2 +0,0 @@
-b:= bat.new(:oid,:int);
-r:= bat.reverse(b);
diff --git a/monetdb5/mal/Tests/tst277.stable.err
b/monetdb5/mal/Tests/tst277.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst277.stable.err
+++ /dev/null
@@ -1,1 +0,0 @@
-stderr of test 'tst277` in directory 'monetdb5/mal` itself:
diff --git a/monetdb5/mal/Tests/tst277.stable.out
b/monetdb5/mal/Tests/tst277.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst277.stable.out
+++ /dev/null
@@ -1,26 +0,0 @@
-stdout of test 'tst277` in directory 'monetdb5/mal` itself:
-
-
-# 08:01:11 >
-# 08:01:11 > 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
tst277.mal </dev/null
-# 08:01:11 >
-
-# 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.
-#b:= new(:void,:int);
-#r:= reverse(b);
-#
-function user.main():void;
- b := bat.new(:oid,:int);
- r := bat.reverse(b);
-end user.main;
-
-# 08:01:11 >
-# 08:01:11 > Done.
-# 08:01:11 >
-
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -8,12 +8,12 @@ module bat;
#TO BE MADE HEADLESS PLAN
-command reverse(b:bat[:any_1,:any_2]) :bat[:any_2,:any_1]
-address BKCreverse
-comment "Returns the reverse view of a BAT (head is tail and tail is head).
- BEWARE no copying is involved; input and output refer to the
- same object!";
-
+#command reverse(b:bat[:any_1,:any_2]) :bat[:any_2,:any_1]
+#address BKCreverse
+#comment "Returns the reverse view of a BAT (head is tail and tail is head).
+# BEWARE no copying is involved; input and output refer to the
+# same object!";
+#
command mirror(b:bat[:any_1,:any_2]) :bat[:any_1,:any_1]
address BKCmirror
comment "Returns the head-mirror image of a BAT (two head columns).";
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -6,7 +6,6 @@ tst4004
tst4005
tst4010
tst4030
-tst4300
tst4600
tst4601
tst4602
diff --git a/monetdb5/optimizer/Tests/tst4300.mal
b/monetdb5/optimizer/Tests/tst4300.mal
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4300.mal
+++ /dev/null
@@ -1,25 +0,0 @@
-#some join operations
-
-#mdb.start();
-b:= bat.new(:oid,:lng);
-barrier v:= 0:lng;
- bat.append(b,v);
- redo v:= iterator.next(1:lng,100:lng);
-exit v;
-
-i:= aggr.count(b);
-io.print(i);
-
-c:= algebra.select(b,0:lng,9:lng);
-i:= aggr.count(c);
-io.print(i);
-d:= algebra.select(b,0:lng,49:lng);
-i:= aggr.count(d);
-io.print(i);
-
-bo := batcalc.oid(b);
-co := batcalc.oid(c);
-cor:= bat.reverse(co);
-zz:= algebra.leftjoinPath(bo,cor,d);
-i:= aggr.count(zz);
-io.print(i);
diff --git a/monetdb5/optimizer/Tests/tst4300.stable.err
b/monetdb5/optimizer/Tests/tst4300.stable.err
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4300.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst4300` in directory 'monetdb5/optimizer` itself:
-
-
-# 11:08:31 >
-# 11:08:31 > 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=44745 --set sql_port=56225 --set monet_prompt= --trace
--dbname=mTests_src_optimizer tst4300.mal </dev/null
-# 11:08:31 >
-
-
-# 11:08:31 >
-# 11:08:31 > Done.
-# 11:08:31 >
-
diff --git a/monetdb5/optimizer/Tests/tst4300.stable.out
b/monetdb5/optimizer/Tests/tst4300.stable.out
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4300.stable.out
+++ /dev/null
@@ -1,46 +0,0 @@
-stdout of test 'tst4300` in directory 'monetdb5/optimizer` itself:
-
-
-# 23:52:52 >
-# 23:52:52 > 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=39352 --set sql_port=45171 --set xquery_port=52900 --set
monet_prompt= --trace --dbname=mTests_src_optimizer tst4300.mal </dev/null
-# 23:52:52 >
-
-# MonetDB server v5.9.0, based on kernel v1.27.0
-# Serving database 'mTests_src_optimizer', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
-#some join operations
-#mdb.start();
- b := bat.new(:oid,:lng);
-barrier v := 0:lng;
- bat.append(b,v);
- redo v := iterator.next(1:lng,100:lng);
-exit v;
- i := aggr.count(b);
- io.print(i);
- c := algebra.select(b,0:lng,9:lng);
- i := aggr.count(c);
- io.print(i);
- d := algebra.select(b,0:lng,49:lng);
- i := aggr.count(d);
- io.print(i);
- bo := batcalc.oid(b);
- co := batcalc.oid(c);
- cor := bat.reverse(co);
- zz := algebra.leftjoinPath(bo,cor,d);
- i := aggr.count(zz);
- io.print(i);
-end user.main;
-[ 100 ]
-[ 10 ]
-[ 50 ]
-[ 10 ]
-
-# 23:52:52 >
-# 23:52:52 > Done.
-# 23:52:52 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
