Changeset: 95bb2678cced for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95bb2678cced
Removed Files:
monetdb5/mal/Tests/venks.mal
monetdb5/mal/Tests/venks.stable.err
monetdb5/mal/Tests/venks.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.out
monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.mal
monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err
monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out
monetdb5/tests/gdkTests/Tests/intersect_diff_nil.mal
monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.err
monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.out
monetdb5/tests/gdkTests/Tests/intersect_diff_void.mal
monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.err
monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.out
monetdb5/tests/suite_00/Tests/test_15.mal
monetdb5/tests/suite_00/Tests/test_15.stable.err
monetdb5/tests/suite_00/Tests/test_15.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
monetdb5/tests/BugTracker/Tests/All
monetdb5/tests/gdkTests/Tests/All
monetdb5/tests/suite_00/Tests/All
Branch: default
Log Message:
Accept output
In preparation of the removal of more k* and t* MAL instructions.
diffs (truncated from 918 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -224,7 +224,6 @@ recycle08
recycle10
recycle11
recycle12
-venks
saveload
parseErrors
diff --git a/monetdb5/mal/Tests/venks.mal b/monetdb5/mal/Tests/venks.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/venks.mal
+++ /dev/null
@@ -1,75 +0,0 @@
-# test an expensive kintersect
-# it illustrates weakness of the kintersect routine.
-
-t0:= alarm.usec();
-l:= 0:int;
-large:= bat.new(:oid,:int);
-
-INT_MAX := 2147483647;
-dbgmsk_restore := mdb.getDebug();
-dbgmsk_unset := 8+8388608;
-dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
-dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
-mdb.setDebug(dbgmsk_set);
-
-r:= mmath.srand(0);
-barrier i:= 0:lng;
- k:= mmath.rand();
- l:= calc.int(k);
- bat.append(large,l);
- redo i:= iterator.next(1:lng,1000000:lng);
-exit i;
-
-mdb.setDebug(dbgmsk_restore);
-
-small:= bat.new(:oid,:int);
-#m:= aggr.min(b);
-m:= mmath.rand();
-l:= calc.int(m);
-bat.insert(small,1@0,l);
-#m:= aggr.max(b);
-m:= mmath.rand();
-l:= calc.int(m);
-bat.insert(small,4@0,l);
-#disturb order
-m:= mmath.rand();
-l:= calc.int(m);
-bat.insert(small,3@0,l);
-
-largeR:= bat.reverse(large);
-
-t0:= alarm.usec();
-sj:= algebra.kintersect(large,small);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#kintersect(largeRev,small) %d\n",d0);
-v:= aggr.count(sj);
-io.printf("#count %d\n",v);
-#io.print(sj);
-
-t0:= alarm.usec();
-(j,jj):= algebra.join(large,small);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#join(large,small) %d\n",d0);
-v:= aggr.count(j);
-io.printf("#count %d\n",v);
-#io.print(j);
-
-t0:= alarm.usec();
-sj2:= algebra.kintersect(small,large);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#kintersect(small,largeRev) %d\n",d0);
-v:= aggr.count(sj2);
-io.printf("#count %d\n",v);
-#io.print(sj2);
-
-t0:= alarm.usec();
-(j,jj):= algebra.join(small,small);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#join(small,largeRev) %d\n",d0);
-v:= aggr.count(j);
-io.printf("#count %d\n",v);
-#io.print(j);
diff --git a/monetdb5/mal/Tests/venks.stable.err
b/monetdb5/mal/Tests/venks.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/venks.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'venks` in directory 'monetdb5/mal` itself:
-
-
-# 20:15:09 >
-# 20:15:09 > 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//dbfarm" --set
"sql_logdir=/ufs/mk/monet5//dblogs/logs/sql" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_open=true --set mapi_port=36566 --set xrpc_port=41437 --set monet_prompt=
--trace --dbname=mTests_src_mal venks.mal
-# 20:15:09 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 20:15:10 >
-# 20:15:10 > Done.
-# 20:15:10 >
-
diff --git a/monetdb5/mal/Tests/venks.stable.out
b/monetdb5/mal/Tests/venks.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/venks.stable.out
+++ /dev/null
@@ -1,157 +0,0 @@
-stdout of test 'venks` in directory 'monetdb5/mal` itself:
-
-
-# 20:15:09 >
-# 20:15:09 > 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//dbfarm" --set
"sql_logdir=/ufs/mk/monet5//dblogs/logs/sql" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_open=true --set mapi_port=36566 --set xrpc_port=41437 --set monet_prompt=
--trace --dbname=mTests_src_mal venks.mal
-# 20:15:09 >
-
-# MonetDB Server v5.1.0
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-## test an expensive kintersect
-## it illustrates weakness of the kintersect routine.
-#
-#t0:= alarm.usec();
-#large:= bat.new(:oid,:sht);
-#barrier (go,i):= language.newRange(0:lng);
-# k:= mmath.rand();
-# l:= calc.sht(k);
-# bat.append(large,l);
-# redo (go,i):= language.nextElement(1:lng,1000000:lng);
-#exit (go,i);
-#
-#small:= bat.new(:oid,:sht);
-##m:= aggr.min(b);
-#m:= mmath.rand();
-#l:= calc.sht(m);
-#bat.insert(small,1@0,l);
-##m:= aggr.max(b);
-#m:= mmath.rand();
-#l:= calc.sht(m);
-#bat.insert(small,4@0,l);
-##disturb order
-#m:= mmath.rand();
-#l:= calc.sht(m);
-#bat.insert(small,3@0,l);
-#
-#largeR:= bat.reverse(large);
-#smallR:= bat.reverse(small);
-#
-#t0:= alarm.usec();
-#sj:= algebra.kintersect(largeR,smallR);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#kintersect(largeRev,smallRev) %d\n",d0);
-#v:= aggr.count(sj);
-#io.printf("#count %d\n",v);
-##io.print(sj);
-#
-#t0:= alarm.usec();
-#j:= algebra.join(large,smallR);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#join(large,smallRev) %d\n",d0);
-#v:= aggr.count(j);
-#io.printf("#count %d\n",v);
-##io.print(j);
-#
-#t0:= alarm.usec();
-#sj2:= algebra.kintersect(smallR,largeR);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#kintersect(smallRev,largeRev) %d\n",d0);
-#v:= aggr.count(sj2);
-#io.printf("#count %d\n",v);
-##io.print(sj2);
-#
-#t0:= alarm.usec();
-#j:= algebra.join(small,smallR);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#join(small,largeRev) %d\n",d0);
-#v:= aggr.count(j);
-#io.printf("#count %d\n",v);
-##io.print(j);
-#
-function user.main():void;
-# test an expensive kintersect
-# it illustrates weakness of the kintersect routine.
- t0 := alarm.usec();
- l := 0:int;
- large := bat.new(:oid,:int);
- INT_MAX := 2147483647;
- dbgmsk_restore := mdb.getDebug();
- dbgmsk_unset := calc.+(8,8388608);
- dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
- dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
- mdb.setDebug(dbgmsk_set);
- r := mmath.srand(0:int);
-barrier i := 0:lng;
- k := mmath.rand();
- l := calc.int(k);
- bat.append(large,l);
- redo i := iterator.next(1:lng,1000000:lng);
-exit i;
- mdb.setDebug(dbgmsk_restore);
- small := bat.new(:oid,:int);
-#m:= aggr.min(b);
- m := mmath.rand();
- l := calc.int(m);
- bat.insert(small,1@0,l);
-#m:= aggr.max(b);
- m := mmath.rand();
- l := calc.int(m);
- bat.insert(small,4@0,l);
-#disturb order
- m := mmath.rand();
- l := calc.int(m);
- bat.insert(small,3@0,l);
- largeR := bat.reverse(large);
- t0 := alarm.usec();
- sj := algebra.kintersect(large,small);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#kintersect(largeRev,small) %d\n",d0);
- v := aggr.count(sj);
- io.printf("#count %d\n",v);
-#io.print(sj);
- t0 := alarm.usec();
- (j,jj) := algebra.join(large,small);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#join(large,small) %d\n",d0);
- v := aggr.count(j);
- io.printf("#count %d\n",v);
-#io.print(j);
- t0 := alarm.usec();
- sj2 := algebra.kintersect(small,large);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#kintersect(small,largeRev) %d\n",d0);
- v := aggr.count(sj2);
- io.printf("#count %d\n",v);
-#io.print(sj2);
- t0 := alarm.usec();
- (j,jj) := algebra.join(small,small);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#join(small,largeRev) %d\n",d0);
- v := aggr.count(j);
- io.printf("#count %d\n",v);
-#io.print(j);
-end main;
-#kintersect(largeRev,smallRev) 22265
-#count 0
-#join(large,smallRev) 6566
-#count 0
-#kintersect(smallRev,largeRev) 15212
-#count 0
-#join(small,largeRev) 48
-#count 0
-
-# 20:15:10 >
-# 20:15:10 > Done.
-# 20:15:10 >
-
diff --git a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
--- a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
+++ b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
@@ -12,4 +12,3 @@ operator_-_vs_sign_-.SF-1120397
rename_bat_hyphen.SF-1152369
multiplex_nil.SF-1153664
split_inf_loop.SF-1161583
-union_semantics.SF-1192348
diff --git
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal
deleted file mode 100644
---
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal
+++ /dev/null
@@ -1,11 +0,0 @@
-x := bat.new(:oid,:int);
-y := bat.new(:oid,:int);
-
-bat.insert(x,0@0, 1);
-bat.insert(x,1@0, 2);
-
-bat.insert(y,1@0, 3);
-bat.insert(y,2@0, 4);
-
-u:= algebra.kunion(x,y);
-io.print(u);
diff --git
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err
deleted file mode 100644
---
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err
+++ /dev/null
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
