Changeset: 2df3d7626e88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2df3d7626e88
Modified Files:
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
        sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
        sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
Branch: default
Log Message:

Approve output.


diffs (147 lines):

diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out 
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -29,19 +29,19 @@ stdout of test 'crash_on_alias.Bug-2798`
 % .plan # table_name
 % rel # name
 % clob # type
-% 105 # length
+% 109 # length
 project (
 | project (
 | | group by (
 | | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT 
-| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as 
"L1"."L1", "L1"."L1" as "L2"."L2" ]
-| ) [ "dbg"."d", "L1"."L1", sys.sql_mul(sys.sql_div("L2"."L2", tinyint "2"), 
tinyint "2") as "L3"."f" ]
-) [ "dbg"."d", "L1"."L1", "L3"."f" ]
+| | ) [ "dbg"."a" as "d" ] [ "d", sys.sum no nil ("dbg"."b") as "L2"."L2", 
"L2"."L2" as "L3"."L3" ]
+| ) [ "d" as "L1"."d", "L2"."L2", sys.sql_mul(sys.sql_div("L3"."L3", tinyint 
"2"), tinyint "2") as "L4"."f" ]
+) [ "L1"."d", "L2"."L2", "L4"."f" ]
 #set optimizer = 'sequential_pipe';
 #set optimizer = 'default_pipe';
 #SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg,     sys.L1, sys.L3 # table_name
-% d,   L1,     f # name
+% sys.L1,      sys.L2, sys.L4 # table_name
+% d,   L2,     f # name
 % int,  bigint, bigint # type
 % 2,    2,      2 # length
 [ 10,   10,     10      ]
diff --git 
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
 
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
--- 
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
+++ 
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
@@ -138,21 +138,21 @@ stdout of test 'column_alias_in_where_cl
 % char,        int,    varchar # type
 % 1,   1,      0 # length
 #SELECT a AS "A", b AS "B", c AS "C" FROM t_alias ORDER BY "C", "A", "B";
-% sys.L2,      sys.L4, sys.L6 # table_name
+% sys.L1,      sys.L2, sys.L3 # table_name
 % A,   B,      C # name
 % int, int,    varchar # type
 % 2,   2,      4 # length
 [ 11,  2,      "elf"   ]
 [ 1,   10,     "tien"  ]
 #SELECT a*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
-% sys.L2,      sys.t_alias # table_name
+% sys.L1,      sys.L2 # table_name
 % A*B, C # name
 % bigint,      varchar # type
 % 2,   4 # length
 [ 10,  "tien"  ]
 [ 22,  "elf"   ]
 #SELECT a*b*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B" HAVING "A*B" 
IS NOT NULL ORDER BY -"A*B";
-% sys.L2,      sys.t_alias # table_name
+% sys.L1,      sys.L2 # table_name
 % A*B, C # name
 % bigint,      varchar # type
 % 3,   4 # length
diff --git 
a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out 
b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
--- a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
+++ b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
@@ -57,11 +57,9 @@ stdout of test 'view-too-few-rows.Bug-67
 # loading sql script: 99_system.sql
 # MonetDB/SQL module loaded
 
-Ready.
-
-# 11:46:36 >  
-# 11:46:36 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-25842" "--port=36855"
-# 11:46:36 >  
+# 09:25:08 >  
+# 09:25:08 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-20368" "--port=37000"
+# 09:25:08 >  
 
 #start transaction;
 #CREATE SCHEMA "dw_hospital";
@@ -298,7 +296,7 @@ Ready.
 #where "facts_costi"."periodo_id" = "dim_periodi"."id"
 #and "facts_costi"."classe_movimento_id" = "classi"."id"
 #and "classi"."id" = "bri_classi_gruppi_movimenti"."classe_movimento_id"
-% .L72,        .L74,   .L77 # table_name
+% .L37,        .L40,   .L42 # table_name
 % c0,  c1,     m0 # name
 % int, varchar,        bigint # type
 % 4,   4,      1 # length
diff --git a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out 
b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
--- a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
+++ b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
@@ -1,36 +1,37 @@
 stdout of test 'groupby_with_alias.SF-1520575` in directory 
'sql/test/BugTracker` itself:
 
 
-# 14:11:48 >  
-# 14:11:48 >  Mtimeout -timeout 180  mserver5 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"  
--set mapi_open=true --set xrpc_open=true --set mapi_port=31879 --set 
xrpc_port=40474 --set monet_prompt= --trace 
"--dbname=mTests_src_test_BugTracker" --dbinit=' include sql;' ; echo ; echo 
Over..
-# 14:11:48 >  
-
-# MonetDB server v5.1.0, based on kernel v1.19.0
-# Serving database 'mTests_src_test_BugTracker'
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:31879/
-# MonetDB/SQL module v2.19.0 loaded
+# 09:42:44 >  
+# 09:42:44 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=39438" "--set" 
"mapi_usock=/var/tmp/mtest-30130/.s.monetdb.39438" "--forcemito" 
"--dbpath=/home/ferreira/repositories/MonetDB-default/BUILD/var/MonetDB/mTests_sql_test_BugTracker"
 "--set" "embedded_c=true"
+# 09:42:44 >  
 
-#function user.main():void;
-#    clients.quit();
-#end main;
-#Client 1 1
-#MALexit: clients still active
+# MonetDB 5 server v11.34.0 (hg id: 851c68820d68+026335789147+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://localhost.localdomain:39438/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-30130/.s.monetdb.39438
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
 
+# 09:42:44 >  
+# 09:42:44 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-30130" "--port=39438"
+# 09:42:44 >  
 
-# 11:54:20 >  
-# 11:54:20 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35185  < groupby_with_alias.SF-1520575.sql
-# 11:54:20 >  
-
-% sys.test_grp # table_name
+#START TRANSACTION;
+#create table test_grp(a int);
+#select a as b from test_grp group by b; 
+% sys.L1 # table_name
 % b # name
 % int # type
 % 1 # length
 #create table a(f1 varchar(20), f2 int);
 #select coalesce(f1,'EMPTY') as bug_alias, sum(f2) from a group by bug_alias;
-% sys.L1,      sys.L3 # table_name
+% sys.L1,      sys.L2 # table_name
 % bug_alias,   L2 # name
 % varchar,     bigint # type
 % 0,   1 # length
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to