Changeset: 1ee88064b7f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ee88064b7f2
Added Files:
sql/backends/monet5/Tests/pyloader06.stable.out.32bit
sql/backends/monet5/Tests/pyloader07.stable.out.32bit
Modified Files:
gdk/gdk_aggr.c
monetdb5/optimizer/Tests/manifold2.stable.out.single
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/12.stable.out
sql/benchmarks/tpch/LOCKED/Tests/16.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/12.stable.out
sql/benchmarks/tpch/Tests/16.stable.out
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/19.stable.out
sql/benchmarks/tpch/Tests/22.stable.out
sql/server/rel_optimizer.c
sql/test/emptydb/Tests/check.stable.out.32bit
Branch: default
Log Message:
merged with Jul2017
diffs (truncated from 472 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2799,7 +2799,8 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
nils++;
} else {
/* round *down* to nearest integer */
- qindex = r + p - (BUN) (p + 0.5 - (p - r - 1) *
quantile);
+ double f = (p - r - 1) * quantile;
+ qindex = r + p - (BUN) (p + 0.5 - f);
/* be a little paranoid about the index */
assert(qindex >= r && qindex < p);
v = BUNtail(bi, qindex);
@@ -2854,11 +2855,13 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
v = nil;
nils++;
} else {
+ double f;
bi = bat_iterator(b);
/* round (p-r-1)*quantile *down* to nearest
* integer (i.e., 1.49 and 1.5 are rounded to
* 1, 1.51 is rounded to 2) */
- index = r + p - (BUN) (p + 0.5 - (p - r - 1) *
quantile);
+ f = (p - r - 1) * quantile;
+ index = r + p - (BUN) (p + 0.5 - f);
if (ords)
index = ords[index] - b->hseqbase;
else
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out.single
b/monetdb5/optimizer/Tests/manifold2.stable.out.single
--- a/monetdb5/optimizer/Tests/manifold2.stable.out.single
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out.single
@@ -26,18 +26,18 @@ Ready.
# 12:52:57 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23074" "--port=30414"
# 12:52:57 >
-function user.tst(b:bat[:dbl],b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
+function user.tst(b:bat[:dbl], b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
c:lng := aggr.count(b:bat[:dbl]); #[1] (0) ALGcount_bat 3 <- 1
c2:lng := aggr.count(b2:bat[:dbl]); #[2] (0) ALGcount_bat 4 <- 2
X_3:bat[:dbl] := bat.new(nil:dbl); #[3] (0) CMDBATnew 9 <- 10
-barrier (X_6:oid,X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
- X_9:dbl := algebra.fetch(b2:bat[:dbl],X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
- X_11:dbl := calc.max(X_7:dbl,X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
- bat.append(X_3:bat[:dbl],X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
- redo (X_6:oid,X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
-exit (X_6:oid,X_7:dbl); #[9] (0) 12 13
+barrier (X_6:oid, X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
+ X_9:dbl := algebra.fetch(b2:bat[:dbl], X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
+ X_11:dbl := calc.max(X_7:dbl, X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
+ bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
+ redo (X_6:oid, X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
+exit (X_6:oid, X_7:dbl); #[9] (0) 12 13
z:bat[:dbl] := X_3:bat[:dbl]; #[10] (0) 5 <- 9
- io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
+ io.print(z:bat[:dbl], b:bat[:dbl], b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
end user.tst; #[12] (0)
#multiplex actions= 1 time=101 usec
#[ 1] b (0,0,0) = :bat[:dbl]
@@ -51,18 +51,18 @@ end user.tst;
#[13] X_7 (0,0,0) = :dbl
#[15] X_9 (0,0,0) = :dbl
#[17] X_11 (0,0,0) = :dbl
-function user.tst(b:bat[:dbl],b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
+function user.tst(b:bat[:dbl], b2:bat[:dbl]):void; #[0] (0) 0 <- 1 2
c:lng := aggr.count(b:bat[:dbl]); #[1] (0) ALGcount_bat 3 <- 1
c2:lng := aggr.count(b2:bat[:dbl]); #[2] (0) ALGcount_bat 4 <- 2
X_3:bat[:dbl] := bat.new(nil:dbl); #[3] (0) CMDBATnew 9 <- 10
-barrier (X_6:oid,X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
- X_9:dbl := algebra.fetch(b2:bat[:dbl],X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
- X_11:dbl := calc.max(X_7:dbl,X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
- bat.append(X_3:bat[:dbl],X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
- redo (X_6:oid,X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
-exit (X_6:oid,X_7:dbl); #[9] (0) 12 13
+barrier (X_6:oid, X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
+ X_9:dbl := algebra.fetch(b2:bat[:dbl], X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
+ X_11:dbl := calc.max(X_7:dbl, X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
+ bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
+ redo (X_6:oid, X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
+exit (X_6:oid, X_7:dbl); #[9] (0) 12 13
z:bat[:dbl] := X_3:bat[:dbl]; #[10] (0) 5 <- 9
- io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
+ io.print(z:bat[:dbl], b:bat[:dbl], b2:bat[:dbl]); #[11] (0) IOtable 8 <-
5 1 2
end user.tst; #[12] (0)
#multiplex actions= 1 time=101 usec
diff --git a/sql/backends/monet5/Tests/pyloader06.stable.out.32bit
b/sql/backends/monet5/Tests/pyloader06.stable.out.32bit
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyloader06.stable.out.32bit
@@ -0,0 +1,89 @@
+stdout of test 'pyloader06` in directory 'sql/backends/monet5` itself:
+
+
+# 15:10:43 >
+# 15:10:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39055" "--set"
"mapi_usock=/var/tmp/mtest-23860/.s.monetdb.39055" "--set" "monet_prompt="
"--forcemito" "--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 15:10:43 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin15.6.0/64bit with 128bit integers
+# Found 8.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://dhcp-154.eduroam.cwi.nl:39055/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23860/.s.monetdb.39055
+# MonetDB/SQL module loaded
+# MonetDB/Python 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: 17_temporal.sql
+# loading sql script: 18_index.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: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.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: 72_fits.sql
+# loading sql script: 74_netcdf.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: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 15:10:44 >
+# 15:10:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23860" "--port=39055"
+# 15:10:44 >
+
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+# return
+#};
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+# return {'a': 1, 'b': 2, 'c': 3}
+#};
+#SELECT * FROM pyloader06table;
+% sys.pyloader06table, sys.pyloader06table, sys.pyloader06table # table_name
+% a, c, b # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 1, 3, 2 ]
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+# return 3
+#};
+#ROLLBACK;
+
+# 15:10:44 >
+# 15:10:44 > "Done."
+# 15:10:44 >
+
diff --git a/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
b/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
@@ -0,0 +1,100 @@
+stdout of test 'pyloader07` in directory 'sql/backends/monet5` itself:
+
+
+# 15:06:46 >
+# 15:06:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31590" "--set"
"mapi_usock=/var/tmp/mtest-46511/.s.monetdb.31590" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 15:06:46 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin15.5.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://dakar.da.cwi.nl:31590/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-46511/.s.monetdb.31590
+# MonetDB/SQL module loaded
+# MonetDB/Python 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: 17_temporal.sql
+# loading sql script: 18_index.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: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.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_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.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: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 15:06:46 >
+# 15:06:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-46511" "--port=31590"
+# 15:06:46 >
+
+#START TRANSACTION;
+#CREATE LOADER pyloader07() LANGUAGE PYTHON {
+# _emit.emit({'s': 33, 't': 42});
+#
+#};
+#SELECT * FROM pyloader07table;
+% sys.pyloader07table, sys.pyloader07table # table_name
+% s, t # name
+% int, int # type
+% 2, 2 # length
+[ 33, 42 ]
+#DROP TABLE pyloader07table;
+#DROP LOADER pyloader07;
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE TABLE tstamp(d DATE, s TIME, t TIMESTAMP);
+#CREATE LOADER pyloader07() LANGUAGE PYTHON {
+# _emit.emit({'d': '2014-05-20', 's': '00:02:30', 't': '2014-05-20
00:02:30'});
+# _emit.emit({'d': ['2014-05-20'], 's': ['00:02:30'], 't': ['2014-05-20
00:02:30']});
+#};
+#COPY LOADER INTO tstamp FROM pyloader07();
+[ 2 ]
+#SELECT * FROM tstamp;
+% sys.tstamp, sys.tstamp, sys.tstamp # table_name
+% d, s, t # name
+% date, time, timestamp # type
+% 10, 8, 26 # length
+[ 2014-05-20, 00:02:30, 2014-05-20 00:02:30.000000 ]
+[ 2014-05-20, 00:02:30, 2014-05-20 00:02:30.000000 ]
+#DROP TABLE tstamp;
+#DROP LOADER pyloader07;
+#ROLLBACK;
+
+# 15:06:46 >
+# 15:06:46 > "Done."
+# 15:06:46 >
+
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -1225,10 +1225,10 @@ Ready.
# select
# *
# from
-% sys.custsale, sys.L17, sys.L22 # table_name
+% sys.custsale, sys.L21, sys.L24 # table_name
% cntrycode, numcust, totacctbal # name
-% char, bigint, decimal # type
-% 15, 2, 20 # length
+% clob, bigint, decimal # type
+% 2, 2, 20 # length
[ "13", 10, 75359.29 ]
[ "17", 8, 62288.98 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
