Changeset: 074d9ec14bc9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=074d9ec14bc9
Added Files:
sql/backends/monet5/UDF/udf/Tests/SingleServer
sql/benchmarks/tpch/LOCKED/Tests/SingleServer
sql/benchmarks/tpch/Tests/SingleServer
sql/jdbc/tests/Tests/SingleServer
sql/odbc/samples/Tests/SingleServer
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
sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.sql
sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.err
sql/test/BugTracker-2020/Tests/window-order-by-extract.Bug-6828.stable.out
sql/test/sys-schema/Tests/SingleServer
Removed Files:
sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat
sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh
sql/benchmarks/tpch/LOCKED/Tests/01-22.reqtests
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.SQL.bat
sql/benchmarks/tpch/Tests/01-22.SQL.sh
sql/benchmarks/tpch/Tests/01-22.reqtests
sql/benchmarks/tpch/Tests/01-22.stable.err
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
Modified Files:
sql/backends/monet5/sql_rank.c
sql/benchmarks/tpch/LOCKED/Tests/All
sql/benchmarks/tpch/Tests/All
sql/server/rel_select.c
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2020/Tests/All
sql/test/analytics/Tests/analytics02.stable.out
Branch: default
Log Message:
Merged with linear-hashing
diffs (truncated from 7211 to 300 lines):
diff --git a/sql/backends/monet5/UDF/udf/Tests/SingleServer
b/sql/backends/monet5/UDF/udf/Tests/SingleServer
new file mode 100644
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
@@ -621,6 +621,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);
@@ -633,6 +634,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/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat
deleted file mode 100755
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@prompt # $t $g
-@echo on
-
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\01.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\02.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\03.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\04.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\05.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\06.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\07.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\08.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\09.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\10.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\11.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\12.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\13.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\14.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\15.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\16.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\17.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\18.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\19.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\20.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\21.sql"
-%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\..\22.sql"
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh
deleted file mode 100755
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.SQL.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../01.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../02.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../03.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../04.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../05.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../06.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../07.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../08.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../09.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../10.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../11.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../12.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../13.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../14.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../15.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../16.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../17.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../18.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../19.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../20.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../21.sql"
-Mlog -x "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/../22.sql"
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.reqtests
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.reqtests
deleted file mode 100644
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.reqtests
+++ /dev/null
@@ -1,6 +0,0 @@
-create
-check0
-load
-check1
-alter
-check2
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
deleted file mode 100644
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
+++ /dev/null
@@ -1,131 +0,0 @@
-stderr of test '01-22` in directory 'sql/benchmarks/tpch/LOCKED` itself:
-
-
-# 12:45:23 >
-# 12:45:23 > Mtimeout -timeout 1500 Mserver
"--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set
"monet_mod_path=/var/tmp/_PREFIX_SQL_GNU_32_d__/lib/MonetDB:/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB"
--set "gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set
"sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set
mapi_port=41160 --set sql_port=55567 --set monet_prompt= --trace
"--dbname=mTests_src_benchmarks_tpch"
"/var/tmp/_BUILD_SQL_GNU_32_d__/src/backends/monet4/sql_server.mil" ; echo ;
echo Over..
-# 12:45:23 >
-
-
-# 12:45:24 >
-# 12:45:24 > Mtimeout -timeout 1380 ./01-22.SQL 01-22
-# 12:45:24 >
-
-
-# 12:45:24 >
-# 12:45:24 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:24 >
-
-
-# 12:45:24 >
-# 12:45:24 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:24 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:25 >
-# 12:45:25 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:25 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:26 >
-# 12:45:26 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:26 >
-
-
-# 12:45:27 >
-# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:27 >
-
-
-# 17:25:22 >
-# 17:25:22 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--host=/var/tmp/mtest-22501 --port=33414 <
/net/madrid/export/scratch1/sjoerd/src/MonetDB/virgin/sql/benchmarks/tpch/LOCKED/../21.sql
-# 17:25:22 >
-
-# 12:45:27 >
-# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:27 >
-
-
-# 12:45:27 >
-# 12:45:27 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=draco
--port=55567 --trace
-# 12:45:27 >
-
-
-# 12:45:27 >
-# 12:45:27 > Done.
-# 12:45:27 >
-
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
deleted file mode 100644
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ /dev/null
@@ -1,1242 +0,0 @@
-stdout of test '01-22` in directory 'sql/benchmarks/tpch/LOCKED` itself:
-
-
-# 15:44:34 >
-# 15:44:34 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=38978 --set
xrpc_port=42914 --set monet_prompt= --trace
"--dbname=mTests_src_benchmarks_tpch" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; echo Over..
-# 15:44:34 >
-
-# MonetDB server v5.4.0, based on kernel v1.22.0
-# Serving database 'mTests_src_benchmarks_tpch'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:38978/
-# MonetDB/SQL module v2.22.0 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 12:35:08 >
-# 12:35:08 > Mtimeout -timeout 1380 ./01-22.SQL 01-22
-# 12:35:08 >
-
-
-# 11:48:05 >
-# 11:48:05 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
-# 11:48:05 >
-
-#select
-# l_returnflag,
-# l_linestatus,
-# sum(l_quantity) as sum_qty,
-# sum(l_extendedprice) as sum_base_price,
-# sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
-# sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
-# avg(l_quantity) as avg_qty,
-# avg(l_extendedprice) as avg_price,
-# avg(l_discount) as avg_disc,
-# count(*) as count_order
-#from
-# lineitem
-#where
-# l_shipdate <= date '1998-12-01' - interval '90' day (3)
-#group by
-# l_returnflag,
-# l_linestatus
-#order by
-# l_returnflag,
-# l_linestatus;
-% sys.lineitem, sys.lineitem, sys.%1, sys.%2, sys.%3, sys.%4, sys.%5,
sys.%6, sys.%7, sys.%10 # table_name
-% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
-% char, char, decimal, decimal, decimal,
decimal, double, double, double, bigint # type
-% 1, 1, 20, 20, 20, 20, 24, 24, 24, 5 #
length
-[ "A", "F", 380456.00, 532348211.65, 505822441.4861,
526165934.000839, 25.57515461, 35785.70931, 0.05008133907, 14876
]
-[ "N", "F", 8971.00, 12384801.37, 11798257.2080,
12282485.056933, 25.77873563, 35588.50968, 0.04775862069, 348
]
-[ "N", "O", 742802.00, 1041502841.45, 989737518.6346,
1029418531.523350, 25.45498783, 35691.12921, 0.04993111956, 29181
]
-[ "R", "F", 381449.00, 534594445.35, 507996454.4067,
528524219.358903, 25.59716817, 35874.00653, 0.04982753993, 14902
]
-
-% sys.supplier, sys.supplier, sys.nation, sys.part,
sys.part, sys.supplier, sys.supplier, sys.supplier # table_name
-% s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address,
s_phone, s_comment # name
-% decimal, char, char, int, char, varchar, char, varchar
# type
-% 17, 25, 25, 4, 25, 39, 15, 95 # length
-[ 4186.95, "Supplier#000000077", "GERMANY", 249,
"Manufacturer#4", "wVtcr0uH3CyrSiWMLsqnB09Syo,UuZxPMeBghlY",
"17-281-345-4863", "the slyly final asymptotes. blithely pending theodoli"
]
-[ 1883.37, "Supplier#000000086", "ROMANIA", 1015,
"Manufacturer#4", "J1fgg5QaqnN", "29-903-665-7065", "cajole
furiously special, final requests: furiously spec" ]
-[ 1687.81, "Supplier#000000017", "ROMANIA", 1634,
"Manufacturer#2", "c2d,ESHRSkK3WYnxpgw6aOqN0q", "29-601-884-9219",
"eep against the furiously bold ideas. fluffily bold packa" ]
-[ 287.16, "Supplier#000000052", "ROMANIA", 323,
"Manufacturer#4", "WCk XCHYzBA1dvJDSol4ZJQQcQN,", "29-974-934-4713",
"dolites are slyly against the furiously regular packages. ironic, final
deposits cajole quickly" ]
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
