Changeset: 929687be4528 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=929687be4528
Added Files:
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128
Modified Files:
gdk/gdk_storage.c
gdk/gdk_system.h
sql/test/BugTracker-2019/Tests/All
Branch: Apr2019
Log Message:
merged
diffs (truncated from 353 to 300 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -745,6 +745,7 @@ BATsave(BAT *bd)
gdk_return err = GDK_SUCCEED;
const char *nme;
BAT bs;
+ Heap vhs;
BAT *b = bd;
BATcheck(b, "BATsave", GDK_FAIL);
@@ -764,16 +765,12 @@ BATsave(BAT *bd)
/* copy the descriptor to a local variable in order to let our
* messing in the BAT descriptor not affect other threads that
* only read it. */
- bs = *BBP_desc(b->batCacheid);
- /* fix up internal pointers */
+ bs = *b;
b = &bs;
if (b->tvheap) {
- b->tvheap = GDKmalloc(sizeof(Heap));
- if (b->tvheap == NULL) {
- return GDK_FAIL;
- }
- *b->tvheap = *bd->tvheap;
+ vhs = *bd->tvheap;
+ b->tvheap = &vhs;
}
/* start saving data */
@@ -781,14 +778,12 @@ BATsave(BAT *bd)
if (!b->batCopiedtodisk || b->batDirtydesc || b->theap.dirty)
if (err == GDK_SUCCEED && b->ttype)
err = HEAPsave(&b->theap, nme, "tail");
- if (b->tvheap && (!b->batCopiedtodisk || b->batDirtydesc ||
b->tvheap->dirty))
- if (b->ttype && b->tvarsized) {
- if (err == GDK_SUCCEED)
- err = HEAPsave(b->tvheap, nme, "theap");
- }
-
- if (b->tvheap)
- GDKfree(b->tvheap);
+ if (b->tvheap
+ && (!b->batCopiedtodisk || b->batDirtydesc || b->tvheap->dirty)
+ && b->ttype
+ && b->tvarsized
+ && err == GDK_SUCCEED)
+ err = HEAPsave(b->tvheap, nme, "theap");
if (err == GDK_SUCCEED) {
bd->batCopiedtodisk = true;
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -440,12 +440,11 @@ typedef struct MT_Lock {
_DBG_LOCK_COUNT_0(l); \
if (!MT_lock_try(l)) { \
/* we didn't get the lock */ \
- int _spincnt = 0; \
+ unsigned _spincnt = 0; \
_DBG_LOCK_CONTENTION(l); \
MT_thread_setlockwait(l); \
do { \
- if (++_spincnt == 2048) { \
- _spincnt = 0; \
+ if ((++_spincnt & 2047) == 0) { \
_DBG_LOCK_SLEEP(l); \
MT_sleep_ms(1); \
} \
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -24,3 +24,4 @@ prepare-non-existing-function.Bug-6725
select-distinct.Bug-6728
table-duplicate-column.Bug-6729
view-too-few-rows.Bug-6736
+sum-over-hge.Bug.6738
diff --git a/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql
b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql
@@ -0,0 +1,16 @@
+-- no cast to bigint (from hugeint) since the use of hugeint was part of the
bug
+
+select foo,
+ sum(foo) over () as s1,
+ 1.0 * sum(foo) over () as s2,
+ 1.0 * cast(sum(foo) over () as float) as s3
+ from (select 7 as foo union all select 3 as foo) as t;
+
+select foo,
+ sum(foo) over () / 2
+ from (select 7 as foo union all select 3 as foo) as t;
+
+select foo,
+ sum(foo) over (order by foo) as sumsum1,
+ 1.0 * sum(foo) over (order by foo) as cumsum2
+ from (values (1),(2),(3),(4),(5),(6)) as t(foo);
diff --git a/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err
b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err
@@ -0,0 +1,33 @@
+stderr of test 'sum-over-hge.Bug.6738` in directory 'sql/test/BugTracker-2019`
itself:
+
+
+# 17:10:55 >
+# 17:10:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39988" "--set"
"mapi_usock=/var/tmp/mtest-27118/.s.monetdb.39988" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:10:55 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
+# 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 = 39988
+# cmdline opt mapi_usock = /var/tmp/mtest-27118/.s.monetdb.39988
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 17:10:55 >
+# 17:10:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27118" "--port=39988"
+# 17:10:55 >
+
+
+# 17:10:56 >
+# 17:10:56 > "Done."
+# 17:10:56 >
+
diff --git a/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out
b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out
@@ -0,0 +1,101 @@
+stdout of test 'sum-over-hge.Bug.6738` in directory 'sql/test/BugTracker-2019`
itself:
+
+
+# 17:13:59 >
+# 17:13:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30631" "--set"
"mapi_usock=/var/tmp/mtest-29714/.s.monetdb.30631" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:13:59 >
+
+# MonetDB 5 server v11.33.4 (hg id: 4904034be0e3+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit
+# Found 62.693 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:30631/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29714/.s.monetdb.30631
+# 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: 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_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: 40_geom.sql
+# loading sql script: 40_json.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: 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: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:14:00 >
+# 17:14:00 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29714" "--port=30631"
+# 17:14:00 >
+
+#select foo,
+# sum(foo) over () as s1,
+# 1.0 * sum(foo) over () as s2,
+# 1.0 * cast(sum(foo) over () as float) as s3
+# from (select 7 as foo union all select 3 as foo) as t;
+% .t, .L20, .L25, .L33 # table_name
+% foo, s1, s2, s3 # name
+% tinyint, bigint, decimal, double # type
+% 1, 2, 20, 24 # length
+[ 7, 10, 10.00, 10 ]
+[ 3, 10, 10.00, 10 ]
+#select foo,
+# sum(foo) over () / 2
+# from (select 7 as foo union all select 3 as foo) as t;
+% .t, .L20 # table_name
+% foo, L20 # name
+% tinyint, bigint # type
+% 1, 1 # length
+[ 7, 5 ]
+[ 3, 5 ]
+#select foo,
+# sum(foo) over (order by foo) as sumsum1,
+# 1.0 * sum(foo) over (order by foo) as cumsum2
+# from (values (1),(2),(3),(4),(5),(6)) as t(foo);
+% .t, .L7, .L14 # table_name
+% foo, sumsum1, cumsum2 # name
+% tinyint, bigint, decimal # type
+% 1, 2, 20 # length
+[ 1, 1, 1.00 ]
+[ 2, 3, 3.00 ]
+[ 3, 6, 6.00 ]
+[ 4, 10, 10.00 ]
+[ 5, 15, 15.00 ]
+[ 6, 21, 21.00 ]
+
+# 17:14:00 >
+# 17:14:00 > "Done."
+# 17:14:00 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128
b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128
@@ -0,0 +1,105 @@
+stdout of test 'sum-over-hge.Bug.6738` in directory 'sql/test/BugTracker-2019`
itself:
+
+
+# 17:16:28 >
+# 17:16:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35720" "--set"
"mapi_usock=/var/tmp/mtest-528/.s.monetdb.35720" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:16:28 >
+
+# MonetDB 5 server v11.33.4 (hg id: 4904034be0e3+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 62.693 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:39988/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27118/.s.monetdb.39988
+# 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: 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_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: 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
