Changeset: 54898f4def33 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54898f4def33
Removed Files:
monetdb5/mal/Tests/performanceTests/tst901d.mal
monetdb5/modules/mal/Tests/mapi03.mal
monetdb5/optimizer/Tests/RMexample.mal
monetdb5/optimizer/Tests/tst4600.mal
monetdb5/optimizer/Tests/tst4600.stable.err
monetdb5/optimizer/Tests/tst4600.stable.out
monetdb5/optimizer/Tests/tst4611.mal
monetdb5/optimizer/Tests/tst4611.stable.err
monetdb5/optimizer/Tests/tst4611.stable.out
monetdb5/optimizer/Tests/tst4620.mal
monetdb5/optimizer/Tests/tst4620.stable.err
monetdb5/optimizer/Tests/tst4620.stable.out
monetdb5/tests/gdkTests/Tests/void.mal
monetdb5/tests/gdkTests/Tests/void.stable.err
monetdb5/tests/gdkTests/Tests/void.stable.out
Modified Files:
monetdb5/mal/Tests/performanceTests/join.mal
monetdb5/mal/Tests/performanceTests/tst901c.mal
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/opt_costModel.c
Branch: default
Log Message:
More junk out
diffs (truncated from 1192 to 300 lines):
diff --git a/monetdb5/mal/Tests/performanceTests/join.mal
b/monetdb5/mal/Tests/performanceTests/join.mal
--- a/monetdb5/mal/Tests/performanceTests/join.mal
+++ b/monetdb5/mal/Tests/performanceTests/join.mal
@@ -1,5 +1,4 @@
# what is the overhead of MAL in multiplex situations
-profiler.setFilter("*","*");
b:= bat.new(:oid,:int);
c:= bat.new(:oid,:int);
t0:= alarm.usec();
@@ -13,15 +12,14 @@ barrier (v,i):= language.newRange(0:int)
redo (v,i):= language.nextElement(1:int,10000000:int);
exit (v,i);
t1:= alarm.usec();
-cr := bat.reverse(c);
t2:= alarm.usec();
b:= algebra.select(b,nil:int,rl);
c:= algebra.select(c,nil:int,il);
-x:= algebra.join(b,cr);
+x:= algebra.subjoin(b,c);
t3:= alarm.usec();
b:= algebra.select(b,nil:int,rl);
c:= algebra.select(c,nil:int,il);
-y:= algebra.join(b,cr);
+y:= algebra.subjoin(b,c);
t4:= alarm.usec();
d1:= t2-t0;
d2:= t3-t2;
diff --git a/monetdb5/mal/Tests/performanceTests/tst901c.mal
b/monetdb5/mal/Tests/performanceTests/tst901c.mal
--- a/monetdb5/mal/Tests/performanceTests/tst901c.mal
+++ b/monetdb5/mal/Tests/performanceTests/tst901c.mal
@@ -1,5 +1,4 @@
# what is the overhead of MAL in multiplex situations
-profiler.setFilter("*","*");
b:= bat.new(:lng,:lng);
t0:= alarm.usec();
t0:= alarm.usec();
diff --git a/monetdb5/mal/Tests/performanceTests/tst901d.mal
b/monetdb5/mal/Tests/performanceTests/tst901d.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/performanceTests/tst901d.mal
+++ /dev/null
@@ -1,47 +0,0 @@
-# what is the overhead of MAL in multiplex situations
-profiler.setAll();
-b:= new(:lng,:lng);
-t0:= alarm.usec();
-i:= -1:lng;
-t0:= alarm.usec();
-barrier v:= nextElement(i,0:lng,1000000:lng);
- insert(b,i,i);
- redo v;
-exit v;
-t1:= alarm.usec();
-c1:= reverse(b);
-c2:= mark(c1,nil:oid);
-c3:= reverse(c2);
-c4:= copy(c3);
-tz:= alarm.usec();
-c5:= copy(b);
-t2:= alarm.usec();
-x:= batcalc.+(c3,c3,c3);
-t3:= alarm.usec();
-x:= batcalc.+(c3,c3);
-t4:= alarm.usec();
-z:= dbl(c3);
-t5:= alarm.usec();
-l:= log(z);
-t6:= alarm.usec();
-e:= batcalc.==(c3,c3);
-t7:= alarm.usec();
-#ww:= info(c5); print(ww);
-#ww:= info(z); print(ww);
-#ww:= info(l); print(ww);
-d1:= t1-t0;
-d2:= t3-t2;
-d3:= t4-t3;
-d4:= t5-t4;
-d5:= t6-t5;
-d6:= t7-t6;
-d7:= t2-tz;
-xc:=count(x);
-printf("count %d\n",xc);
-printf("make %d \n",d1);
-printf("[:+=] %d\n",d2);
-printf("[+] %d\n",d3);
-printf("copy %d\n",d7);
-printf("[=] %d\n",d6);
-printf("[dbl] %d\n",d4);
-printf("[log] %d\n",d5);
diff --git a/monetdb5/mal/Tests/recycle05.stable.out
b/monetdb5/mal/Tests/recycle05.stable.out
--- a/monetdb5/mal/Tests/recycle05.stable.out
+++ b/monetdb5/mal/Tests/recycle05.stable.out
@@ -1,22 +1,6 @@
stdout of test 'recycle05` in directory 'monetdb5/mal` itself:
-# 15:54:58 >
-# 15:54:58 > mserver5
"--config=/export/scratch1/milena/monet.DBG/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/export/scratch1/milena/monet.DBG/lib/MonetDB5:/export/scratch1/milena/monet.DBG/lib/MonetDB5/lib:/export/scratch1/milena/monet.DBG/lib/MonetDB5/bin"
--set "gdk_dbfarm=/export/scratch1/milena/monet.DBG/var/MonetDB5/dbfarm" --set
"sql_logdir=/export/scratch1/milena/monet.DBG/var/MonetDB5/sql_logs" --set
mapi_open=true --set xrpc_open=true --set mapi_port=34583 --set xrpc_port=49067
--set monet_prompt= --trace --dbname=mTests_src_mal recycle05.mal
-# 15:54:58 >
-
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_mal'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:35178/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13875/.s.monetdb.35178
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
function sql.mvc():int;
return mvc := 1;
end sql.mvc;
@@ -54,60 +38,3 @@ function user.main():void;
recycle.dump();
end user.main;
[ "start" ]
-#RECYCLE [ 0] X_0 := sql.mvc();
-#RECYCLE [ 1] X_1 := sql.tid(1,"sys","tbl");
-#RECYCLE [ 2] X_4 := sql.bind(1,"sys","tbl","col",0);
-#RECYCLE [ 3] X_7 :=
algebra.subselect(<tmp_1034>,<tmp_1033>,100,120,true,true,false);
-#REUSED [ 0] m := sql.mvc();
-#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
-#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
-#RECYCLEcleanCache:Fresh-protected 898515 leaves: 3(898472)
-#RECYCLEcleanCache: policy=PROFIT usedmem=12000
-#Target memory 12000KB Available 16741151008KB
-#Candidates for eviction
-#LRU Ticks Life SZ Cnt Wgt Ben Prof)
-# 3 257359 56 257.30 12000 1 0.1
-#Evicted 1 instruction(s)
-#3 =# 3 X_7:BAT :=
algebra.subselect(<tmp_1034>,<tmp_1033>,100,120,true,true,false);# 3 _7:BAT :=
ALGsubselect2(_4:BAT, _1:BAT, _8:int, _9:int, _10:bit, _10:bit, _11:bit) {GR}
-#RECYCLE [ 3] X_7 :=
algebra.subselect(<tmp_1034>,<tmp_1033>,700,710,true,true,false);
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 4
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 2 incache= 4 executed = 5499 memory(KB)= 12000 PersBat memory=0
-#Cache search time= 0(usec)
-# CL lru cnt ticks rd wr Instr
-# 0 898516 2 46 0 0 X_0 := sql.mvc();
-# 1 898525 2 16351 8000 0 X_1 :=
sql.tid(1,"sys","tbl");
-# 2 898536 2 15620 4000 0 X_4 :=
sql.bind(1,"sys","tbl","col",0);
-# 3 898547 1 61 88 12000 X_7 :=
algebra.subselect(<tmp_1034>,<tmp_1033>,700,710,true,true,false);
-#REUSED [ 0] m := sql.mvc();
-#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
-#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
-#RECYCLEcleanCache:Fresh-protected 898720 leaves: 3(898547)
-#RECYCLEcleanCache: policy=PROFIT usedmem=12000
-#Target memory 12000KB Available 16741151008KB
-#Candidates for eviction
-#LRU Ticks Life SZ Cnt Wgt Ben Prof)
-# 3 257452 62 257.64 12000 1 0.1
-#Evicted 1 instruction(s)
-#3 =# 3 X_7:BAT :=
algebra.subselect(<tmp_1034>,<tmp_1033>,700,710,true,true,false);# 3 _7:BAT :=
ALGsubselect2(_4:BAT, _1:BAT, _8:int, _9:int, _10:bit, _10:bit, _11:bit) {GR}
-#RECYCLE [ 3] X_7 :=
algebra.subselect(<tmp_1034>,<tmp_1033>,400,700,true,true,false);
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 4
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 4 incache= 4 executed = 5509 memory(KB)= 12000 PersBat memory=0
-#Cache search time= 0(usec)
-# CL lru cnt ticks rd wr Instr
-# 1 730063 3 799 1 4 _1 :=
user.bind("schema","table","column",0);
-# 2 729919 1 43 4 1 _6 :=
algebra.select(<tmp_20>,100,120);
-# 3 729971 1 17 4 1 _10 :=
algebra.select(<tmp_20>,700,710);
-# 4 729983 1 11 1 1 _13 :=
algebra.mark(<tmp_23>,0@0);
-# 5 729988 1 5 1 1 _14 :=
bat.reverse(<tmp_24>);
-# 6 730097 1 34 4 2 _15 :=
algebra.select(<tmp_20>,400,700);
-# 7 730121 1 24 2 1 _17 :=
algebra.mark(<tmp_25>,0@0);
-# 8 730136 1 15 1 1 _18 :=
bat.reverse(<tmp_26>);
-
-# 15:54:58 >
-# 15:54:58 > Done.
-# 15:54:58 >
-
diff --git a/monetdb5/modules/mal/Tests/mapi03.mal
b/monetdb5/modules/mal/Tests/mapi03.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/mapi03.mal
+++ /dev/null
@@ -1,45 +0,0 @@
-include sql;
-factory sql_cache.s0_0():void;
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z9:bat[:void,:int] := sql.bind("sys","t1","id","test1",0);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z17:bat[:void,:int] := sql.bind("sys","t1","id","test1",1);
- Z20 := bat.setWriteMode(Z17);
- Z22 := algebra.kunion(Z9,Z20);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z26:bat[:oid,:int] := sql.bind("sys","t1","id","test1",3);
- Z29 := bat.setWriteMode(Z26);
- Z31 := algebra.kdifference(Z22,Z29);
- Z33 := algebra.kunion(Z31,Z29);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z37:bat[:void,:oid] := sql.bind_dbat("sys","t1","test1",0);
- Z39 := bat.reverse(Z37);
- Z41 := algebra.kdifference(Z33,Z39);
- Z43 := calc.oid(0@0);
- Z46 := algebra.mark(Z41,Z43);
- Z48 := bat.reverse(Z46);
- Z50 := algebra.join(Z48,Z33);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z59:bat[:void,:str] := sql.bind("sys","t1","name","test1",0);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z67:bat[:void,:str] := sql.bind("sys","t1","name","test1",1);
- Z70 := bat.setWriteMode(Z67);
- Z72 := algebra.kunion(Z59,Z70);
- mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
- Z76:bat[:oid,:str] := sql.bind("sys","t1","name","test1",3);
- Z79 := bat.setWriteMode(Z76);
-barrier Z99:= true;
- Z81 := algebra.kdifference(Z72,Z79);
- Z83 := algebra.kunion(Z81,Z79);
- Z85 := algebra.join(Z48,Z83);
- Z87 := sql.resultSet(2,1,Z50);
- sql.rsColumn(Z87,"sys.t1","id","int",32,0,Z50);
- sql.rsColumn(Z87,"sys.t1","name","varchar",1024,0,Z85);
- sql.exportResult(Z87);
- yield Z99;
- redo Z99;
-exit Z99;
-end s0_0;
-mapi.disconnect(mid);
-optimizer.remoteQueries("sql_cache","s0_0");
-mdb.List("sql_cache","s0_0");
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -9,9 +9,6 @@ tst4030
tst4600
tst4601
tst4602
-#tst4610 needs new joinpath
-#tst4611 ,,
-#tst4620 ,,
tst4630
tst4700
tst4701
diff --git a/monetdb5/optimizer/Tests/RMexample.mal
b/monetdb5/optimizer/Tests/RMexample.mal
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/RMexample.mal
+++ /dev/null
@@ -1,7 +0,0 @@
-r{count=100} := bat.new(:oid,:int);
-s{count=1000}:= bat.new(:oid,:int);
-rs:= algebra.select(s,1,1);
-rr:= bat.reverse(r);
-j:= algebra.join(rs,rr);
-optimizer.costEstimation();
-mdb.List();
diff --git a/monetdb5/optimizer/Tests/tst4600.mal
b/monetdb5/optimizer/Tests/tst4600.mal
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4600.mal
+++ /dev/null
@@ -1,15 +0,0 @@
-# the first test for macro expansions and inversions
-function welcome(lim:int):void;
- i:= 0;
-barrier j:= i<lim;
- io.print("Welcome");
- i:= i+1;
- redo j:= i<lim;
-exit j;
-end welcome;
-
-optimizer.macro("user","welcome");
-
-io.print("test expansion");
-user.welcome(2);
-mdb.List();
diff --git a/monetdb5/optimizer/Tests/tst4600.stable.err
b/monetdb5/optimizer/Tests/tst4600.stable.err
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4600.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst4600` in directory 'monetdb5/optimizer` itself:
-
-
-# 19:36:04 >
-# 19:36:04 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31892
--set monet_prompt= --trace --dbname=mTests_src_optimizer tst4600.mal <
/dev/null
-# 19:36:04 >
-
-
-# 19:36:04 >
-# 19:36:04 > Done.
-# 19:36:04 >
-
diff --git a/monetdb5/optimizer/Tests/tst4600.stable.out
b/monetdb5/optimizer/Tests/tst4600.stable.out
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4600.stable.out
+++ /dev/null
@@ -1,53 +0,0 @@
-stdout of test 'tst4600` in directory 'monetdb5/optimizer` itself:
-
-
-# 19:36:04 >
-# 19:36:04 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31892
--set monet_prompt= --trace --dbname=mTests_src_optimizer tst4600.mal <
/dev/null
-# 19:36:04 >
-
-# MonetDB Server v4.99.19
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
