Changeset: 035d11ea89d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=035d11ea89d9
Added Files:
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.sql
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.err
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.out
sql/test/rename/Tests/rename11.py
sql/test/rename/Tests/rename11.stable.err
sql/test/rename/Tests/rename11.stable.out
Modified Files:
.hgtags
CMakeLists.txt
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Apr2019
buildtools/selinux/monetdb.te
clients/examples/C/CMakeLists.txt
clients/mapiclient/CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/CMakeLists.txt
clients/odbc/driver/driver.rc
clients/odbc/winsetup/CMakeLists.txt
clients/odbc/winsetup/setup.rc
common/options/CMakeLists.txt
common/stream/CMakeLists.txt
common/utils/CMakeLists.txt
configure.ag
debian/changelog
embedded/CMakeLists.txt
gdk/CMakeLists.txt
gdk/ChangeLog-Archive
gdk/ChangeLog.Apr2019
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/libbat.rc
geom/monetdb5/CMakeLists.txt
libversions
monetdb5/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/optimizer/CMakeLists.txt
monetdb5/optimizer/opt_mergetable.c
monetdb5/scheduler/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
monetdb5/tools/libmonetdb5.rc
sql/CMakeLists.txt
sql/ChangeLog-Archive
sql/ChangeLog.Apr2019
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
sql/backends/monet5/UDF/udf/CMakeLists.txt
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/lidar/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
sql/common/CMakeLists.txt
sql/include/CMakeLists.txt
sql/server/CMakeLists.txt
sql/server/rel_rel.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/storage/store.c
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/rename/Tests/All
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.32bit
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.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/monet_options.py.in
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/utils/CMakeLists.txt
tools/mserver/CMakeLists.txt
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
vertoo.data
Branch: cmake-monetdblite
Log Message:
Merge with cmake-fun.
diffs (truncated from 4272 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -725,3 +725,5 @@ 643dfa328c71d7891c8358b4969aa9ebf81e0f4c
2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_3
643dfa328c71d7891c8358b4969aa9ebf81e0f4c Apr2019_release
2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_release
+2366418b3d88b268117a6f981638c4da686497aa Apr2019_5
+2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,16 +21,16 @@ set(MONETDB_VERSION_PATCH "0")
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
set(GDK_VERSION_MAJOR "18")
-set(GDK_VERSION "${GDK_VERSION_MAJOR}.1.0")
+set(GDK_VERSION "${GDK_VERSION_MAJOR}.2.0")
set(MAPI_VERSION_MAJOR "12")
-set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.0.0")
+set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.1.0")
set(MONETDB5_VERSION_MAJOR "27")
-set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.1.0")
+set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.2.0")
set(STREAM_VERSION_MAJOR "13")
-set(STREAM_VERSION "${STREAM_VERSION_MAJOR}.1.0")
+set(STREAM_VERSION "${STREAM_VERSION_MAJOR}.2.0")
# HOMEPAGE_URL "https://www.monetdb.org/"; in project command supported from
cmake 3.12 up
# DESCRIPTION "MonetDB, SQL queries at light speed" in project command
supported from cmake 3.9 up
@@ -779,17 +779,13 @@ add_custom_target(mrevision COMMAND ${CM
add_subdirectory(buildtools)
add_subdirectory(common)
add_subdirectory(clients) # Must come before monetdb5!
-if(HAVE_GDK)
- add_subdirectory(gdk)
-endif()
+add_subdirectory(gdk)
+add_subdirectory(monetdb5)
if(HAVE_MONETDB5)
- add_subdirectory(monetdb5)
add_subdirectory(geom) # The SHP vault requires the geom module, so the
geom module should compile before SQL
add_subdirectory(tools)
endif()
-if(HAVE_SQL)
- add_subdirectory(sql)
-endif()
+add_subdirectory(sql)
if(HAVE_EMBEDDED)
add_subdirectory(embedded)
endif()
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -113,7 +113,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Apr2019/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Apr2019-SP1/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1061,6 +1061,56 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Thu Aug 01 2019 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> -
11.33.5-20190801
+- Rebuilt.
+- BZ#6697: Duplicate expressions not eliminated with long CASE statement
+- BZ#6701: When changing the schema name of a table, referencing rows
+ from sys.columns, sys.keys and more tables are not removed
+- BZ#6703: SQL optimizer enters loop and goes into stack overflow
+- BZ#6706: prepare doesn't recognize merge statement
+- BZ#6712: Where clause with cast ignores sub-select
+- BZ#6713: COPY INTO FROM 'file.xz' does not work
+- BZ#6714: Assertion failure in rel_select.c for correlated subquery in
+ aggregation query (with group by and having and order by and limit)
+- BZ#6715: Assertion failure in rel_bin.c for MERGE INTO command
+- BZ#6716: COPY INTO does not load UTF8 encoded text
+- BZ#6718: Can't copy table into another table with constraints
+ (mkey.bulk_rotate_xor_hash)
+- BZ#6720: Compilation issues on gcc 9.1.1 [-Werror=stringop-truncation]
+- BZ#6721: Possibly incorrect call to pcre_exec
+- BZ#6725: Prepare statement on non-existing function crashes
+- BZ#6728: SELECT DISTINCT not removing duplicates
+- BZ#6729: Creating a table with duplicate column name should not
+ be possible
+- BZ#6730: sys.stop or sys.pause a INSERT query triggers "BATproject:
+ does not match always"
+- BZ#6736: Unexpected query result with merge tables and view after
+ upgrade
+- BZ#6738: issue with window functions and hugeint type coercion
+
+* Mon Jul 15 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.5-20190801
+- gdk: We now look at the limits imposed by cgroups and the setrlimit system
+ call to initialize some internal values related to how much (virtual)
+ memory we think is available.
+
+* Fri Jul 12 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.5-20190801
+- buildtools: Removed restriction on using combinations of --enable-assert,
+ --enable-debug, and --enable-optimize. --enable-debug adds a -g (or
+ -even -g3) option, --enable-debug=gdb adds a -ggdb3 flag (for GCC);
+ --enable-optimize adds a bunch of optimization flags; --disable-debug
+ (or --enable-debug=no) removes any -g flags; --disable-optimize
+ removes any -O flags; --enable-optimize=auto leaves the optimization
+ flags untouched.
+
+* Fri Jun 7 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.5-20190801
+- sql: Changed the internal representation of RANGE MINVALUE and RANGE MAXVALUE
+ in MERGE TABLE partitions. Before, the limits were represented by
+ the smallest and largest value of the domain of the column, now these
+ are represented by a NULL value. This has the added benefit that if
+ you use TO RANGE MAXVALUE, the largest value of the domain is included
+ in the partition (before it wasn't). Also, these new limits now work
+ for any ordered type, so including VARCHAR.
+
* Fri Apr 26 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.3-20190426
- Rebuilt.
- BZ#6647: Add suport to Python 3 on Windows
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,15 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Jul 12 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.5-20190801
+- Removed restriction on using combinations of --enable-assert,
+ --enable-debug, and --enable-optimize. --enable-debug adds a -g (or
+ -even -g3) option, --enable-debug=gdb adds a -ggdb3 flag (for GCC);
+ --enable-optimize adds a bunch of optimization flags; --disable-debug
+ (or --enable-debug=no) removes any -g flags; --disable-optimize
+ removes any -O flags; --enable-optimize=auto leaves the optimization
+ flags untouched.
+
* Tue Mar 19 2019 Sjoerd Mullender <sjo...@acm.org> - 11.33.1-20190405
- We now use the C11 atomic operations if available, although
libatomic_ops is still used if present and not disabled on the configure
diff --git a/buildtools/ChangeLog.Apr2019 b/buildtools/ChangeLog.Apr2019
--- a/buildtools/ChangeLog.Apr2019
+++ b/buildtools/ChangeLog.Apr2019
@@ -1,12 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Fri Jul 12 2019 Sjoerd Mullender <sjo...@acm.org>
-- Removed restriction on using combinations of --enable-assert,
- --enable-debug, and --enable-optimize. --enable-debug adds a -g (or
- -even -g3) option, --enable-debug=gdb adds a -ggdb3 flag (for GCC);
- --enable-optimize adds a bunch of optimization flags; --disable-debug
- (or --enable-debug=no) removes any -g flags; --disable-optimize
- removes any -O flags; --enable-optimize=auto leaves the optimization
- flags untouched.
-
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.5)
+policy_module(monetdb, 0.6)
# The above line declares that this file is a SELinux policy file. Its
# name is monetdb, so the file should be saved as monetdb.te
@@ -8,12 +8,14 @@ require {
type tmp_t;
type var_t;
type user_home_t;
+ type unconfined_service_t; # for EPEL 7
+ type proc_t; # for EPEL 7
class dir { read };
class fd { use };
class fifo_file { getattr read write };
class file { entrypoint execute getattr manage_file_perms map open read
};
class netlink_selinux_socket create_socket_perms;
- class process { rlimitinh siginh signal sigterm sigkill transition };
+ class process { rlimitinh siginh signal sigchld sigterm sigkill
transition };
class tcp_socket create_stream_socket_perms;
class udp_socket create_stream_socket_perms;
class unix_dgram_socket create_socket_perms;
@@ -41,6 +43,10 @@ type_transition monetdbd_t mserver5_exec
# monetdbd must be allowed to kill the server it started
allow monetdbd_t mserver5_t:process { sigterm sigkill };
+# on EPEL 7 we need these as well
+allow mserver5_t monetdbd_t:process sigchld;
+allow monetdbd_t unconfined_service_t:process signal;
+allow mserver5_t proc_t:file { open read getattr }; # read /proc/meminfo
# declare a type for the systemd unit file (monetdbd.service)
type monetdbd_unit_file_t;
@@ -123,6 +129,9 @@ manage_sock_files_pattern(mserver5_t, ms
allow mserver5_t monetdbd_t:fifo_file { read write getattr };
allow mserver5_t monetdbd_t:unix_stream_socket { read write getopt shutdown };
allow mserver5_t var_t:dir { read };
+# we want to be able to read some cgroup files
+fs_search_cgroup_dirs(mserver5_t);
+fs_read_cgroup_files(mserver5_t);
allow monetdbd_t var_t:dir { read };
gen_tunable(mserver5_can_read_home, false)
tunable_policy(`mserver5_can_read_home', `
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -6,8 +6,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-include_directories(../../mapilib)
-
if(HAVE_TESTING)
set(COMMON_LIBRARIES mapi stream ${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES}
${LZ4_LIBRARIES}
${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${CRYPTO_LIBRARIES})
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -62,34 +62,27 @@ if(NOT ${WITH_READLINE} STREQUAL "NO")
cmake_pop_check_state()
endif()
-include_directories(../mapilib ../../common/options ../../common/stream
../../common/utils ${ICONV_INCLUDE_DIR})
+include_directories(${ICONV_INCLUDE_DIR})
add_library(mcutil STATIC dump.c dotmonetdb.c dotmonetdb.h eventparser.c
eventparser.h mprompt.h prompt.c)
+target_link_libraries(mcutil PUBLIC mutils mcrypt moptions mapi stream
${READLINE_LIBRARIES} ${SOCKET_LIBRARIES}
+ ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES}
+ ${CURL_LIBRARIES} ${ICONV_LIBRARIES}
${CRYPTO_LIBRARIES})
add_executable(mclient mclient.c ReadlineTools.c ReadlineTools.h mhelp.c
mhelp.h)
-target_link_libraries(mclient PRIVATE mcutil mutils mcrypt moptions mapi
stream ${READLINE_LIBRARIES}
- ${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
${BZIP2_LIBRARIES} ${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES}
- ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${CRYPTO_LIBRARIES})
+target_link_libraries(mclient PRIVATE mcutil)
add_executable(msqldump msqldump.c msqldump.h)
-target_link_libraries(msqldump PRIVATE mcutil mutils moptions mapi stream
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
- ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES}
- ${ICONV_LIBRARIES}
${CRYPTO_LIBRARIES})
+target_link_libraries(msqldump PRIVATE mcutil)
add_executable(stethoscope stethoscope.c)
-target_link_libraries(stethoscope PRIVATE mcutil mutils moptions mapi stream
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
- ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES}
- ${ICONV_LIBRARIES}
${CRYPTO_LIBRARIES})
+target_link_libraries(stethoscope PRIVATE mcutil)
add_executable(tachograph tachograph.c)
-target_link_libraries(tachograph PRIVATE mcutil mutils moptions mapi stream
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
- ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES}
- ${ICONV_LIBRARIES}
${CRYPTO_LIBRARIES})
+target_link_libraries(tachograph PRIVATE mcutil)
add_executable(tomograph tomograph.c)
-target_link_libraries(tomograph PRIVATE mcutil mutils moptions mapi stream
${SOCKET_LIBRARIES} ${ZLIB_LIBRARIES}
- ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CURL_LIBRARIES}
- ${ICONV_LIBRARIES}
${CRYPTO_LIBRARIES})
+target_link_libraries(tomograph PRIVATE mcutil)
install(TARGETS mclient msqldump stethoscope tachograph tomograph DESTINATION
${BINDIR})
if(WIN32)
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -6,15 +6,21 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-include_directories(../../common/stream ../../common/utils
${CRYPTO_INCLUDE_DIR})
+include_directories(${CRYPTO_INCLUDE_DIR})
set(MAPI_LINK_LIBRARIES moptions mcrypt mutils)
if(WIN32)
list(APPEND MAPI_LINK_LIBRARIES stream ${SOCKET_LIBRARIES}
${CRYPTO_LIBRARIES})
endif()
-add_library(mapi SHARED mapi.c mapi.rc)
-target_link_libraries(mapi PRIVATE ${MAPI_LINK_LIBRARIES})
+add_library(mapi_headers INTERFACE)
+target_include_directories(mapi_headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+
+add_library(mapi SHARED mapi.c mapi.h mapi.rc)
+target_include_directories(mapi INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+target_link_libraries(mapi PUBLIC mapi_headers PRIVATE stream_headers
${MAPI_LINK_LIBRARIES})
set_target_properties(mapi PROPERTIES VERSION ${MAPI_VERSION} SOVERSION
${MAPI_VERSION_MAJOR})
target_compile_definitions(mapi PRIVATE LIBMAPI)
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2400,6 +2400,25 @@ mapi_reconnect(Mapi mid)
}
return mapi_setError(mid, errbuf, "mapi_reconnect",
MERROR);
}
+
+ /* compare our own address with that of our peer and
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
