Changeset: d9522af3d796 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9522af3d796
Added Files:
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/common/sql_types.c
sql/test/BugTracker-2016/Tests/All
Branch: Jul2015
Log Message:
more strict integer/decimal type handling
diffs (208 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -3198,7 +3198,7 @@ rel2bin_insert( mvc *sql, sql_rel *rel,
if (i->key && constraint) {
stmt *ckeys = sql_insert_key(sql, newl, i->key, is,
pin);
- list_prepend(l, ckeys);
+ list_append(l, ckeys);
}
if (!insert)
insert = is;
@@ -3212,9 +3212,9 @@ rel2bin_insert( mvc *sql, sql_rel *rel,
if (!insert)
return NULL;
- l = list_append(l, stmt_list(sql->sa, newl));
if (constraint)
sql_insert_check_null(sql, t, newl, l);
+ l = list_append(l, stmt_list(sql->sa, newl));
if (!sql_insert_triggers(sql, t, l))
return sql_error(sql, 02, "INSERT INTO: triggers failed for
table '%s'", t->base.name);
if (insert->op1->nrcols == 0) {
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -44,7 +44,7 @@ int digits2bits(int digits)
else if (digits < 5)
return 16;
else if (digits <= 8)
- return 28;
+ return 27;
else if (digits < 10)
return 32;
else if (digits < 17)
@@ -74,9 +74,9 @@ int bits2digits(int bits)
return 6;
else if (bits < 24)
return 7;
- else if (bits < 27)
+ else if (bits <= 27)
return 8;
- else if (bits < 30)
+ else if (bits <= 30)
return 9;
else if (bits <= 32)
return 10;
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -12,3 +12,4 @@ rank_rewrite.Bug-3890
HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953
update_crash.Bug-3954
merge_project.Bug-3955
+decimal_vs_integer.Bug-3941
diff --git a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql
@@ -0,0 +1,7 @@
+
+start transaction;
+create table tmp(i decimal(8));
+explain select count(*) from tmp where i = 20160222;
+explain select count(*) from tmp where i = '20160222';
+explain select count(*) from tmp where i = 201602221;
+
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'decimal_vs_integer.Bug-3941` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 15:01:29 >
+# 15:01:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37542" "--set"
"mapi_usock=/var/tmp/mtest-23330/.s.monetdb.37542" "--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"
+# 15:01:29 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-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 = 37542
+# cmdline opt mapi_usock = /var/tmp/mtest-23330/.s.monetdb.37542
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 15:01:30 >
+# 15:01:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23330" "--port=37542"
+# 15:01:30 >
+
+
+# 15:01:30 >
+# 15:01:30 > "Done."
+# 15:01:30 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'decimal_vs_integer.Bug-3941` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 15:01:29 >
+# 15:01:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37542" "--set"
"mapi_usock=/var/tmp/mtest-23330/.s.monetdb.37542" "--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"
+# 15:01:29 >
+
+# MonetDB 5 server v11.21.12
+# 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:37542/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23330/.s.monetdb.37542
+# 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.
+
+# 15:01:30 >
+# 15:01:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23330" "--port=37542"
+# 15:01:30 >
+
+#start transaction;
+#create table tmp(i decimal(8));
+#explain select count(*) from tmp where i = 20160222;
+% .explain # table_name
+% mal # name
+% 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_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",64,0,7,X_14);
+end user.s2_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
+#explain select count(*) from tmp where i = '20160222';
+% .explain # table_name
+% mal # name
+% 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_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",64,0,7,X_16);
+end user.s3_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
+#explain select count(*) from tmp where i = 201602221;
+% .explain # table_name
+% mal # name
+% 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_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_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",64,0,7,X_16);
+end user.s4_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
+
+# 15:01:30 >
+# 15:01:30 > "Done."
+# 15:01:30 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
