Changeset: c662655667aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c662655667aa
Added Files:
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
Modified Files:
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/bugs/Tests/aggr_single_value.stable.out.int128
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/int8.stable.out
Branch: default
Log Message:
approve output
diffs (truncated from 484 to 300 lines):
diff --git
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
---
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
+++
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
@@ -50,8 +50,8 @@ Ready.
#2086 "idxs" 2000 NULL 0 true 0 false 0
[ 40 ]
#select sys.median(cast (id as double)) from tbls;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% double # type
% 24 # length
[ 5183 ]
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -45,44 +45,44 @@ Ready.
% 187 # length
function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
barrier X_109 := language.dataflow();
+ X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_5 := sql.mvc();
- X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_66:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
+ X_69:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
+ (X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+ X_81 := sql.delta(X_69,X_71,X_72);
+ X_83 := algebra.leftfetchjoin(X_66,X_81);
+ X_16 := calc.timestamp(A0,7);
+ X_85 := algebra.project(X_83,X_16);
+ X_87 := batmtime.diff(X_83,X_85);
X_68:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
- X_69:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
X_70:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
- (X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
(X_73:bat[:oid,:oid] ,X_74:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
- X_81 := sql.delta(X_69,X_71,X_72);
X_82 := sql.delta(X_70,X_73,X_74,X_14);
- X_83 := algebra.leftfetchjoin(X_66,X_81);
X_84 := algebra.leftfetchjoin(X_68,X_82);
- X_16 := calc.timestamp(A0,7);
- X_85 := algebra.project(X_83,X_16);
X_86 := algebra.project(X_84,X_16);
- X_87 := batmtime.diff(X_83,X_85);
X_88 := batmtime.diff(X_84,X_86);
X_99 := mat.packIncrement(X_87,2);
X_18:bat[:oid,:lng] := mat.packIncrement(X_99,X_88);
X_19 := bat.append(X_6,X_18,true);
X_20 := calc.timestamp(A1,7);
X_91 := algebra.project(X_83,X_20);
+ X_93 := batmtime.diff(X_83,X_91);
X_92 := algebra.project(X_84,X_20);
- X_93 := batmtime.diff(X_83,X_91);
X_94 := batmtime.diff(X_84,X_92);
X_101 := mat.packIncrement(X_93,2);
X_21:bat[:oid,:lng] := mat.packIncrement(X_101,X_94);
X_22 := bat.append(X_19,X_21,true);
X_24:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_75:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
+ (X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+ X_95 := sql.delta(X_75,X_77,X_78);
+ X_97 := algebra.leftfetchjoin(X_66,X_95);
X_76:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
- (X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
(X_79:bat[:oid,:oid] ,X_80:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
X_32:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
- X_95 := sql.delta(X_75,X_77,X_78);
X_96 := sql.delta(X_76,X_79,X_80,X_32);
- X_97 := algebra.leftfetchjoin(X_66,X_95);
X_98 := algebra.leftfetchjoin(X_68,X_96);
X_103 := mat.packIncrement(X_97,2);
X_34 := mat.packIncrement(X_103,X_98);
diff --git a/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
--- a/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
+++ b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
@@ -22,7 +22,7 @@ CREATE TABLE "bam"."alignments_2" (
);
ALTER TABLE bam.alignments_2 SET READ ONLY;
-EXPLAIN SELECT s.value AS refpos, COUNT(*) AS cnt
+SELECT s.value AS refpos, COUNT(*) AS cnt
FROM
generate_series(128, 18960) AS s
JOIN (
diff --git a/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'typecast_error.Bug-3622` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 16:59:10 >
+# 16:59:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32779" "--set"
"mapi_usock=/var/tmp/mtest-28435/.s.monetdb.32779" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:59:10 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32779
+# cmdline opt mapi_usock = /var/tmp/mtest-28435/.s.monetdb.32779
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:59:10 >
+# 16:59:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28435" "--port=32779"
+# 16:59:10 >
+
+
+# 16:59:10 >
+# 16:59:10 > "Done."
+# 16:59:10 >
+
diff --git a/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'typecast_error.Bug-3622` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 16:59:10 >
+# 16:59:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32779" "--set"
"mapi_usock=/var/tmp/mtest-28435/.s.monetdb.32779" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:59:10 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32779/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28435/.s.monetdb.32779
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 16:59:10 >
+# 16:59:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28435" "--port=32779"
+# 16:59:10 >
+
+#CREATE FUNCTION seq_char(val integer, seq string, pos integer, cigar string)
+#RETURNS INTEGER
+#BEGIN
+# RETURN 1;
+#END;
+#CREATE TABLE "bam"."alignments_2" (
+# "virtual_offset" BIGINT NOT NULL,
+# "qname" CHARACTER LARGE OBJECT NOT NULL,
+# "flag" SMALLINT NOT NULL,
+# "rname" CHARACTER LARGE OBJECT NOT NULL,
+# "pos" INTEGER NOT NULL,
+# "epos" INTEGER NOT NULL,
+# "mapq" SMALLINT NOT NULL,
+# "cigar" CHARACTER LARGE OBJECT NOT NULL,
+# "rnext" CHARACTER LARGE OBJECT NOT NULL,
+# "pnext" INTEGER NOT NULL,
+#ALTER TABLE bam.alignments_2 SET READ ONLY;
+#SELECT s.value AS refpos, COUNT(*) AS cnt
+#FROM
+# generate_series(128, 18960) AS s
+# JOIN (
+# SELECT epos, pos, seq, cigar
+# FROM bam.alignments_2
+# WHERE pos > 0
+# ) AS al
+# ON (
+# s.value >= al.pos AND s.value <= al."epos"
+# AND seq_char(s.value, al.seq, al.pos, al.cigar) IS NOT NULL
+# )
+#GROUP BY refpos
+#ORDER BY cnt DESC
+#LIMIT 10;
+% .s, .L3 # table_name
+% refpos, cnt # name
+% smallint, wrd # type
+% 1, 1 # length
+#DROP TABLE bam.alignments_2;
+#DROP FUNCTION seq_char;
+
+# 16:59:10 >
+# 16:59:10 > "Done."
+# 16:59:10 >
+
diff --git a/sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
b/sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
+++ b/sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
@@ -341,7 +341,9 @@ Dependencies between database objects
[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ]
[ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ]
[ ">", "f1", "DEP_FUNC" ]
+[ "isnull", "f1", "DEP_FUNC" ]
[ "not", "f1", "DEP_FUNC" ]
+[ "or", "f1", "DEP_FUNC" ]
[ "<", "f2", "DEP_FUNC" ]
[ ">", "f2", "DEP_FUNC" ]
[ "f1", "f2", "DEP_FUNC" ]
@@ -355,8 +357,10 @@ Dependencies between database objects
[ "or", "imprintsize", "DEP_FUNC" ]
[ "sql_mul", "imprintsize", "DEP_FUNC" ]
[ "=", "ms_round", "DEP_FUNC" ]
+[ "isnull", "ms_round", "DEP_FUNC" ]
[ "ms_trunc", "ms_round", "DEP_FUNC" ]
[ "not", "ms_round", "DEP_FUNC" ]
+[ "or", "ms_round", "DEP_FUNC" ]
[ "round", "ms_round", "DEP_FUNC" ]
[ "<", "ms_stuff", "DEP_FUNC" ]
[ ">", "ms_stuff", "DEP_FUNC" ]
@@ -456,7 +460,9 @@ Dependencies between functions with same
[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ]
[ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ]
[ ">", "f1", "DEP_FUNC" ]
+[ "isnull", "f1", "DEP_FUNC" ]
[ "not", "f1", "DEP_FUNC" ]
+[ "or", "f1", "DEP_FUNC" ]
[ "<", "f2", "DEP_FUNC" ]
[ ">", "f2", "DEP_FUNC" ]
[ "f1", "f2", "DEP_FUNC" ]
@@ -473,8 +479,10 @@ Dependencies between functions with same
[ "or", "imprintsize", "DEP_FUNC" ]
[ "sql_mul", "imprintsize", "DEP_FUNC" ]
[ "=", "ms_round", "DEP_FUNC" ]
+[ "isnull", "ms_round", "DEP_FUNC" ]
[ "ms_trunc", "ms_round", "DEP_FUNC" ]
[ "not", "ms_round", "DEP_FUNC" ]
+[ "or", "ms_round", "DEP_FUNC" ]
[ "round", "ms_round", "DEP_FUNC" ]
[ "<", "ms_stuff", "DEP_FUNC" ]
[ ">", "ms_stuff", "DEP_FUNC" ]
@@ -525,8 +533,10 @@ Dependencies between functions with same
[ "or", "imprintsize", "DEP_FUNC" ]
[ "sql_mul", "imprintsize", "DEP_FUNC" ]
[ "=", "ms_round", "DEP_FUNC" ]
+[ "isnull", "ms_round", "DEP_FUNC" ]
[ "ms_trunc", "ms_round", "DEP_FUNC" ]
[ "not", "ms_round", "DEP_FUNC" ]
+[ "or", "ms_round", "DEP_FUNC" ]
[ "round", "ms_round", "DEP_FUNC" ]
[ "<", "ms_stuff", "DEP_FUNC" ]
[ ">", "ms_stuff", "DEP_FUNC" ]
@@ -804,11 +814,13 @@ Cleanup
[ "imprintsize", "storagemodel", "DEP_FUNC" ]
[ "isnull", "dependencies_columns_on_indexes", "DEP_FUNC" ]
[ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ]
+[ "isnull", "ms_round", "DEP_FUNC" ]
[ "left_shift", "columnsize", "DEP_FUNC" ]
[ "length", "ms_stuff", "DEP_FUNC" ]
[ "ms_trunc", "ms_round", "DEP_FUNC" ]
[ "not", "ms_round", "DEP_FUNC" ]
[ "or", "imprintsize", "DEP_FUNC" ]
+[ "or", "ms_round", "DEP_FUNC" ]
[ "or", "ms_stuff", "DEP_FUNC" ]
[ "pi", "degrees", "DEP_FUNC" ]
[ "pi", "radians", "DEP_FUNC" ]
diff --git a/sql/test/bugs/Tests/aggr_single_value.stable.out.int128
b/sql/test/bugs/Tests/aggr_single_value.stable.out.int128
--- a/sql/test/bugs/Tests/aggr_single_value.stable.out.int128
+++ b/sql/test/bugs/Tests/aggr_single_value.stable.out.int128
@@ -48,8 +48,8 @@ Ready.
% 24 # length
[ 1 ]
#SELECT avg(cast (NULL as int));
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
% double # type
% 24 # length
[ NULL ]
@@ -60,8 +60,8 @@ Ready.
% 1 # length
[ 1 ]
#SELECT sum(cast (NULL as int));
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
% hugeint # type
% 40 # length
[ NULL ]
@@ -72,8 +72,8 @@ Ready.
% 1 # length
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
