Changeset: 546a6cc20772 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=546a6cc20772 Added Files: sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out Modified Files: sql/backends/monet5/sql_fround_impl.h sql/test/BugTracker-2014/Tests/All Branch: Oct2014 Log Message:
Fix bug 3562 + added test. You also need to set the revsorted property! diffs (182 lines): diff --git a/sql/backends/monet5/sql_fround_impl.h b/sql/backends/monet5/sql_fround_impl.h --- a/sql/backends/monet5/sql_fround_impl.h +++ b/sql/backends/monet5/sql_fround_impl.h @@ -117,6 +117,7 @@ bat_dec_round_wrap(bat *_res, bat *_v, T res->T->nil = !nonil; res->tdense = FALSE; res->tsorted = v->tsorted; + res->trevsorted = v->trevsorted; BATkey(BATmirror(res), FALSE); /* release argument BAT descriptors */ @@ -232,6 +233,7 @@ bat_round_wrap(bat *_res, bat *_v, bte * res->T->nil = !nonil; res->tdense = FALSE; res->tsorted = v->tsorted; + res->trevsorted = v->trevsorted; BATkey(BATmirror(res), FALSE); /* release argument BAT descriptors */ diff --git a/sql/test/BugTracker-2014/Tests/All b/sql/test/BugTracker-2014/Tests/All --- a/sql/test/BugTracker-2014/Tests/All +++ b/sql/test/BugTracker-2014/Tests/All @@ -38,3 +38,4 @@ ifthenelse.Bug-3546 subselect-reverse.Bug-3552 orderby_on_constant.Bug-3554 div_by_zero_in_return.Bug-3555 +round-sorted.Bug-3562 diff --git a/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql @@ -0,0 +1,11 @@ +start transaction; + +CREATE TABLE FLOAT8_TBL(f1 double); +INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200'); +INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e-200'); +SELECT * FROM FLOAT8_TBL f; +SELECT f.f1, round(f.f1, 0) AS round_f1 FROM FLOAT8_TBL f; +INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200'); +SELECT f.f1, round(f.f1, 0) AS round_f1 FROM FLOAT8_TBL f; + +rollback; diff --git a/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err @@ -0,0 +1,37 @@ +stderr of test 'round-sorted.Bug-3562` in directory 'sql/test/BugTracker-2014` itself: + + +# 17:08:28 > +# 17:08:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30726" "--set" "mapi_usock=/var/tmp/mtest-29597/.s.monetdb.30726" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 17:08:28 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/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 = 30726 +# cmdline opt mapi_usock = /var/tmp/mtest-29597/.s.monetdb.30726 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 17:08:29 > +# 17:08:29 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29597" "--port=30726" +# 17:08:29 > + + +# 17:08:29 > +# 17:08:29 > "Done." +# 17:08:29 > + diff --git a/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out @@ -0,0 +1,92 @@ +stdout of test 'round-sorted.Bug-3562` in directory 'sql/test/BugTracker-2014` itself: + + +# 17:08:28 > +# 17:08:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30726" "--set" "mapi_usock=/var/tmp/mtest-29597/.s.monetdb.30726" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 17:08:28 > + +# MonetDB 5 server v11.19.0 (hg id: af71e8af1a6d+) +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.590 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://madrid.ins.cwi.nl:30726/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29597/.s.monetdb.30726 +# MonetDB/GIS module loaded +# MonetDB/SQL 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: 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: 26_sysmon.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 41_jsonstore.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 99_system.sql + +# 17:08:29 > +# 17:08:29 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29597" "--port=30726" +# 17:08:29 > + +#start transaction; +#CREATE TABLE FLOAT8_TBL(f1 double); +#INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200'); +[ 1 ] +#INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e-200'); +[ 1 ] +#SELECT * FROM FLOAT8_TBL f; +% sys.f # table_name +% f1 # name +% double # type +% 24 # length +[ 1.23456789e+200 ] +[ 1.23456789e-200 ] +#SELECT f.f1, round(f.f1, 0) AS round_f1 FROM FLOAT8_TBL f; +% sys.f, sys.L # table_name +% f1, round_f1 # name +% double, double # type +% 24, 24 # length +[ 1.23456789e+200, 1.23456789e+200 ] +[ 1.23456789e-200, 0 ] +#INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200'); +[ 1 ] +#SELECT f.f1, round(f.f1, 0) AS round_f1 FROM FLOAT8_TBL f; +% sys.f, sys.L # table_name +% f1, round_f1 # name +% double, double # type +% 24, 24 # length +[ 1.23456789e+200, 1.23456789e+200 ] +[ 1.23456789e-200, 0 ] +[ 1.23456789e+200, 1.23456789e+200 ] +#rollback; + +# 17:08:29 > +# 17:08:29 > "Done." +# 17:08:29 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list