Changeset: 176ea6bea667 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=176ea6bea667
Added Files:
sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql
sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err
sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out
Modified Files:
sql/backends/monet5/sql_rank.c
sql/test/BugTracker-2020/Tests/All
Branch: Nov2019
Log Message:
Added test and fix for bug 6827, ie reset accumulator variable after each
partition
diffs (205 lines):
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -585,6 +585,7 @@ SQLcume_dist(Client cntxt, MalBlkPtr mb,
if (*np) {
ncnt = no - bo2;
cnt_cast = (dbl) ncnt;
+ j = 0;
for (; bo2<no; bo2++) {
if (*bo2) {
j += (bo2 -
bo1);
@@ -597,6 +598,7 @@ SQLcume_dist(Client cntxt, MalBlkPtr mb,
*rb = 1;
}
}
+ j = 0;
ncnt = no - bo2;
cnt_cast = (dbl) ncnt;
for (; bo2<no; bo2++) {
diff --git a/sql/test/BugTracker-2020/Tests/All
b/sql/test/BugTracker-2020/Tests/All
--- a/sql/test/BugTracker-2020/Tests/All
+++ b/sql/test/BugTracker-2020/Tests/All
@@ -4,3 +4,4 @@ alter-table-add-column.Bug-6816
analyze-stream-table.Bug-6817
KNOWNFAIL?select-where-in-rtrim-crash.Bug-6818
NOT_WIN32&HAVE_LIBR&HAVE_LIBPY3?functions-not-persist.Bug-6819
+cume-dist-wrong-results.Bug-6827
diff --git
a/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql
b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.sql
@@ -0,0 +1,19 @@
+START TRANSACTION;
+create table employees (dep varchar(10), name varchar(20), salary double);
+insert into employees values
+ ('mgmt', 'Smith',81),
+ ('dev', 'Jones',55),
+ ('sls', 'Williams',55),
+ ('sls', 'Taylor',62),
+ ('dev', 'Brown',62),
+ ('mgmt', 'Davies',84),
+ ('sls', 'Evans',87),
+ ('sls', 'Wilson',72),
+ ('sls', 'Thomas',72),
+ ('mgmt', 'Johnson',100);
+
+SELECT dep, name, salary, CUME_DIST() OVER (partition by dep ORDER BY salary)
cume_dist_val FROM employees;
+
+SELECT dep, name, salary, CUME_DIST() OVER (PARTITION BY dep) cume_dist_val
FROM employees;
+
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err
b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'cume-dist-wrong-results.Bug-6827` in directory
'sql/test/BugTracker-2020` itself:
+
+
+# 16:08:24 >
+# 16:08:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33653" "--set"
"mapi_usock=/var/tmp/mtest-135267/.s.monetdb.33653" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Nov2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2020"
"--set" "embedded_c=true"
+# 16:08:24 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Nov2019/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = 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 = 33653
+# cmdline opt mapi_usock = /var/tmp/mtest-135267/.s.monetdb.33653
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Nov2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2020
+# cmdline opt embedded_c = true
+
+# 16:08:25 >
+# 16:08:25 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-135267" "--port=33653"
+# 16:08:25 >
+
+
+# 16:08:25 >
+# 16:08:25 > "Done."
+# 16:08:25 >
+
diff --git
a/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out
b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/cume-dist-wrong-results.Bug-6827.stable.out
@@ -0,0 +1,114 @@
+stdout of test 'cume-dist-wrong-results.Bug-6827` in directory
'sql/test/BugTracker-2020` itself:
+
+
+# 16:08:24 >
+# 16:08:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33653" "--set"
"mapi_usock=/var/tmp/mtest-135267/.s.monetdb.33653" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Nov2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2020"
"--set" "embedded_c=true"
+# 16:08:24 >
+
+# MonetDB 5 server v11.35.10 (hg id: f58d90e32322+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2020', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.498 GiB available main-memory of which we use 12.631 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://localhost.localdomain:33653/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-135267/.s.monetdb.33653
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.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_views.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_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 61_wlcr.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
+# MonetDB/SQL module loaded
+
+# 16:08:25 >
+# 16:08:25 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-135267" "--port=33653"
+# 16:08:25 >
+
+#START TRANSACTION;
+#create table employees (dep varchar(10), name varchar(20), salary double);
+#insert into employees values
+# ('mgmt', 'Smith',81),
+# ('dev', 'Jones',55),
+# ('sls', 'Williams',55),
+# ('sls', 'Taylor',62),
+# ('dev', 'Brown',62),
+# ('mgmt', 'Davies',84),
+# ('sls', 'Evans',87),
+# ('sls', 'Wilson',72),
+# ('sls', 'Thomas',72),
+# ('mgmt', 'Johnson',100);
+[ 10 ]
+#SELECT dep, name, salary, CUME_DIST() OVER (partition by dep ORDER BY salary)
cume_dist_val FROM employees;
+% sys.employees, sys.employees, sys.employees, sys.L4 # table_name
+% dep, name, salary, cume_dist_val # name
+% varchar, varchar, double, double # type
+% 4, 8, 24, 24 # length
+[ "dev", "Jones", 55, 0.5 ]
+[ "dev", "Brown", 62, 1 ]
+[ "mgmt", "Smith", 81, 0.3333333333 ]
+[ "mgmt", "Davies", 84, 0.6666666667 ]
+[ "mgmt", "Johnson", 100, 1 ]
+[ "sls", "Williams", 55, 0.2 ]
+[ "sls", "Taylor", 62, 0.4 ]
+[ "sls", "Wilson", 72, 0.8 ]
+[ "sls", "Thomas", 72, 0.8 ]
+[ "sls", "Evans", 87, 1 ]
+#SELECT dep, name, salary, CUME_DIST() OVER (PARTITION BY dep) cume_dist_val
FROM employees;
+% sys.employees, sys.employees, sys.employees, sys.L4 # table_name
+% dep, name, salary, cume_dist_val # name
+% varchar, varchar, double, double # type
+% 4, 8, 24, 24 # length
+[ "dev", "Jones", 55, 1 ]
+[ "dev", "Brown", 62, 1 ]
+[ "mgmt", "Smith", 81, 1 ]
+[ "mgmt", "Davies", 84, 1 ]
+[ "mgmt", "Johnson", 100, 1 ]
+[ "sls", "Williams", 55, 1 ]
+[ "sls", "Taylor", 62, 1 ]
+[ "sls", "Evans", 87, 1 ]
+[ "sls", "Wilson", 72, 1 ]
+[ "sls", "Thomas", 72, 1 ]
+#ROLLBACK;
+
+# 16:08:25 >
+# 16:08:25 > "Done."
+# 16:08:25 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
