Changeset: de1f9539f1b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de1f9539f1b1
Added Files:
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
Modified Files:
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
Branch: Jul2015
Log Message:
Approve 32 bit output.
diffs (120 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
---
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
+++
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
@@ -37,15 +37,14 @@ Ready.
% clob # type
% 107 # length
function user.s2_1(A0:int):void;
- X_21:void := querylog.define("explain select count(*) from tmp where i =
20160222;","default_pipe",11);
+ X_20:void := querylog.define("explain select count(*) from tmp where i =
20160222;","default_pipe",10);
X_2 := sql.mvc();
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0);
- X_9 := X_6;
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp");
- X_10 := algebra.subselect(X_9,X_3,A0,A0,true,false,false);
- X_13 := algebra.leftfetchjoin(X_10,X_9);
- X_14 := aggr.count(X_13);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_14);
+ X_9 := algebra.subselect(X_6,X_3,A0,A0,true,false,false);
+ X_12 := algebra.leftfetchjoin(X_9,X_6);
+ X_13 := aggr.count(X_12);
+ sql.resultSet("sys.L1","L1","wrd",32,0,7,X_13);
end user.s2_1;
# optimizer.mitosis()
# optimizer.dataflow()
@@ -55,16 +54,15 @@ end user.s2_1;
% clob # type
% 113 # length
function user.s3_1(A0:str):void;
- X_23:void := querylog.define("explain select count(*) from tmp where i =
\\'20160222\\';","default_pipe",12);
+ X_22:void := querylog.define("explain select count(*) from tmp where i =
\\'20160222\\';","default_pipe",11);
X_2 := sql.mvc();
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0);
- X_9 := X_6;
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp");
- X_10 := calc.int(A0,8,0);
- X_12 := algebra.subselect(X_9,X_3,X_10,X_10,true,false,false);
- X_15 := algebra.leftfetchjoin(X_12,X_9);
- X_16 := aggr.count(X_15);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_16);
+ X_9 := calc.int(A0,8,0);
+ X_11 := algebra.subselect(X_6,X_3,X_9,X_9,true,false,false);
+ X_14 := algebra.leftfetchjoin(X_11,X_6);
+ X_15 := aggr.count(X_14);
+ sql.resultSet("sys.L1","L1","wrd",32,0,7,X_15);
end user.s3_1;
# optimizer.mitosis()
# optimizer.dataflow()
@@ -74,16 +72,15 @@ end user.s3_1;
% clob # type
% 108 # length
function user.s4_1(A0:lng):void;
- X_23:void := querylog.define("explain select count(*) from tmp where i =
201602221;","default_pipe",12);
+ X_22:void := querylog.define("explain select count(*) from tmp where i =
201602221;","default_pipe",11);
X_2 := sql.mvc();
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp","i",0);
- X_9 := X_6;
- X_10:bat[:oid,:lng] := batcalc.lng(0,X_9,10,0);
+ X_9:bat[:oid,:lng] := batcalc.lng(0,X_6,10,0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp");
- X_12 := algebra.subselect(X_10,X_3,A0,A0,true,false,false);
- X_15 := algebra.leftfetchjoin(X_12,X_9);
- X_16 := aggr.count(X_15);
- sql.resultSet("sys.L1","L1","wrd",32,0,7,X_16);
+ X_11 := algebra.subselect(X_9,X_3,A0,A0,true,false,false);
+ X_14 := algebra.leftfetchjoin(X_11,X_6);
+ X_15 := aggr.count(X_14);
+ sql.resultSet("sys.L1","L1","wrd",32,0,7,X_15);
end user.s4_1;
# optimizer.mitosis()
# optimizer.dataflow()
diff --git
a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
@@ -0,0 +1,45 @@
+stdout of test 'rename_exps.Bug-3974` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 12:27:17 >
+# 12:27:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39847" "--set"
"mapi_usock=/var/tmp/mtest-21445/.s.monetdb.39847" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:27:17 >
+
+# MonetDB 5 server v11.21.18
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 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://localhost.nes.nl:39847/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21445/.s.monetdb.39847
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.11'
+# Finished reading the write-ahead log 'sql_logs/sql/log.11'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 12:27:17 >
+# 12:27:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21445" "--port=39847"
+# 12:27:17 >
+
+#create table foo (a int, b int);
+#prepare select count(b) from (select a,b from foo union all select null,null
from foo) t;
+#prepare select count(b) from (select a,b from foo union all select null,null
from foo) t;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 3, 2, 1, 0, 2, 2 # length
+[ "wrd", 32, 0, "", "L3", "L3" ]
+#drop table foo;
+
+# 12:27:17 >
+# 12:27:17 > "Done."
+# 12:27:17 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
