Changeset: 1e4da48bd547 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e4da48bd547
Removed Files:
monetdb5/mal/Tests/tst273.stable.err
monetdb5/mal/Tests/tst273.stable.out
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_runtime.c
Branch: default
Log Message:
Remove unused code
diffs (158 lines):
diff --git a/monetdb5/mal/Tests/tst273.stable.err
b/monetdb5/mal/Tests/tst273.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst273.stable.err
+++ /dev/null
@@ -1,76 +0,0 @@
-stderr of test 'tst273` in directory 'monetdb5/mal` itself:
-
-
-# 08:45:19 >
-# 08:45:19 > 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//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=30797 --set monet_prompt= --trace --dbname=mTests_src_mal tst273.mal
< /dev/null
-# 08:45:19 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 15:04:28 >
-# 15:04:28 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6764" "--port=38657"
-# 15:04:28 >
-
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = profiler.stethoscope();
-ERROR = !TypeException:user.main[1]:'profiler.stethoscope' undefined in:
profiler.stethoscope();
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = (clk,rdbytes,wrbytes):= profiler.getEvent();
-ERROR = !TypeException:user.main[1]:'profiler.getEvent' undefined in:
(clk:any,rdbytes:any,wrbytes:any) := profiler.getEvent();
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# clk %d\n",clk);
-ERROR = !TypeException:user.main[1]:'clk' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# rdbytes %d\n",rdbytes);
-ERROR = !TypeException:user.main[1]:'rdbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# wrbytes %d\n",wrbytes);
-ERROR = !TypeException:user.main[1]:'wrbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = algebra.select(b,nil:lng,mx);
-ERROR = !TypeException:user.main[1]:'algebra.select' undefined in:
algebra.select(b:bat[:oid,:lng],nil:lng,mx:lng);
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = (clk,rdbytes,wrbytes):= profiler.getEvent();
-ERROR = !TypeException:user.main[1]:'profiler.getEvent' undefined in:
(clk:any,rdbytes:any,wrbytes:any) := profiler.getEvent();
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# clk %d\n",clk);
-ERROR = !TypeException:user.main[1]:'clk' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# rdbytes %d\n",rdbytes);
-ERROR = !TypeException:user.main[1]:'rdbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# wrbytes %d\n",wrbytes);
-ERROR = !TypeException:user.main[1]:'wrbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = algebra.select(b,mx,nil:lng);
-ERROR = !TypeException:user.main[1]:'algebra.select' undefined in:
algebra.select(b:bat[:oid,:lng],mx:lng,nil:lng);
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = (clk,rdbytes,wrbytes):= profiler.getEvent();
-ERROR = !TypeException:user.main[1]:'profiler.getEvent' undefined in:
(clk:any,rdbytes:any,wrbytes:any) := profiler.getEvent();
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# clk %d\n",clk);
-ERROR = !TypeException:user.main[1]:'clk' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# rdbytes %d\n",rdbytes);
-ERROR = !TypeException:user.main[1]:'rdbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# wrbytes %d\n",wrbytes);
-ERROR = !TypeException:user.main[1]:'wrbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = (clk,rdbytes,wrbytes):= profiler.getEvent();
-ERROR = !TypeException:user.main[1]:'profiler.getEvent' undefined in:
(clk:any,rdbytes:any,wrbytes:any) := profiler.getEvent();
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# clk %d\n",clk);
-ERROR = !TypeException:user.main[1]:'clk' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# rdbytes %d\n",rdbytes);
-ERROR = !TypeException:user.main[1]:'rdbytes' may not be used before being
initialized
-MAPI = (monetdb) /var/tmp/mtest-6764/.s.monetdb.38657
-QUERY = io.printf("# wrbytes %d\n",wrbytes);
-ERROR = !TypeException:user.main[1]:'wrbytes' may not be used before being
initialized
-
-# 15:04:29 >
-# 15:04:29 > "Done."
-# 15:04:29 >
-
diff --git a/monetdb5/mal/Tests/tst273.stable.out
b/monetdb5/mal/Tests/tst273.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst273.stable.out
+++ /dev/null
@@ -1,46 +0,0 @@
-stdout of test 'tst273` in directory 'monetdb5/mal` itself:
-
-
-# 08:45:19 >
-# 08:45:19 > 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//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=30797 --set monet_prompt= --trace --dbname=mTests_src_mal tst273.mal
< /dev/null
-# 08:45:19 >
-
-# MonetDB 5 server v11.12.0
-# This is an unreleased version
-# Serving database 'mTests_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.629 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:30578/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 15:04:28 >
-# 15:04:28 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6764" "--port=38657"
-# 15:04:28 >
-
-#io.printf("#monitor \n");
-#monitor
-# clk 225
-# rdbytes 0
-# wrbytes 160000
-#max 2147469841
-# clk 2156
-# rdbytes 160000
-# wrbytes 160000
-# clk 147
-# rdbytes 16
-# wrbytes 160000
-# clk 0
-# rdbytes 0
-# wrbytes 0
-
-# 08:45:20 >
-# 08:45:20 > Done.
-# 08:45:20 >
-
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -180,8 +180,7 @@ typedef struct {
lng ticks; /* total micro seconds
spent in last call */
int calls; /* number of calls made
to this instruction */
lng totticks; /* total time spent on this
instruction. */
- lng rbytes; /* accumulated number
of bytes read, currently ignored */
- lng wbytes; /* accumulated number
of bytes produced */
+ lng wbytes; /* number of bytes
produced in last instruction */
/* the core admin */
str modname; /* module context, reference
into namespace */
str fcnname; /* function name, reference
into namespace */
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -210,8 +210,7 @@ runtimeProfileExit(Client cntxt, MalBlkP
pci->calls++;
if(malProfileMode > 0 ){
- pci->wbytes += getVolume(stk, pci, 1);
- pci->rbytes += getVolume(stk, pci, 0);
+ pci->wbytes = getVolume(stk, pci, 1);
profilerEvent(mb, stk, pci, FALSE, cntxt->username);
}
if( malProfileMode < 0){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
