Changeset: bbb3191c92af for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbb3191c92af Added Files: clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/Tests/mclient-uri.stable.err clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/dbextra_lock_test.stable.err sql/backends/monet5/Tests/dbextra_lock_test.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.sql sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.err sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.out sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.sql sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.err sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.out sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.sql sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.err sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.sql sql/test/BugTracker-2017/Tests/lateral.Bug-6310.sql sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.sql sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.out sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.sql sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.err sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.sql sql/test/Tests/copy-into-fwf.sql.in sql/test/Tests/copy-into-fwf.stable.err sql/test/Tests/copy-into-fwf.stable.out sql/test/Tests/mtcars Modified Files: MonetDB.spec NT/mksqlwxs.py NT/monetdb_config.h.in README.rst bootstrap buildtools/autogen/setup.py buildtools/conf/website.html clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapilib/mapi.c common/stream/stream.c common/stream/stream.h common/utils/msabaoth.c common/utils/mutils.h debian/control gdk/gdk_atoms.c gdk/gdk_group.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_utils.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h sql/backends/monet5/UDF/cudf/README sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/scripts/25_debug.sql sql/scripts/51_sys_schema_extension.sql sql/server/rel_exp.c sql/server/rel_select.c sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2016/Tests/storagemodel.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 testing/process.py tools/merovingian/ChangeLog.Jul2017 tools/merovingian/daemon/forkmserver.c tools/merovingian/utils/properties.c tools/merovingian/utils/utils.c tools/merovingian/utils/utils.h tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.config Branch: mosaic Log Message:
Merge with default (old) diffs (truncated from 74071 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -131,8 +131,8 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 -URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 +URL: https://www.monetdb.org/ +Source: https://www.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -107,6 +107,16 @@ def main(): id = comp(features, id, 16, [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) print(r' </Directory>') + id = comp(features, id, 14, + [r'lib\libmapi.lib', + r'lib\libstream.lib', + r'%s\lib\iconv.lib' % makedefs['LIBICONV'], + r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'], + r'%s\lib\libeay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\libxml2.lib' % makedefs['LIBXML2'], + r'%s\lib\pcre.lib' % makedefs['LIBPCRE'], + r'%s\lib\ssleay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\zdll.lib' % makedefs['LIBZLIB']]) print(r' </Directory>') print(r' <Directory Id="share" Name="share">') print(r' <Directory Id="doc" Name="doc">') @@ -134,7 +144,7 @@ def main(): args = '/STARTED-FROM-MENU -lsql -Ecp437', sid = 'mclient_bat') id = comp(features, id, 12, - [r'MSQLServer.bat'], + [r'MSQLserver.bat'], name = 'MonetDB SQL Server', sid = 'msqlserver_bat') print(r' </Directory>') diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -767,23 +767,23 @@ /* Name of package */ #define PACKAGE "MonetDB" +/* Define to the version of this package. */ +#define PACKAGE_VERSION "11.28.0" + /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "i...@monetdb.org" +#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/"; /* Define to the full name of this package. */ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.28.0" +#define PACKAGE_STRING PACKAGE " " PACKAGE_VERSION /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "MonetDB" -/* Define to the version of this package. */ -#define PACKAGE_VERSION "11.28.0" - /* Define to the home page for this package. */ -#define PACKAGE_URL "" +#define PACKAGE_URL "https://www.monetdb.org/"; /* Path separator */ #define PATH_SEP ';' diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -2,16 +2,16 @@ The MonetDB Database System =========================== The MonetDB database is developed by the CWI database research group -(see http://www.monetdb.org/). +(see https://www.monetdb.org/). Via the MonetDB project we have brought the MonetDB system in open source, -where it is accessible at http://www.monetdb.org/Downloads/ +where it is accessible at https://www.monetdb.org/Downloads/ The MonetDB database system is a high-performance database kernel for query-intensive applications. The MonetDB source can be found at our `Mercurial server`__. There is also a `github mirror`__ that is updated once a day. -.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/ +.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/ __ MonetDB_ .. _github: https://github.com/MonetDB/MonetDB diff --git a/bootstrap b/bootstrap --- a/bootstrap +++ b/bootstrap @@ -14,9 +14,11 @@ PYTHONPATH=${PWD:-$(pwd)}/buildtools/aut export PYTHONPATH # cope with systems where libtool is not GNU libtool, e.g. Darwin -type -P glibtoolize > /dev/null \ - && libtoolize=glibtoolize \ - || libtoolize=libtoolize +if type -P glibtoolize > /dev/null; then + libtoolize=glibtoolize +else + libtoolize=libtoolize +fi # cope with systems where aclocal is known as aclocal-1.10 (and # automake as automake-1.10), e.g. OpenIndiana @@ -40,22 +42,26 @@ if [[ -n ${M4DIRS} ]] ; then done fi -python buildtools/autogen/autogen.py && +python buildtools/autogen/autogen.py || exit $? ( # replace the line starting with AC_CONFIG_FILES in configure.ag with # the command to substitute the configure results into the .in files, # making sure executable files remain executable. -sed -n '/^AC_CONFIG_FILES/s/.*/AC_CONFIG_FILES([/;1,/^AC_CONFIG_FILES/p' configure.ag -while read f; do [ -x $f.in ] || echo $f; done < acout.in +sed -n '/^AC_CONFIG_FILES/s/.*/AC_CONFIG_FILES([/;1,/^AC_CONFIG_FILES/p' configure.ag || exit $? +while read f; do + [ -x $f.in ] || echo $f +done < acout.in echo '])' -while read f; do [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])"; done < acout.in +while read f; do + [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])" +done < acout.in sed '1,/^AC_CONFIG_FILES/d' configure.ag -) > configure.ac && -$libtoolize -c -f && -aclocal$amv ${_m4_extra_dirs} && -autoheader && -automake$amv --add-missing --copy --foreign && -autoconf +) > configure.ac || exit $? +$libtoolize -c -f || exit $? +aclocal$amv ${_m4_extra_dirs} || exit $? +autoheader || exit $? +automake$amv --add-missing --copy --foreign || exit $? +autoconf || exit $? if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then chmod +x buildtools/conf/install-sh fi diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py +++ b/buildtools/autogen/setup.py @@ -13,7 +13,7 @@ setup(name = "autogen", description = "MonetDB autogen script", author = "MonetDB Team, CWI", author_email = "i...@monetdb.org", - url = "http://www.monetdb.org/";, + url = "https://www.monetdb.org/";, maintainer = "Sjoerd Mullender", maintainer_email = "i...@monetdb.org", license = "Mozilla Public License, v. 2.0", diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -10,7 +10,7 @@ Copyright 1997 - July 2008 CWI, August 2 <html> <head> <title>redirect</title> - <meta http-equiv="Refresh" content="0;URL=http://www.monetdb.org/";> + <meta http-equiv="Refresh" content="0;URL=https://www.monetdb.org/";> </head> <body> diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,3 +1,4 @@ exports HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?MAL-signatures MERCURIAL?malcheck +mclient-uri diff --git a/clients/Tests/mclient-uri.SQL.bat b/clients/Tests/mclient-uri.SQL.bat new file mode 100755 --- /dev/null +++ b/clients/Tests/mclient-uri.SQL.bat @@ -0,0 +1,6 @@ +@prompt # $t $g +@echo on + +@rem Windows doesn't do UNIX domain sockets, so only the one test here. + +mclient -d "mapi:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?language=sql&user=monetdb" -f test -E utf-8 -s "select 1" diff --git a/clients/Tests/mclient-uri.SQL.sh b/clients/Tests/mclient-uri.SQL.sh new file mode 100755 --- /dev/null +++ b/clients/Tests/mclient-uri.SQL.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# test the URI parsing capabilities of the MAPI library + +Mlog "mclient -d mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -E utf-8 -s select 1" +mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb" -f test -E utf-8 -s 'select 1' + +Mlog "mclient -d mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb -f test -E utf-8 -s select 1" +mclient -d "mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb" -f test -E utf-8 -s 'select 1' diff --git a/clients/Tests/mclient-uri.stable.err b/clients/Tests/mclient-uri.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/mclient-uri.stable.err @@ -0,0 +1,44 @@ +stderr of test 'mclient-uri` in directory 'clients` itself: + + +# 10:30:50 > +# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36840" "--set" "mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients" +# 10:30:50 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# 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 = 36840 +# cmdline opt mapi_usock = /var/tmp/mtest-2769/.s.monetdb.36840 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients +# cmdline opt gdk_debug = 536870922 + +# 10:30:51 > +# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri" +# 10:30:51 > + + +# 10:30:51 > +# 10:30:51 > mclient -d mapi:monetdb://madrid:36840/mTests_clients?language=sql&user=monetdb -f test -E utf-8 -s select 1 +# 10:30:51 > + + +# 10:30:51 > +# 10:30:51 > mclient -d mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840?database=mTests_clients&language=sql&user=monetdb -f test -E utf-8 -s select 1 +# 10:30:51 > + + +# 10:30:51 > +# 10:30:51 > "Done." +# 10:30:51 > + diff --git a/clients/Tests/mclient-uri.stable.out b/clients/Tests/mclient-uri.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/mclient-uri.stable.out @@ -0,0 +1,51 @@ +stdout of test 'mclient-uri` in directory 'clients` itself: + + +# 10:30:50 > +# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36840" "--set" "mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients" +# 10:30:50 > + +# MonetDB 5 server v11.25.22 (hg id: 7b4a32dfbcc5+) +# This is an unreleased version +# Serving database 'mTests_clients', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:36840/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 10:30:51 > +# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri" +# 10:30:51 > + + +# 10:30:51 > +# 10:30:51 > mclient -d mapi:monetdb://madrid:36840/mTests_clients?language=sql&user=monetdb -f test -E utf-8 -s select 1 +# 10:30:51 > + +% .L2 # table_name +% L2 # name +% tinyint # type +% 1 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
