Changeset: 346d539094b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=346d539094b3
Added Files:
sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.sql
sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.err
sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.c
sql/backends/monet5/sql.mx
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
merge with Feb2013 branch
diffs (295 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1398,15 +1398,15 @@ typedef var_t stridx_t; /* TODO: should
#if SIZEOF_VAR_T == 8
#define VarHeapValRaw(b,p,w) \
- ((w)==1 ? (var_t)*((unsigned char *)(b)+(p))+GDK_VAROFFSET : \
- ((w)==2 ? (var_t)*((unsigned short *)(b)+(p))+GDK_VAROFFSET : \
- ((w)==4 ? (var_t)*((unsigned int *)(b)+(p)) : \
- *((var_t *)(b)+(p)))))
+ ((w) == 1 ? (var_t) ((unsigned char *) (b))[p] + GDK_VAROFFSET : \
+ (w) == 2 ? (var_t) ((unsigned short *) (b))[p] + GDK_VAROFFSET : \
+ (w) == 4 ? (var_t) ((unsigned int *) (b))[p] : \
+ ((var_t *) (b))[p])
#else
#define VarHeapValRaw(b,p,w) \
- ((w)==1 ? (var_t)*((unsigned char *)(b)+(p))+GDK_VAROFFSET : \
- ((w)==2 ? (var_t)*((unsigned short *)(b)+(p))+GDK_VAROFFSET : \
- *((var_t *)(b)+(p))))
+ ((w) == 1 ? (var_t) ((unsigned char *) (b))[p] + GDK_VAROFFSET : \
+ (w) == 2 ? (var_t) ((unsigned short *) (b))[p] + GDK_VAROFFSET : \
+ ((var_t *) (b))[p])
#endif
#define VarHeapVal(b,p,w) ((size_t) VarHeapValRaw(b,p,w) << GDK_VARSHIFT)
#define BUNhvaroff(bi,p) VarHeapVal((bi).b->H->heap.base, (p),
(bi).b->H->width)
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1434,14 +1434,14 @@ BBPdump(void)
HEAPvmsize(&b->H->heap),
HEAPmemsize(b->H->vheap),
HEAPvmsize(b->H->vheap),
- b->H->hash ? HEAPmemsize(b->H->hash->heap) : 0,
- b->H->hash ? HEAPvmsize(b->H->hash->heap) : 0,
+ b->H->hash && b->H->hash != (Hash *) -1 ?
HEAPmemsize(b->H->hash->heap) : 0,
+ b->H->hash && b->H->hash != (Hash *) -1 ?
HEAPvmsize(b->H->hash->heap) : 0,
HEAPmemsize(&b->T->heap),
HEAPvmsize(&b->T->heap),
HEAPmemsize(b->T->vheap),
HEAPvmsize(b->T->vheap),
- b->T->hash ? HEAPmemsize(b->T->hash->heap) : 0,
- b->T->hash ? HEAPvmsize(b->T->hash->heap) : 0);
+ b->T->hash && b->T->hash != (Hash *) -1 ?
HEAPmemsize(b->T->hash->heap) : 0,
+ b->T->hash && b->T->hash != (Hash *) -1 ?
HEAPvmsize(b->T->hash->heap) : 0);
if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
cmem += HEAPmemsize(&b->H->heap);
cvm += HEAPvmsize(&b->H->heap);
@@ -1460,7 +1460,7 @@ BBPdump(void)
vm += HEAPvmsize(b->H->vheap);
}
}
- if (b->H->hash) {
+ if (b->H->hash && b->H->hash != (Hash *) -1) {
if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
cmem += HEAPmemsize(b->H->hash->heap);
cvm += HEAPvmsize(b->H->hash->heap);
@@ -1485,7 +1485,7 @@ BBPdump(void)
vm += HEAPvmsize(b->T->vheap);
}
}
- if (b->T->hash) {
+ if (b->T->hash && b->T->hash != (Hash *) -1) {
if (BBP_logical(i) && BBP_logical(i)[0] == '.') {
cmem += HEAPmemsize(b->T->hash->heap);
cvm += HEAPvmsize(b->T->hash->heap);
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -5537,7 +5537,7 @@ str @2_dec2_@1( @1 *res, int *s1, @2 *v
always fit */
r = (@1)*v;
if (scale)
- r = (@1) ((r + h) / scales[scale]);
+ r = (@1) ((r + h * scales[scale - 1]) / scales[scale]);
*res = r;
return(MAL_SUCCEED);
}
@@ -5573,7 +5573,7 @@ str
if (s2 > s1)
r *= (@1) scales[s2 - s1];
else if (s2 != s1)
- r = (@1) ((r + h) / scales[s1 - s2]);
+ r = (@1) ((r + h * scales[s1 - s2 - 1]) / scales[s1 - s2]);
*res = r;
return(MAL_SUCCEED);
}
@@ -5611,7 +5611,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
if ( b->T->nonil){
if (scale)
for (; p<q; p++, o++)
- *o = (@1) ((*p + ((*p<0)?-5:5)) /
scales[scale]);
+ *o = (@1) ((*p + (*p<0?-5:5) *
scales[scale-1]) / scales[scale]);
else
for (; p<q; p++, o++)
*o = (@1) (*p);
@@ -5621,7 +5621,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
*o = @1_nil;
bn->T->nonil= FALSE;
} else if (scale) {
- *o = (@1) ((*p + ((*p<0)?-5:5)) /
scales[scale]);
+ *o = (@1) ((*p + (*p<0?-5:5) *
scales[scale-1]) / scales[scale]);
} else {
*o = (@1) (*p);
}
@@ -6018,7 +6018,7 @@ str
}
if (scale)
- val = (val+h)/scales[scale];
+ val = (val + h * scales[scale - 1]) / scales[scale];
/* see if the number fits in the data type */
if (val > GDK_@1_min && val <= GDK_@1_max) {
*res = (@1)val;
@@ -6055,7 +6055,7 @@ str
if(s2 > s1)
val *= scales[s2-s1];
else if (s2 != s1)
- val = (val+h)/scales[s1-s2];
+ val = (val+h*scales[s1-s2-1])/scales[s1-s2];
/* see if the number fits in the data type */
if (val > GDK_@1_min && val <= GDK_@1_max) {
@@ -6101,7 +6101,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
if ( b->T->nonil){
for (; p<q; p++, o++) {
if (scale)
- val = (@2) ((*p+ ((*p<0)?-5:5))/scales[scale]);
+ val = (@2) ((*p+
(*p<0?-5:5)*scales[scale-1])/scales[scale]);
else
val = (@2) (*p);
/* see if the number fits in the data type */
@@ -6120,7 +6120,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
bn->T->nonil= FALSE;
} else {
if (scale)
- val = (@2) (( *p + ((
*p<0)?-5:5))/scales[scale]);
+ val = (@2) (( *p +
(*p<0?-5:5)*scales[scale-1])/scales[scale]);
else
val = (@2) (*p);
/* see if the number fits in the data type */
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
---
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
@@ -38,7 +38,8 @@ FROM
) as TR
JOIN
trans
- ON (TR.rxy = s AND TR.ryz = t);
+ ON (TR.rxy = s AND TR.ryz = t)
+ order by TR.x, TR.z;
Drop index trans_st_idx;
Drop table trans;
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -22,3 +22,4 @@ create_table_with_func.Bug-3286
add_boolean.Bug-3289
prepare-smallint.Bug-3297
psm_functions_and_accessrights.Bug-3300
+decimal-cast.Bug-3310
diff --git a/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.sql
b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.sql
@@ -0,0 +1,4 @@
+SELECT CAST(0.94 AS INTEGER);
+SELECT CAST(0.95 AS INTEGER);
+SELECT CAST(0.49 AS INTEGER);
+SELECT CAST(0.50 AS INTEGER);
diff --git a/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.err
b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'decimal-cast.Bug-3310` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 11:28:36 >
+# 11:28:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35448" "--set"
"mapi_usock=/var/tmp/mtest-12024/.s.monetdb.35448" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 11:28:36 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# 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 = 35448
+# cmdline opt mapi_usock = /var/tmp/mtest-12024/.s.monetdb.35448
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 11:28:36 >
+# 11:28:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12024" "--port=35448"
+# 11:28:36 >
+
+
+# 11:28:37 >
+# 11:28:37 > "Done."
+# 11:28:37 >
+
diff --git a/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out
b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out
@@ -0,0 +1,79 @@
+stdout of test 'decimal-cast.Bug-3310` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 11:28:36 >
+# 11:28:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35448" "--set"
"mapi_usock=/var/tmp/mtest-12024/.s.monetdb.35448" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 11:28:36 >
+
+# MonetDB 5 server v11.15.8 (hg id: 43be2b1e62f7+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:35448/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12024/.s.monetdb.35448
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL 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_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.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: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 11:28:36 >
+# 11:28:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12024" "--port=35448"
+# 11:28:36 >
+
+#SELECT CAST(0.94 AS INTEGER);
+% .L # table_name
+% single_value # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT CAST(0.95 AS INTEGER);
+% .L # table_name
+% single_value # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT CAST(0.49 AS INTEGER);
+% .L # table_name
+% single_value # name
+% int # type
+% 1 # length
+[ 0 ]
+#SELECT CAST(0.50 AS INTEGER);
+% .L # table_name
+% single_value # name
+% int # type
+% 1 # length
+[ 1 ]
+
+# 11:28:37 >
+# 11:28:37 > "Done."
+# 11:28:37 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
