Changeset: b1d36634276a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1d36634276a
Removed Files:
monetdb5/mal/Tests/prejoin.mal
monetdb5/mal/Tests/tst017.stable.err
monetdb5/mal/Tests/tst017.stable.out
monetdb5/mal/Tests/tst271.mal
Modified Files:
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst1504.stable.out
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst230.stable.out
Branch: default
Log Message:
Remove some junk
diffs (truncated from 759 to 300 lines):
diff --git a/monetdb5/mal/Tests/prejoin.mal b/monetdb5/mal/Tests/prejoin.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/prejoin.mal
+++ /dev/null
@@ -1,60 +0,0 @@
-# the prejoin experiment
-
-t0:= alarm.usec();
-base:= bat.new(:oid,:int);
-barrier (go,i):= language.newRange(0:int);
- k:= mmath.rand();
- bat.append(base,k);
-# redo (go,i):= language.nextElement(1:int,10:int);
-# redo (go,i):= language.nextElement(1:int,1000:int);
- redo (go,i):= language.nextElement(1:int,10000000:int);
-exit (go,i);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#loop %d\n",d0);
-t0:= alarm.usec();
-# create a sample with minimal overlap
-sample := 100000;
-c:= algebra.sample(base,sample);
-#c:= algebra.copy(b);
-
-#get fresh copies for 2nd experiment
-b:= algebra.copy(base);
-d:= algebra.copy(b);
-e:= algebra.copy(c);
-t1:= alarm.usec();
-#io.print(b);
-#io.print(c);
-d0:= t1-t0;
-io.printf("#copy %d\n",d0);
-t0:= alarm.usec();
-cc:= bat.reverse(c);
-j:= algebra.join(b,cc);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#join %d\n",d0);
-t0:= alarm.usec();
-j:= algebra.join(b,cc);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#hot join %d\n",d0);
-cnt:= aggr.count(j);
-io.print(cnt);
-t0:= alarm.usec();
-(w,y):= algebra.prejoin(d,e,2);
-t1:= alarm.usec();
-d0:= t1-t0;
-d1:= d0;
-io.printf("#prejoin %d\n",d0);
-t0:= alarm.usec();
-cy:= bat.reverse(y);
-h:= algebra.join(w,cy);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#join %d\n",d0);
-cnt:= aggr.count(h);
-io.print(cnt);
-d1:= d1+d0;
-io.printf("#join total %d\n",d1);
-#io.print(w);
-#io.print(y);
diff --git a/monetdb5/mal/Tests/tst017.stable.err
b/monetdb5/mal/Tests/tst017.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst017.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst017` in directory 'monetdb5/mal` itself:
-
-
-# 18:26:32 >
-# 18:26:32 > 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=49317 --set sql_port=59549 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst017.mal </dev/null
-# 18:26:32 >
-
-
-# 18:26:32 >
-# 18:26:32 > Done.
-# 18:26:32 >
-
diff --git a/monetdb5/mal/Tests/tst017.stable.out
b/monetdb5/mal/Tests/tst017.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst017.stable.out
+++ /dev/null
@@ -1,46 +0,0 @@
-stdout of test 'tst017` in directory 'monetdb5/mal` itself:
-
-
-# 18:26:32 >
-# 18:26:32 > 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=49317 --set sql_port=59549 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst017.mal </dev/null
-# 18:26:32 >
-
-# Monet Database Server V4.5.0
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; 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.
-## reference setting tables
-# b := new(nil:int,nil:int);
-# aa_a := insert(b,1,2);
-# ba_a := insert(b,2,3);
-# z := getLRefCount(b);
-# print(z);
-# b := join(b,b);
-# print(b);
-#
-function user.main():void;
-# reference setting tables
- b := bat.new(:oid,nil:int);
- aa_a := bat.append(b,1);
- ba_a := bat.append(b,2);
- z := bbp.getLRefCount(b);
- io.print(z);
- br := bat.reverse(b);
- c := algebra.join(b,br);
- io.print(c);
-end main;
-[ 3 ]
-#-----------------#
-# h tmp_5 # name
-# int int # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-
-# 18:26:32 >
-# 18:26:32 > Done.
-# 18:26:32 >
-
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
@@ -1,33 +1,6 @@
stdout of test 'tst047` in directory 'monetdb5/mal` itself:
-# 07:58:46 >
-# 07:58:46 > 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
tst047.mal </dev/null
-# 07:58:46 >
-
-# 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.
-##testing copying and counting reversals
-##to test reversal handling
-#
-#b:=new(:int,:int);
-#insert(b,1,1);
-#insert(b,2,4);
-#insert(b,3,9);
-#print(b);
-#br:= reverse(b);
-#print(br);
-#
-#l0:= copy(b);
-#print(l0);
-#l1:= copy(br);
-#print(l1);
-#
function user.main():void;
#testing copying and counting reversals
#to test reversal handling
@@ -54,7 +27,3 @@ end user.main;
[ 1@0, 4 ]
[ 2@0, 9 ]
-# 07:58:46 >
-# 07:58:46 > Done.
-# 07:58:46 >
-
diff --git a/monetdb5/mal/Tests/tst1502.stable.out
b/monetdb5/mal/Tests/tst1502.stable.out
--- a/monetdb5/mal/Tests/tst1502.stable.out
+++ b/monetdb5/mal/Tests/tst1502.stable.out
@@ -1,63 +1,6 @@
stdout of test 'tst1502` in directory 'monetdb5/mal` itself:
-# 07:59:07 >
-# 07:59:07 > 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
tst1502.mal </dev/null
-# 07:59:07 >
-
-# 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 := new(:oid,:chr);
-# insert(x,1@0,'a');
-# insert(x,2@0,'a');
-# insert(x,3@0,'b');
-# insert(x,4@0,'b');
-# insert(x,5@0,'b');
-# insert(x,6@0,'b');
-# insert(x,7@0,'c');
-# insert(x,8@0,'c');
-#
-# y := new(:oid,:dbl);
-# le_a := dbl(1.0);
-# insert(y,1@0,le_a);
-# ne_a := dbl(2.0);
-# insert(y,2@0,ne_a);
-# pe_a := dbl(2.0);
-# insert(y,3@0,pe_a);
-# re_a := dbl(2.0);
-# insert(y,4@0,re_a);
-# te_a := dbl(2.0);
-# insert(y,5@0,te_a);
-# ve_a := dbl(3.0);
-# insert(y,6@0,ve_a);
-# xe_a := dbl(1.0);
-# insert(y,7@0,xe_a);
-# af_a := dbl(1.0);
-# insert(y,8@0,af_a);
-#
-# z := new(:oid,:str);
-# insert(z,1@0,"c");
-# insert(z,2@0,"a");
-# insert(z,3@0,"b");
-# insert(z,4@0,"c");
-# insert(z,5@0,"a");
-# hf_a := insert(z,6@0,"a");
-# insert(z,7@0,"c");
-# insert(z,8@0,"a");
-# print("sort x");
-# xs:=sort(x);
-# print(xs);
-# print("sort xrev");
-# xrev:=reverse(x);
-# xsrev:=sort(xrev);
-# print(xsrev);
-#
-#
function user.main():void;
x := bat.new(:oid,:bte);
bat.append(x,1:bte);
@@ -128,7 +71,4 @@ end user.main;
[ 6@0, 1 ]
[ 7@0, 1 ]
-# 07:59:07 >
-# 07:59:07 > Done.
-# 07:59:07 >
diff --git a/monetdb5/mal/Tests/tst1504.stable.out
b/monetdb5/mal/Tests/tst1504.stable.out
--- a/monetdb5/mal/Tests/tst1504.stable.out
+++ b/monetdb5/mal/Tests/tst1504.stable.out
@@ -1,27 +1,6 @@
stdout of test 'tst1504` in directory 'monetdb5/mal` itself:
-# 07:59:08 >
-# 07:59:08 > 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
tst1504.mal </dev/null
-# 07:59:08 >
-
-# 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 := new(:oid,:chr);
-# de_a := insert(x,1@0,'a');
-# ee_a := insert(x,2@0,'a');
-# y:= new(:chr,:oid);
-# xr:= reverse(x);
-# print(xr);
-# insert(y,xr);
-#print("result?");
-# print(y);
-#
function user.main():void;
x := bat.new(:oid,:bte);
de_a := bat.append(x,1:bte);
@@ -39,7 +18,4 @@ end user.main;
[ 0@0, 1 ]
[ 1@0, 1 ]
-# 07:59:08 >
-# 07:59:08 > Done.
-# 07:59:08 >
diff --git a/monetdb5/mal/Tests/tst1602.stable.out
b/monetdb5/mal/Tests/tst1602.stable.out
--- a/monetdb5/mal/Tests/tst1602.stable.out
+++ b/monetdb5/mal/Tests/tst1602.stable.out
@@ -12,105 +12,6 @@ stdout of test 'tst1602` in directory 'm
# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
# dbname:mTests_src_mal
# Visit http://monetdb.cwi.nl/ for further information.
-# int_1M:= new(:void,:lng,1000000);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
