Changeset: 2ab3006100c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ab3006100c3
Added Files:
sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql
sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err
sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out
Modified Files:
geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2017/Tests/All
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (253 lines):
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.out
@@ -29,8 +29,8 @@ Ready.
[ 1 ]
[ 1 ]
#select count(*) from geoms;
-% sys.L1 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 4 ]
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -49,21 +49,21 @@ Ready.
% .L2 # table_name
% L2 # name
% varchar # type
-% 12 # length
-[ "default_pipe" ]
+% 15 # length
+[ "sequential_pipe" ]
#select def from optimizers() where name = optimizer;
% .L1 # table_name
% def # name
% clob # type
-% 544 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
+% 503 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 158 # length
-function user.s8_1():void;
- X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"default_pipe", 21:int);
+function user.s10_1():void;
+ X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"sequential_pipe", 21:int);
X_4 := sql.mvc();
(X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr,
"|", "\\n", nil:str, "null", "/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str);
X_29 := sql.append(X_4, "sys", "ttt", "a", X_25);
@@ -71,7 +71,7 @@ function user.s8_1():void;
X_37 := sql.append(X_34, "sys", "ttt", "c", X_27);
X_39 := aggr.count(X_27);
sql.affectedRows(X_37, X_39);
-end user.s8_1;
+end user.s10_1;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
@@ -114,14 +114,14 @@ end user.s8_1;
% .L1 # table_name
% def # name
% clob # type
-% 567 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 526 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 158 # length
-function user.s24_1():void;
+function user.s26_1():void;
X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"user_1", 21:int);
X_4 := sql.mvc();
(X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr,
"|", "\\n", nil:str, "null", "/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str);
@@ -130,7 +130,7 @@ function user.s24_1():void;
X_39 := aggr.count(X_27);
X_37 := sql.append(X_34, "sys", "ttt", "c", X_27);
sql.affectedRows(X_37, X_39);
-end user.s24_1;
+end user.s26_1;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -71,7 +71,7 @@ function user.s8_1():void;
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
X_38 := aggr.count(X_26);
sql.affectedRows(X_36,X_38);
-end user.s8_1;
+end user.s10_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=5 usec
#costmodel actions= 1 time=1 usec
@@ -125,7 +125,7 @@ function user.s24_1():void;
X_38 := aggr.count(X_26);
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
sql.affectedRows(X_36,X_38);
-end user.s24_1;
+end user.s26_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=4 usec
#costmodel actions= 1 time=1 usec
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -21,7 +21,7 @@ Ready.
# 16:24:01 >
#debug select * from tables;
-mdb>#X_1=0@0:void := querylog.define("debug select * from tables;",
"default_pipe", 191:int);
+mdb>#X_1=0@0:void := querylog.define("debug select * from tables;",
"sequential_pipe", 191:int);
mdb>#X_195=nil:bat[:str] := bat.new(nil:str);
# 16:24:01 >
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -5,3 +5,4 @@ HAVE_LIBZ?heapextend.Bug-6134
empty-interval.Bug-6184
too-large-decimals.Bug-6192
round-or-truncate.Bug-6193
+HAVE_HGE?cast-with-many-decimals.Bug-6195
diff --git
a/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql
b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql
@@ -0,0 +1,1 @@
+select CAST(CAST(1 AS DECIMAL(20,19)) AS DECIMAL(12,8));
diff --git
a/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err
b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'cast-with-many-decimals.Bug-6195` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:14:16 >
+# 13:14:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31748" "--set"
"mapi_usock=/var/tmp/mtest-18081/.s.monetdb.31748" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2017"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 13:14:16 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/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 = 31748
+# cmdline opt mapi_usock = /var/tmp/mtest-18081/.s.monetdb.31748
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 13:14:17 >
+# 13:14:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18081" "--port=31748"
+# 13:14:17 >
+
+
+# 13:14:17 >
+# 13:14:17 > "Done."
+# 13:14:17 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out
b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out
@@ -0,0 +1,79 @@
+stdout of test 'cast-with-many-decimals.Bug-6195` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:14:16 >
+# 13:14:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31748" "--set"
"mapi_usock=/var/tmp/mtest-18081/.s.monetdb.31748" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2017"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 13:14:16 >
+
+# MonetDB 5 server v11.25.6 (hg id: a977926e5870)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:31748/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-18081/.s.monetdb.31748
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 13:14:17 >
+# 13:14:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18081" "--port=31748"
+# 13:14:17 >
+
+#select CAST(CAST(1 AS DECIMAL(20,19)) AS DECIMAL(12,8));
+% .L3 # table_name
+% L3 # name
+% decimal # type
+% 14 # length
+[ 1.00000000 ]
+
+# 13:14:17 >
+# 13:14:17 > "Done."
+# 13:14:17 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
