Changeset: be5a9838fe23 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be5a9838fe23 Added Files: monetdb5/extras/mal_optimizer_template/Tests/SingleServer monetdb5/extras/rapi/Tests/SingleServer monetdb5/modules/atoms/Tests/SingleServer monetdb5/modules/kernel/Tests/SingleServer monetdb5/scheduler/Tests/SingleServer sql/test/BugTracker-2009/Tests/SingleServer sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py sql/test/BugTracker-2010/Tests/SingleServer sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer sql/test/BugTracker-2011/Tests/SingleServer sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py sql/test/BugTracker-2012/Tests/SingleServer sql/test/BugTracker-2013/Tests/SingleServer sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py sql/test/BugTracker-2014/Tests/SingleServer sql/test/BugTracker-2015/Tests/SingleServer sql/test/BugTracker-2016/Tests/SingleServer sql/test/BugTracker-2017/Tests/SingleServer sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py sql/test/BugTracker-2018/Tests/SingleServer sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py sql/test/BugTracker-2019/Tests/SingleServer sql/test/BugTracker-2020/Tests/SingleServer sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py sql/test/BugTracker/Tests/SingleServer sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py sql/test/Skyserver/bugs/Tests/SingleServer sql/test/UserDump/Tests/SingleServer sql/test/VOC/Tests/SingleServer sql/test/remote/Tests/SingleServer sql/test/rename/Tests/SingleServer sql/test/rename/Tests/rename00.SQL.py sql/test/sql_xml/Tests/SingleServer Removed Files: sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py sql/test/BugTracker/Tests/connect_crash.SF-1436626.py sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py sql/test/rename/Tests/rename00.py Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/rules gdk/libbat.rc libversions monetdb5/mal/mal_import.c monetdb5/optimizer/Tests/SingleServer monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/pyapi/Tests/SingleServer sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py sql/test/merge-partitions/Tests/mergepart23.SQL.py sql/test/merge-partitions/Tests/mergepart23.stable.out sql/test/scripts/Tests/alastair_udf_mergetable_bug.stable.out sql/test/scripts/Tests/fsum.stable.out testing/Mtest.py.in vertoo.data Branch: default Log Message:
Merged with linear-hashing diffs (truncated from 1264 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -758,3 +758,5 @@ 4eb6068f63cf87fc6996daed59fbcc917c8b2881 7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_15 4eb6068f63cf87fc6996daed59fbcc917c8b2881 Nov2019_SP2_release 7186b517a584f0244e20eb7abe61f7a7c0c9ea1b Nov2019_SP2_release +e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_17 +e1c7c70bceb205cf23b8a35179b628563871f949 Nov2019_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -105,7 +105,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Nov2019-SP2/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Nov2019-SP3/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -839,7 +839,7 @@ export CFLAGS # do not use --enable-optimize or --disable-optimize: we don't want # any changes to optimization flags %{configure} \ - --with-rundir=%{_rundir} \ + --with-rundir=%{_rundir}/monetdb \ --enable-assert=no \ --enable-debug=yes \ --enable-developer=no \ @@ -941,6 +941,10 @@ fi %postun -p /sbin/ldconfig %changelog +* Fri Feb 21 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.17-20200221 +- Rebuilt. +- BZ#6827: CUME_DIST window function returns incorrect results + * Mon Feb 17 2020 Sjoerd Mullender <sjo...@acm.org> - 11.35.15-20200217 - Rebuilt. - BZ#6817: running analyze on a schema which contains a stream table diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +monetdb (11.35.17) unstable; urgency=low + + * Rebuilt. + * BZ#6827: CUME_DIST window function returns incorrect results + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 21 Feb 2020 14:22:38 +0100 + monetdb (11.35.15) unstable; urgency=low * Rebuilt. diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DH_VERBOSE=1 override_dh_auto_configure: dh_auto_configure -- \ - --with-rundir=/run \ + --with-rundir=/run/monetdb \ --enable-assert=no \ --enable-debug=yes \ --enable-developer=no \ diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,7 +36,7 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=19:4:0 +GDK_VERSION=19:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=12:3:0 diff --git a/monetdb5/extras/mal_optimizer_template/Tests/SingleServer b/monetdb5/extras/mal_optimizer_template/Tests/SingleServer new file mode 100644 diff --git a/monetdb5/extras/rapi/Tests/SingleServer b/monetdb5/extras/rapi/Tests/SingleServer new file mode 100644 --- /dev/null +++ b/monetdb5/extras/rapi/Tests/SingleServer @@ -0,0 +1,1 @@ +--set embedded_r=true diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c --- a/monetdb5/mal/mal_import.c +++ b/monetdb5/mal/mal_import.c @@ -425,7 +425,7 @@ callString(Client cntxt, str s, int list GDKfree(qry); throw(MAL,"callstring", SQLSTATE(HY013) MAL_MALLOC_FAIL); } - c= MCinitClient((oid)0, bs,0); + c= MCinitClient((oid)0, bs, cntxt->fdout); if( c == NULL){ GDKfree(b); GDKfree(qry); @@ -448,10 +448,13 @@ callString(Client cntxt, str s, int list c->usermodule = 0; GDKfree(b); GDKfree(qry); + c->fdout = GDKstdout; MCcloseClient(c); return msg; } - if((msg = runScenario(c,1)) != MAL_SUCCEED) { + msg = runScenario(c,1); + c->fdout = GDKstdout; + if (msg != MAL_SUCCEED) { c->usermodule = 0; GDKfree(b); GDKfree(qry); diff --git a/monetdb5/modules/atoms/Tests/SingleServer b/monetdb5/modules/atoms/Tests/SingleServer new file mode 100644 diff --git a/monetdb5/modules/kernel/Tests/SingleServer b/monetdb5/modules/kernel/Tests/SingleServer new file mode 100644 diff --git a/monetdb5/scheduler/Tests/SingleServer b/monetdb5/scheduler/Tests/SingleServer new file mode 100644 diff --git a/sql/backends/monet5/UDF/pyapi/Tests/SingleServer b/sql/backends/monet5/UDF/pyapi/Tests/SingleServer --- a/sql/backends/monet5/UDF/pyapi/Tests/SingleServer +++ b/sql/backends/monet5/UDF/pyapi/Tests/SingleServer @@ -1,1 +1,1 @@ ---set embedded_py=2 +--set embedded_py=3 diff --git a/sql/test/BugTracker-2009/Tests/SingleServer b/sql/test/BugTracker-2009/Tests/SingleServer new file mode 100644 diff --git a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py rename from sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py rename to sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py --- a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py +++ b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.SQL.py @@ -1,15 +1,22 @@ -import sys -import os +import os, socket, sys, tempfile, shutil try: from MonetDBtesting import process except ImportError: import process +def freeport(): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.bind(('', 0)) + port = sock.getsockname()[1] + sock.close() + return port + +farm_dir = tempfile.mkdtemp() +os.mkdir(os.path.join(farm_dir, 'db1')) +myport = freeport() + def client(input): - c = process.client('sql', - stdin = process.PIPE, - stdout = process.PIPE, - stderr = process.PIPE) + c = process.client('sql', port = myport, dbname='db1', stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) out, err = c.communicate(input) sys.stdout.write(out) sys.stderr.write(err) @@ -19,14 +26,19 @@ create table t2 (a int); ''' def main(): - s = process.server(args = ["--set", "gdk_readonly=yes"], - stdin = process.PIPE, - stdout = process.PIPE, - stderr = process.PIPE) + s = process.server(mapiport=myport, dbname='db1', dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, + stdout = process.PIPE, stderr = process.PIPE) # Start the server without readonly one time to initialize catalog + out, err = s.communicate() + sys.stdout.write(out) + sys.stderr.write(err) + s = process.server(args = ["--set", "gdk_readonly=yes"], mapiport=myport, dbname='db1', dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, + stdout = process.PIPE, stderr = process.PIPE) client(script1) out, err = s.communicate() sys.stdout.write(out) sys.stderr.write(err) + shutil.rmtree(farm_dir) + if __name__ == '__main__': main() diff --git a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py rename from sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py rename to sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py --- a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py +++ b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.SQL.py @@ -1,15 +1,24 @@ -import sys -import os +import sys, os, socket, sys, tempfile, shutil try: from MonetDBtesting import process except ImportError: import process +def freeport(): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.bind(('', 0)) + port = sock.getsockname()[1] + sock.close() + return port + +farm_dir = tempfile.mkdtemp() +os.mkdir(os.path.join(farm_dir, 'db1')) +myport = freeport() + def server(): - return process.server(stdin = process.PIPE, - stdout = process.PIPE, - stderr = process.PIPE) + return process.server(mapiport=myport, dbname='db1', dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, + stdout = process.PIPE, stderr = process.PIPE) def server_stop(s): out, err = s.communicate() @@ -17,10 +26,7 @@ def server_stop(s): sys.stderr.write(err) def client(input): - c = process.client('sql', - stdin = process.PIPE, - stdout = process.PIPE, - stderr = process.PIPE) + c = process.client('sql', port = myport, dbname='db1', stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) out, err = c.communicate(input) sys.stdout.write(out) sys.stderr.write(err) @@ -73,5 +79,7 @@ def main(): client(cleanup) server_stop(s) + shutil.rmtree(farm_dir) + if __name__ == '__main__': main() diff --git a/sql/test/BugTracker-2010/Tests/SingleServer b/sql/test/BugTracker-2010/Tests/SingleServer new file mode 100644 diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py rename from sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py rename to sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py --- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py +++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.SQL.py @@ -1,24 +1,24 @@ -from __future__ import print_function - +import os, socket, sys, tempfile, shutil try: from MonetDBtesting import process except ImportError: import process -import os -dbfarm = os.getenv('GDK_DBFARM') -tstdb = os.getenv('TSTDB') - -if not tstdb or not dbfarm: - print('No TSTDB or GDK_DBFARM in environment') - sys.exit(1) +def freeport(): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.bind(('', 0)) + port = sock.getsockname()[1] + sock.close() + return port -dbname = tstdb + '-2695' +farm_dir = tempfile.mkdtemp() +os.mkdir(os.path.join(farm_dir, 'db1')) +myport = freeport() -# clean up before we start -if os.path.exists(os.path.join(dbfarm, dbname)): - import shutil - shutil.rmtree(os.path.join(dbfarm, dbname)) +s = process.server(args = ['--readonly'], mapiport=myport, dbname='db1', dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, + stdout = process.PIPE, stderr = process.PIPE) +out, err = s.communicate() +sys.stdout.write(out) +sys.stderr.write(err) -s = process.server(args = ['--readonly'], dbname = dbname) -s.wait() +shutil.rmtree(farm_dir) diff --git a/sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer b/sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/SingleServer new file mode 100644 diff --git a/sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer b/sql/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/SingleServer new file mode 100644 diff --git a/sql/test/BugTracker-2011/Tests/SingleServer b/sql/test/BugTracker-2011/Tests/SingleServer new file mode 100644 diff --git a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py rename from sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py rename to sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py --- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py +++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
