Changeset: 494586987b6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=494586987b6a
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
sql/benchmarks/ATIS/Tests/load.stable.out
sql/benchmarks/arno/Tests/insert_ATOM.stable.out
sql/benchmarks/arno/Tests/insert_BOND.stable.out
sql/benchmarks/arno_flt/Tests/init.stable.out
sql/benchmarks/moa/Tests/load.stable.out
sql/benchmarks/wisconsin/Tests/load.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/Tests/decimal2.stable.out
testing/Mtest.py.in
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Removed old MAL tracing
The original MAL tracing was geared at mserver console processing.
Using the mdb.start(), mdb.list() and related operations provide
enough power for analysis.
diffs (truncated from 647 to 300 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -44,11 +44,11 @@ end user.s2_1;
% mal # name
% clob # type
% 88 # length
-function user.s3_1(A0:sht,A1:sht):void;
+function user.s4_1(A0:sht,A1:sht):void;
X_11:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
X_3:int := udf.fuse(A0,A1);
sql.resultSet(".L","fuse_single_value","int",32,0,7,X_3);
-end user.s3_1;
+end user.s4_1;
#select fuse(1000,2000);
% .L # table_name
% fuse_single_value # name
@@ -60,11 +60,11 @@ end user.s3_1;
% mal # name
% clob # type
% 94 # length
-function user.s4_1(A0:int,A1:int):void;
+function user.s6_1(A0:int,A1:int):void;
X_11:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
X_3:lng := udf.fuse(A0,A1);
sql.resultSet(".L","fuse_single_value","bigint",64,0,7,X_3);
-end user.s4_1;
+end user.s6_1;
#select fuse(1000000,2000000);
% .L # table_name
% fuse_single_value # name
@@ -94,7 +94,7 @@ end user.s4_1;
% mal # name
% clob # type
% 97 # length
-function user.s8_1():void;
+function user.s14_1():void;
X_41:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",27);
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
@@ -120,13 +120,13 @@ function user.s8_1():void;
X_21 := algebra.projection(C_2,X_20);
X_22:bat[:sht] := batudf.fuse(X_14,X_21);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
-end user.s8_1;
+end user.s14_1;
#explain select fuse(c,d) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s9_1():void;
+function user.s15_1():void;
X_41:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",27);
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
@@ -152,13 +152,13 @@ function user.s9_1():void;
X_21 := algebra.projection(C_2,X_20);
X_22:bat[:int] := batudf.fuse(X_14,X_21);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
-end user.s9_1;
+end user.s15_1;
#explain select fuse(e,f) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s10_1():void;
+function user.s16_1():void;
X_41:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",27);
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
@@ -184,7 +184,7 @@ function user.s10_1():void;
X_21 := algebra.projection(C_2,X_20);
X_22:bat[:lng] := batudf.fuse(X_14,X_21);
sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
-end user.s10_1;
+end user.s16_1;
#select fuse(a,b) from udf_fuse;
% sys.L # table_name
% fuse_a # name
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -83,7 +83,7 @@ end user.s2_1;
% mal # name
% clob # type
% 101 # length
-function user.s6_1():void;
+function user.s10_1():void;
X_33:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",22);
X_17 := bat.new(nil:oid,nil:str);
X_25 := bat.append(X_17,"sys.L");
@@ -104,7 +104,7 @@ function user.s6_1():void;
X_14 := algebra.projection(C_2,X_13);
X_15:bat[:str] := batudf.reverse(X_14);
sql.resultSet(X_25,X_27,X_29,X_31,X_32,X_15);
-end user.s6_1;
+end user.s10_1;
#select reverse(x) from udf_reverse;
% sys.L # table_name
% reverse_x # name
diff --git a/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
@@ -16,75 +16,6 @@ stdout of test 'bam_lib_mal` in director
# Listening for connection requests on mapi:monetdb://robin-xps13:39916/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16560/.s.monetdb.39916
# MonetDB/SQL module loaded
-function user.main():void;
- sht1 := calc.sht(200);
- sht2 := calc.sht(0);
- sht3 := calc.sht(100);
- f := bam.bam_flag(sht1,"segm_unma");
- io.print(f);
- fs := bat.new(:oid,:sht);
- bat.append(fs,sht1);
- bat.append(fs,sht2);
- bat.append(fs,sht3);
- fsb := batbam.bam_flag(fs,"segm_unma");
- io.print(fsb);
- seq_rev := bam.reverse_seq("ACGTCGTA");
- io.print(seq_rev);
- seqs := bat.new(:oid,:str);
- bat.append(seqs,seq_rev);
- bat.append(seqs,"TVGHCDMKNYSABWR");
-
bat.append(seqs,"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
- io.print(seqs);
- seqs_rev := batbam.reverse_seq(seqs);
- io.print(seqs_rev);
- seqs_revrev := batbam.reverse_seq(seqs_rev);
- io.print(seqs_revrev);
- qual_rev := bam.reverse_qual("dJwn!@dJ!#jjjnsl");
- io.print(qual_rev);
- quals := bat.new(:oid,:str);
- bat.append(quals,qual_rev);
- bat.append(quals,"dJwn!@dJ!#jjjnsl");
- bat.append(quals,"I_am_a_quality_string_without_a_purpose");
- io.print(quals);
- quals_rev := batbam.reverse_qual(quals);
- io.print(quals_rev);
- quals_revrev := batbam.reverse_qual(quals_rev);
- io.print(quals_revrev);
- l := bam.seq_length("100M3I200D5M");
- io.print(l);
- cigars := bat.new(:oid,:str);
- bat.append(cigars,"100M3I200D5M");
- bat.append(cigars,"*");
- ls := batbam.seq_length(cigars);
- io.print(ls);
- seq_char := bam.seq_char(12,"ACTAGAATGGCT",5,"3M1I3M1D5M");
- io.print(seq_char);
- sc_seqs := bat.new(:oid,:str);
- sc_poss := bat.new(:oid,:int);
- sc_cgrs := bat.new(:oid,:str);
-
bat.append(sc_seqs,"ATACTTATAGAACAAATGAACCCAAAACCACATAAGGTAAACAACAAAGCTACTGGTTCAAAATTAAGCCTAACTTCAACAGTACCAGGCAAAAACCAT");
-
bat.append(sc_seqs,"TATACTTATAGAACAAATGAACCCAAAACCACATAAGGTAAACAACAAAGCTACTGGTTCAAAATTAAGCCTAACTTCAACAGTACCAGGCAAAAACCAT");
-
bat.append(sc_seqs,"GTACAAAAGTGGGAAATTTTAAAGCTGGGCATCCAGGGGAGACATCACGTGTCAGTAGGTTCCGTGATGCCCCCCAAGCCGCAAAACCAGCAAGTTTTTA");
- bat.append(sc_poss,17922987);
- bat.append(sc_poss,18225784);
- bat.append(sc_poss,18226024);
- bat.append(sc_cgrs,"3=1X1=1X43=1X16=1X33=");
- bat.append(sc_cgrs,"5=1X31=1X62=");
- bat.append(sc_cgrs,"100=");
- io.print(sc_seqs);
- io.print(sc_poss);
- io.print(sc_cgrs);
- i := 17922987;
- res1:bat[:str] := mal.manifold("bam","seq_char",i,sc_seqs,sc_poss,sc_cgrs);
- io.print(res1);
- is := sc_poss;
- res2:bat[:str] :=
mal.manifold("bam","seq_char",is,sc_seqs,sc_poss,sc_cgrs);
- io.print(res2);
- is := bat.new(:oid,:int);
- bat.append(is,17922987);
- res3:bat[:str] :=
mal.manifold("bam","seq_char",is,sc_seqs,sc_poss,sc_cgrs);
- io.print(res3);
-end user.main;
[ false ]
#--------------------------#
# h t # name
diff --git a/sql/benchmarks/ATIS/Tests/load.stable.out
b/sql/benchmarks/ATIS/Tests/load.stable.out
--- a/sql/benchmarks/ATIS/Tests/load.stable.out
+++ b/sql/benchmarks/ATIS/Tests/load.stable.out
@@ -9,18 +9,15 @@ stdout of test 'load` in directory 'sql/
# Serving database 'mTests_src_benchmarks_ATIS', 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-2009 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:31295/
-# MonetDB/SQL module v2.37.0 loaded
-function user.main():void;
- INT_MAX := 2147483647;
- dbgmsk := mdb.getDebug();
- unset := calc.+(8,8388608);
- keep := calc.xor(INT_MAX,unset);
- set := calc.and(dbgmsk,keep);
- mdb.setDebug(set);
-end user.main;
+# 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.da.cwi.nl:35352/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5703/.s.monetdb.35352
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
Ready.
#function user.main():void;
diff --git a/sql/benchmarks/arno/Tests/insert_ATOM.stable.out
b/sql/benchmarks/arno/Tests/insert_ATOM.stable.out
--- a/sql/benchmarks/arno/Tests/insert_ATOM.stable.out
+++ b/sql/benchmarks/arno/Tests/insert_ATOM.stable.out
@@ -5,21 +5,23 @@ stdout of test 'insert_ATOM` in director
# 12:30:47 > Mtimeout -timeout 1140 Mserver
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/bin"
--set
"gdk_dbfarm=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/dbfarm"
--set
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/log"
--set mapi_port=38933 --set sql_port=45579 --set xquery_port=52530 --set
monet_prompt= --trace "--dbname=mTests_src_benchmarks_arno"
--dbinit="module(sql_server); sql_server_start();" insert_ATOM.prologue ; echo
; echo Over..
# 12:30:47 >
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_benchmarks_arno', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:31295/
-# MonetDB/SQL module v2.37.0 loaded
-function user.main():void;
- INT_MAX := 2147483647;
- dbgmsk := mdb.getDebug();
- unset := calc.+(8,8388608);
- keep := calc.xor(INT_MAX,unset);
- set := calc.and(dbgmsk,keep);
- mdb.setDebug(set);
-end user.main;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_arno', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 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.da.cwi.nl:35352/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5703/.s.monetdb.35352
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
Ready.
#function user.main():void;
diff --git a/sql/benchmarks/arno/Tests/insert_BOND.stable.out
b/sql/benchmarks/arno/Tests/insert_BOND.stable.out
--- a/sql/benchmarks/arno/Tests/insert_BOND.stable.out
+++ b/sql/benchmarks/arno/Tests/insert_BOND.stable.out
@@ -5,21 +5,23 @@ stdout of test 'insert_BOND` in director
# 12:30:52 > Mtimeout -timeout 180 Mserver
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/bin"
--set
"gdk_dbfarm=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/dbfarm"
--set
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/log"
--set mapi_port=38933 --set sql_port=45579 --set xquery_port=52530 --set
monet_prompt= --trace "--dbname=mTests_src_benchmarks_arno"
--dbinit="module(sql_server); sql_server_start();" insert_BOND.prologue ; echo
; echo Over..
# 12:30:52 >
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_benchmarks_arno', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:31295/
-# MonetDB/SQL module v2.37.0 loaded
-function user.main():void;
- INT_MAX := 2147483647;
- dbgmsk := mdb.getDebug();
- unset := calc.+(8,8388608);
- keep := calc.xor(INT_MAX,unset);
- set := calc.and(dbgmsk,keep);
- mdb.setDebug(set);
-end user.main;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_arno', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 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.da.cwi.nl:35352/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5703/.s.monetdb.35352
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.5'
+# Finished reading the write-ahead log 'sql_logs/sql/log.5'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
Ready.
#function user.main():void;
diff --git a/sql/benchmarks/arno_flt/Tests/init.stable.out
b/sql/benchmarks/arno_flt/Tests/init.stable.out
--- a/sql/benchmarks/arno_flt/Tests/init.stable.out
+++ b/sql/benchmarks/arno_flt/Tests/init.stable.out
@@ -16,17 +16,14 @@ stdout of test 'init` in directory 'sql/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
