Changeset: 25855a9d3aee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25855a9d3aee
Modified Files:
gdk/gdk_ssort.c
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/server/rel_psm.c
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (172 lines):
diff --git a/gdk/gdk_ssort.c b/gdk/gdk_ssort.c
--- a/gdk/gdk_ssort.c
+++ b/gdk/gdk_ssort.c
@@ -47,8 +47,13 @@ typedef struct {
* most 2 lng's, we don't need to allocate anything. */
void *th;
void *tt;
+#ifdef HAVE_HGE
+ hge tempstorageh[1]; /* 16 bytes should be wide enough ... */
+ hge tempstoraget[1]; /* ... for all our fixed-sized data */
+#else
lng tempstorageh[2]; /* 16 bytes should be wide enough ... */
lng tempstoraget[2]; /* ... for all our fixed-sized data */
+#endif
/* This controls when we get *into* galloping mode. It's
* initialized to MIN_GALLOP. merge_lo and merge_hi tend to
diff --git a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
--- a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
+++ b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
@@ -42,22 +42,22 @@ Ready.
(u'l_suppkey', 262144, 60175)
(u'l_tax', 524288, 60175)
[(u'l_comment', 0), (u'l_commitdate', 0), (u'l_discount', 0),
(u'l_extendedprice', 0), (u'l_linenumber', 0), (u'l_linestatus', 0),
(u'l_orderkey', 0), (u'l_partkey', 0), (u'l_quantity', 0), (u'l_receiptdate',
0), (u'l_returnflag', 0), (u'l_shipdate', 0), (u'l_shipinstruct', 0),
(u'l_shipmode', 0), (u'l_suppkey', 0), (u'l_tax', 0)]
-(u'l_comment', 262144, 0)
-(u'l_commitdate', 262144, 0)
-(u'l_discount', 524288, 0)
-(u'l_extendedprice', 524288, 0)
-(u'l_linenumber', 262144, 0)
-(u'l_linestatus', 65536, 0)
-(u'l_orderkey', 262144, 0)
-(u'l_partkey', 262144, 0)
-(u'l_quantity', 524288, 0)
-(u'l_receiptdate', 262144, 0)
-(u'l_returnflag', 65536, 0)
-(u'l_shipdate', 262144, 0)
-(u'l_shipinstruct', 65536, 0)
-(u'l_shipmode', 65536, 0)
-(u'l_suppkey', 262144, 0)
-(u'l_tax', 524288, 0)
+(u'l_comment', 65536, 0)
+(u'l_commitdate', 65536, 0)
+(u'l_discount', 65536, 0)
+(u'l_extendedprice', 65536, 0)
+(u'l_linenumber', 65536, 0)
+(u'l_linestatus', 0, 0)
+(u'l_orderkey', 65536, 0)
+(u'l_partkey', 65536, 0)
+(u'l_quantity', 65536, 0)
+(u'l_receiptdate', 65536, 0)
+(u'l_returnflag', 0, 0)
+(u'l_shipdate', 65536, 0)
+(u'l_shipinstruct', 0, 0)
+(u'l_shipmode', 0, 0)
+(u'l_suppkey', 65536, 0)
+(u'l_tax', 65536, 0)
# 13:16:20 >
# 13:16:20 > "Done."
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
--- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
@@ -25,22 +25,22 @@ Ready.
# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks"
# 16:01:26 >
-(u'l_comment', 262144, 0)
-(u'l_commitdate', 262144, 0)
-(u'l_discount', 524288, 0)
-(u'l_extendedprice', 524288, 0)
-(u'l_linenumber', 262144, 0)
+(u'l_comment', 65536, 0)
+(u'l_commitdate', 65536, 0)
+(u'l_discount', 65536, 0)
+(u'l_extendedprice', 65536, 0)
+(u'l_linenumber', 65536, 0)
(u'l_linestatus', 0, 0)
-(u'l_orderkey', 262144, 0)
-(u'l_partkey', 262144, 0)
-(u'l_quantity', 524288, 0)
-(u'l_receiptdate', 262144, 0)
+(u'l_orderkey', 65536, 0)
+(u'l_partkey', 65536, 0)
+(u'l_quantity', 65536, 0)
+(u'l_receiptdate', 65536, 0)
(u'l_returnflag', 0, 0)
-(u'l_shipdate', 262144, 0)
+(u'l_shipdate', 65536, 0)
(u'l_shipinstruct', 0, 0)
(u'l_shipmode', 0, 0)
-(u'l_suppkey', 262144, 0)
-(u'l_tax', 524288, 0)
+(u'l_suppkey', 65536, 0)
+(u'l_tax', 65536, 0)
# 16:01:26 >
# 16:01:26 > "Done."
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
--- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
@@ -25,22 +25,22 @@ Ready.
# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks"
# 16:01:26 >
-(u'l_comment', 262144, 0)
-(u'l_commitdate', 262144, 0)
-(u'l_discount', 524288, 0)
-(u'l_extendedprice', 524288, 0)
-(u'l_linenumber', 262144, 0)
+(u'l_comment', 65536, 0)
+(u'l_commitdate', 65536, 0)
+(u'l_discount', 65536, 0)
+(u'l_extendedprice', 65536, 0)
+(u'l_linenumber', 65536, 0)
(u'l_linestatus', 0, 0)
-(u'l_orderkey', 262144, 0)
-(u'l_partkey', 262144, 0)
-(u'l_quantity', 524288, 0)
-(u'l_receiptdate', 262144, 0)
+(u'l_orderkey', 65536, 0)
+(u'l_partkey', 65536, 0)
+(u'l_quantity', 65536, 0)
+(u'l_receiptdate', 65536, 0)
(u'l_returnflag', 0, 0)
-(u'l_shipdate', 262144, 0)
+(u'l_shipdate', 65536, 0)
(u'l_shipinstruct', 0, 0)
(u'l_shipmode', 0, 0)
-(u'l_suppkey', 262144, 0)
-(u'l_tax', 524288, 0)
+(u'l_suppkey', 65536, 0)
+(u'l_tax', 65536, 0)
# 16:01:26 >
# 16:01:26 > "Done."
diff --git
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
---
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
+++
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
@@ -30,7 +30,7 @@ stderr of test 'cannot_use_columns_after
MAPI = (monetdb) /var/tmp/mtest-5110/.s.monetdb.34599
QUERY = select "function", (sum(fv.claim_tb) - sum(fv.used_tb)) * 100 /
toc.total_overcapacity from sys.filer_volumes as fv, (select sum(claim_tb) -
sum(used_tb) as total_overcapacity from sys.filer_volumes) as toc group by
fv."function" order by fv."function";
-ERROR = !SELECT: cannot use non GROUP BY column 'toc.total_overcapacity' in
query results without an aggregate function
+ERROR = !SELECT: no such aggregate 'sql_div'
CODE = 42000
# 20:54:49 >
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1548,8 +1548,8 @@ def returnCode(proc, f = None):
# wait a few seconds for the core to be dumped
time.sleep(10)
if procdebug:
- print('Starting: coredumpctl info %d' % proc.pid)
- p = process.Popen(['coredumpctl', 'info', str(proc.pid)],
+ print('Starting: coredumpctl -q info %d' % proc.pid)
+ p = process.Popen(['coredumpctl', '-q' ,'info',
str(proc.pid)],
stdout = process.PIPE,
stderr = process.PIPE,
universal_newlines = True)
@@ -1570,8 +1570,8 @@ def returnCode(proc, f = None):
# wait a few seconds for the core to be dumped
time.sleep(10)
if procdebug:
- print('Starting: coredumpctl info %d' % proc.pid)
- p = process.Popen(['coredumpctl', 'info', str(proc.pid)],
+ print('Starting: coredumpctl -q info %d' % proc.pid)
+ p = process.Popen(['coredumpctl', '-q' ,'info',
str(proc.pid)],
stdout = process.PIPE,
stderr = process.PIPE,
universal_newlines = True)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
