Changeset: 37729cc92ec6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37729cc92ec6
Added Files:
monetdb5/modules/mal/Tests/flags.malC
monetdb5/modules/mal/Tests/flags.stable.err
monetdb5/modules/mal/Tests/flags.stable.out
sql/scripts/61_wlcr.sql
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.sql
sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.stable.out
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.sql
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.err
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.out
sql/test/Dependencies/Tests/view_table_udf.sql
sql/test/Dependencies/Tests/view_table_udf.stable.err
sql/test/Dependencies/Tests/view_table_udf.stable.out
sql/test/mergetables/Tests/sqlsmith-exists.sql
sql/test/miscellaneous/Tests/alter_table_add_column.sql
sql/test/miscellaneous/Tests/alter_table_add_column.stable.err
sql/test/miscellaneous/Tests/alter_table_add_column.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.err
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/subquery/Tests/exists.sql
sql/test/subquery/Tests/exists.stable.err
sql/test/subquery/Tests/exists.stable.out
sql/test/subquery/Tests/subquery3.sql
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlr10.py
sql/test/wlcr/Tests/wlr10.stable.err
sql/test/wlcr/Tests/wlr10.stable.out
sql/test/wlcr/Tests/wlr80.py
Modified Files:
CMakeLists.txt
CMakeReadme.txt
ChangeLog
Makefile.ag
MonetDB.spec
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
clients/R/Tests/copy_into_fwf.stable.err
clients/R/Tests/dbi.stable.err
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/eventparser.c
clients/mapiclient/mhelp.c
clients/mapiclient/stethoscope.c
common/options/monet_options.c
configure.ag
debian/rules
embedded/MonetDBLiteReadme.txt
gdk/CMakeLists.txt
gdk/gdk.h
gdk/gdk_analytic_func.c
gdk/gdk_bat.c
gdk/gdk_logger.c
gdk/gdk_storage.c
gdk/gdk_system.h
gdk/gdk_utils.c
geom/CMakeLists.txt
geom/Makefile.ag
monetdb5/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/mal/mal_scenario.c
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/json.mal
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/mdb.mal
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/profiler.mal
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/querylog.h
monetdb5/modules/mal/querylog.mal
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
monetdb5/modules/mal/wlc.mal
monetdb5/optimizer/CMakeLists.txt
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out.single
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_commonTerms.h
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_emptybind.h
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_json.c
monetdb5/optimizer/opt_json.h
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_matpack.h
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_oltp.c
monetdb5/optimizer/opt_oltp.h
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_postfix.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_reduce.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_volcano.c
monetdb5/optimizer/opt_wlc.c
monetdb5/optimizer/opt_wlc.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.h
sql/CMakeLists.txt
sql/ChangeLog.Apr2019
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_bin.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/wlr.c
sql/backends/monet5/wlr.h
sql/backends/monet5/wlr.mal
sql/common/CMakeLists.txt
sql/common/sql_types.c
sql/include/sql_relation.h
sql/scripts/16_tracelog.sql
sql/scripts/25_debug.sql
sql/scripts/60_wlcr.sql
sql/server/CMakeLists.txt
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_optimizer.h
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/union_limitation.SF-921992.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err
sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out
sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
sql/test/BugTracker-2017/Tests/limit.Bug-6322.sql
sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.sql
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.err
sql/test/BugTracker-2019/Tests/All
sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.stable.out
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
sql/test/Dependencies/Tests/All
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/copy-from-lz4.py
sql/test/Tests/marcin3.stable.err
sql/test/analytics/Tests/analytics01.sql
sql/test/analytics/Tests/analytics01.stable.out
sql/test/analytics/Tests/analytics09.sql
sql/test/analytics/Tests/analytics09.stable.err
sql/test/analytics/Tests/analytics09.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
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
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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/merge-partitions/Tests/mergepart21.stable.err
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/sqlsmith.Bug-6459.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6472.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6472.stable.out
sql/test/miscellaneous/Tests/All
sql/test/miscellaneous/Tests/groupby_expressions.sql
sql/test/miscellaneous/Tests/groupby_expressions.stable.err
sql/test/miscellaneous/Tests/groupby_expressions.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.err.int128
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/interval.stable.out.int128
sql/test/pg_regress/Tests/timestamp.sql
sql/test/pg_regress/Tests/timestamptz.sql
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/pg_regress/Tests/vacuum.stable.out.single
sql/test/subquery/Tests/All
sql/test/subquery/Tests/any_all.sql
sql/test/subquery/Tests/any_all.stable.out
sql/test/subquery/Tests/correlated.sql
sql/test/subquery/Tests/correlated.stable.err
sql/test/subquery/Tests/correlated.stable.out
sql/test/subquery/Tests/subquery.sql
sql/test/subquery/Tests/subquery.stable.err
sql/test/subquery/Tests/subquery2.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
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
sql/test/wlcr/Tests/All
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc01.stable.out
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlcr00.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr01.stable.err
sql/test/wlcr/Tests/wlr01.stable.out
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr100.stable.err
sql/test/wlcr/Tests/wlr100.stable.out
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr20.stable.err
sql/test/wlcr/Tests/wlr20.stable.out
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr30.stable.err
sql/test/wlcr/Tests/wlr30.stable.out
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr40.stable.err
sql/test/wlcr/Tests/wlr40.stable.out
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr50.stable.err
sql/test/wlcr/Tests/wlr50.stable.out
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr70.stable.err
sql/test/wlcr/Tests/wlr70.stable.out
testing/Mtest.py.in
tools/CMakeLists.txt
tools/Makefile.ag
tools/merovingian/CMakeLists.txt
tools/merovingian/ChangeLog.Nov2019
tools/merovingian/Makefile.ag
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/utils/properties.c
tools/mserver/mserver5.1.in
Branch: cmake-monetdblite
Log Message:
Merge with cmake-fun
diffs (truncated from 218362 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,12 +77,10 @@ endif()
set(ENABLE_CINTEGRATION "AUTO" CACHE STRING "Enable support for C UDFs
(default=AUTO)") # Check with HAVE_CUDF
set(ENABLE_EMBEDDED "NO" CACHE STRING "Enable support for running MonetDB as a
library (default=NO)") # Check with HAVE_EMBEDDED
set(ENABLE_FITS "AUTO" CACHE STRING "Enable support for FITS (default=AUTO)")
# Check with HAVE_FITS
-set(ENABLE_GDK "YES" CACHE STRING "Enable support for GDK (default=YES)") #
Check with HAVE_GDK
set(ENABLE_GEOM "AUTO" CACHE STRING "Enable support for geom module
(default=AUTO)") # Check with HAVE_GEOM
set(ENABLE_INT128 "AUTO" CACHE STRING "Enable support for 128-bit integers
(default=AUTO)") # Check with HAVE_HGE
set(ENABLE_LIDAR "AUTO" CACHE STRING "Enable support for LiDAR data
(default=AUTO)") # Check with HAVE_LIDAR
set(ENABLE_MAPI "YES" CACHE STRING "Enable MAPI (default=YES)") # Check with
HAVE_MAPI
-set(ENABLE_MONETDB5 "YES" CACHE STRING "Enable support for MonetDB5
(default=YES)") # Check with HAVE_MONETDB5
set(ENABLE_NETCDF "AUTO" CACHE STRING "Enable support for netcdf
(default=AUTO)") # Check with HAVE_NETCDF
set(ENABLE_ODBC "AUTO" CACHE STRING "Compile the MonetDB ODBC driver
(default=AUTO)") # Check with HAVE_ODBC
set(ENABLE_PY3INTEGRATION "AUTO" CACHE STRING "enable support for Python 3
integration into MonetDB (default=AUTO)") # Check with HAVE_LIBPY3
@@ -90,7 +88,6 @@ set(ENABLE_RINTEGRATION "AUTO" CACHE STR
set(ENABLE_SAMTOOLS "AUTO" CACHE STRING "Include Samtools support
(default=AUTO)") # Check with HAVE_SAMTOOLS
set(ENABLE_SANITIZER "NO" CACHE STRING "Enable support for the GCC address
sanitizer (default=NO)")
set(ENABLE_SHP "AUTO" CACHE STRING "Enable support for ESRI Shapefiles
(default=AUTO)") # Check with HAVE_SHP
-set(ENABLE_SQL "YES" CACHE STRING "Enable support for MonetDB/SQL
(default=YES)") # Check with HAVE_SQL
set(ENABLE_STATIC_ANALYSIS "NO" CACHE STRING "Configure for static code
analysis (use only if you know what you are doing)") # Check with
STATIC_CODE_ANALYSIS
set(ENABLE_STRICT "${DFT_STRICT}" CACHE STRING "Enable strict compiler flags
(default=YES for development sources, NO for tarball instalation)")
set(ENABLE_TESTING "AUTO" CACHE STRING "Enable support for testing
(default=AUTO)") # Check with HAVE_TESTING
@@ -110,8 +107,8 @@ set(WITH_VALGRIND "NO" CACHE STRING "Inc
set(WITH_ZLIB "AUTO" CACHE STRING "Include zlib support (default=AUTO)") #
Check with HAVE_LIBZ
# Cmake doesn't support string case insensitive compare, so convert MonetDB
options to uppercase on every invocation
-set(OPTIONS_LIST CINTEGRATION EMBEDDED FITS GDK GEOM INT128 LIDAR MAPI
MONETDB5 NETCDF ODBC PY3INTEGRATION
- RINTEGRATION SAMTOOLS SANITIZER SHP SQL STATIC_ANALYSIS STRICT TESTING
+set(OPTIONS_LIST CINTEGRATION EMBEDDED FITS GEOM INT128 LIDAR MAPI NETCDF ODBC
PY3INTEGRATION
+ RINTEGRATION SAMTOOLS SANITIZER SHP STATIC_ANALYSIS STRICT TESTING
BZ2 CURL LIBLZMA LIBXML2 LZ4 PROJ READLINE REGEX SNAPPY UUID VALGRIND
ZLIB)
foreach(EXTENSION IN LISTS OPTIONS_LIST)
if(ENABLE_${EXTENSION})
@@ -340,39 +337,13 @@ if(Python3_Interpreter_FOUND)
endif()
endif()
if(NOT HAVE_PYTHON3)
- if("${ENABLE_TESTING}" STREQUAL "YES")
- message(FATAL_ERROR "A valid Python 3 interpreter is required
for MonetDB testing tools")
- else()
- set(ENABLE_TESTING "NO" CACHE STRING "A valid Python 3
interpreter is required for MonetDB testing tools" FORCE)
- endif()
- if("${ENABLE_MONETDB5}" STREQUAL "YES")
- message(FATAL_ERROR "A valid Python 3 interpreter is required
for MonetDB5")
- else()
- set(ENABLE_MONETDB5 "NO" CACHE STRING "A valid Python 3
interpreter is required for MonetDB5" FORCE)
- endif()
- if("${ENABLE_SQL}" STREQUAL "YES")
- message(FATAL_ERROR "A valid Python 3 interpreter is required
for MonetDB/SQL")
- else()
- set(ENABLE_SQL "NO" CACHE STRING "A valid Python 3 interpreter
is required for MonetDB/SQL" FORCE)
- endif()
- if(${ENABLE_EMBEDDED} MATCHES "^SHARED|OBJECT$")
- message(FATAL_ERROR "A valid Python 3 interpreter is required
for MonetDB embedded library")
- else()
- set(ENABLE_EMBEDDED "NO" CACHE STRING "A valid Python 3
interpreter is required for MonetDB embedded library" FORCE)
- endif()
+ message(FATAL_ERROR "A valid Python 3 interpreter is required for
MonetDB")
endif()
# Bison
find_package(BISON)
if(NOT BISON_FOUND)
- if(${ENABLE_SQL} STREQUAL "YES")
- message(FATAL_ERROR "MonetDB/SQL requires bison")
- endif()
- if(${ENABLE_EMBEDDED} MATCHES "^SHARED|OBJECT$")
- message(FATAL_ERROR "MonetDB embedded library requires bison")
- endif()
- set(ENABLE_SQL "NO" CACHE STRING "Bison is required for MonetDB/SQL"
FORCE)
- set(ENABLE_EMBEDDED "NO" CACHE STRING "Bison is required for MonetDB
embedded library" FORCE)
+ message(FATAL_ERROR "MonetDB/SQL requires Bison")
endif()
# Iconv
@@ -429,22 +400,10 @@ if(NOT COMMONCRYPTO_FOUND)
endif()
cmake_pop_check_state()
if(NOT COMMONCRYPTO_FOUND AND NOT OPENSSL_FOUND)
- if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "Neither OpenSSL or CommonCrypto library
found, but required for MonetDB5")
- else()
- set(ENABLE_MONETDB5 "NO" CACHE STRING "Neither OpenSSL or
CommonCrypto library found, but required for MonetDB5" FORCE)
- message(WARNING "Neither OpenSSL or CommonCrypto library found,
but required for MonetDB5")
- endif()
+ message(FATAL_ERROR "Neither OpenSSL or CommonCrypto library found, but
required for MonetDB5")
endif()
if(NOT HAVE_${PASSWORD_BACKEND}_UPDATE)
- if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "A crypto library was found, but checksum
algorithm required for MonetDB5 was not found")
- else()
- set(HAVE_COMMONCRYPTO NO)
- set(OPENSSL_FOUND NO)
- set(ENABLE_MONETDB5 "NO" CACHE STRING "A crypto library was
found, but checksum algorithm required for MonetDB5 was not found" FORCE)
- message(WARNING "A crypto library was found, but required
checksum algorithm was not found, so disabling MonetDB5")
- endif()
+ message(FATAL_ERROR "A crypto library was found, but checksum algorithm
required for MonetDB5 was not found")
endif()
# Regex library
@@ -488,12 +447,7 @@ if(NOT HAVE_LIBPCRE)
endif()
check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
if(NOT HAVE_LIBPCRE AND NOT HAVE_POSIX_REGEX)
- if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "PCRE library or GNU regex library not
found but required for MonetDB5")
- else()
- set(ENABLE_MONETDB5 "NO" CACHE STRING "PCRE library or GNU
regex library not found but required for MonetDB5" FORCE)
- message(WARNING "PCRE library or GNU regex library not found
but required for MonetDB5")
- endif()
+ message(FATAL_ERROR "PCRE library or GNU regex library not found but
required for MonetDB5")
endif()
set_system_libraries() # Inside BuildMacros.cmake file
@@ -547,31 +501,6 @@ check_symbol_exists("posix_fallocate" "f
check_symbol_exists("posix_madvise" "sys/mman.h" HAVE_POSIX_MADVISE) # The
Linux kernel can be compiled without madvise, and posix_madvise is implemented
using madvise
check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h"
HAVE_SEMTIMEDOP) # Some libc versions on Linux distributions don't have it
-if(${ENABLE_GDK} STREQUAL "NO")
- if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "MonetDB5 requires GDK")
- elseif(${ENABLE_MONETDB5} STREQUAL "AUTO")
- set(ENABLE_MONETDB5 "NO" CACHE STRING "MonetDB5 requires GDK"
FORCE)
- endif()
- set(HAVE_GDK OFF CACHE INTERNAL "MonetDB5 is available" FORCE)
-else()
- set(HAVE_GDK ON CACHE INTERNAL "GDK layer is available" FORCE)
-endif()
-if(${ENABLE_MONETDB5} STREQUAL "NO")
- if(${ENABLE_SQL} STREQUAL "YES")
- message(FATAL_ERROR "MonetDB/SQL requires MonetDB5")
- elseif(${ENABLE_SQL} STREQUAL "AUTO")
- set(ENABLE_SQL "NO" CACHE STRING "MonetDB/SQL requires
MonetDB5" FORCE)
- endif()
- set(HAVE_MONETDB5 OFF CACHE INTERNAL "MonetDB5 is available" FORCE)
-else()
- set(HAVE_MONETDB5 ON CACHE INTERNAL "MonetDB5 is available" FORCE)
-endif()
-if("${ENABLE_SQL}" MATCHES "^YES|AUTO$") # The SQL module requires the
monetdb5 module, so monetdb5 should compile first
- set(HAVE_SQL ON CACHE INTERNAL "MonetDB/SQL is available" FORCE)
-else()
- set(HAVE_SQL OFF CACHE INTERNAL "MonetDB/SQL is available" FORCE)
-endif()
if(${ENABLE_EMBEDDED} MATCHES "^SHARED|OBJECT$")
set(HAVE_EMBEDDED ON CACHE INTERNAL "MonetDB embedded library is
enabled" FORCE)
elseif(${ENABLE_EMBEDDED} STREQUAL "NO")
@@ -781,10 +710,8 @@ add_subdirectory(common)
add_subdirectory(clients) # Must come before monetdb5!
add_subdirectory(gdk)
add_subdirectory(monetdb5)
-if(HAVE_MONETDB5)
- add_subdirectory(geom) # The SHP vault requires the geom module, so the
geom module should compile before SQL
- add_subdirectory(tools)
-endif()
+add_subdirectory(geom) # The SHP vault requires the geom module, so the geom
module should compile before SQL
+add_subdirectory(tools)
add_subdirectory(sql)
if(HAVE_EMBEDDED)
add_subdirectory(embedded)
diff --git a/CMakeReadme.txt b/CMakeReadme.txt
--- a/CMakeReadme.txt
+++ b/CMakeReadme.txt
@@ -35,12 +35,10 @@ CMAKE_INSTALL_PREFIX - Installation dire
ENABLE_CINTEGRATION
ENABLE_EMBEDDED - TODO check this
ENABLE_FITS
-ENABLE_GDK
ENABLE_GEOM
ENABLE_INT128
ENABLE_LIDAR
ENABLE_MAPI
-ENABLE_MONETDB5
ENABLE_NETCDF
ENABLE_ODBC
ENABLE_PY3INTEGRATION
@@ -48,7 +46,6 @@ ENABLE_RINTEGRATION
ENABLE_SAMTOOLS
ENABLE_SANITIZER
ENABLE_SHP
-ENABLE_SQL
ENABLE_STATIC_ANALYSIS
ENABLE_STRICT
ENABLE_TESTING
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Sat Oct 12 2019 Martin Kersten <[email protected]>
+- The MAL profiler now assigns the SQL TRACE output to the client record
+ thereby avoiding the interaction with other queries, but loosing
+ insight of competing queries. The stethoscope should be used for that.
+
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -5,9 +5,9 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
SUBDIRS = buildtools common clients \
- HAVE_GDK?gdk \
- HAVE_MONETDB5?monetdb5 \
- HAVE_SQL?sql \
+ gdk \
+ monetdb5 \
+ sql \
HAVE_GEOM?geom \
tools \
HAVE_TESTING?testing \
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -19,15 +19,16 @@
%global _hardened_build 1
# On RedHat Enterprise Linux and derivatives, if the Extra Packages
-# for Enterprise Linux (EPEL) repository is available, you can enable
-# its use by providing rpmbuild or mock with the "--with epel" option.
+# for Enterprise Linux (EPEL) repository is not available, you can
+# disable its use by providing rpmbuild or mock with the "--without
+# epel" option.
# If the EPEL repository is availabe, or if building for Fedora, most
# optional sub packages can be built. We indicate that here by
# setting the macro fedpkgs to 1. If the EPEL repository is not
# available and we are not building for Fedora, we set fedpkgs to 0.
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux (or CentOS or Scientific Linux)
-%bcond_with epel
+%bcond_without epel
%if %{with epel}
# EPEL is enabled through the command line
%global fedpkgs 1
@@ -59,7 +60,7 @@
# derivatives (CentOS, Scientific Linux), the liblas library is only
# available if EPEL is enabled, and then only on version 7.
%if %{fedpkgs}
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} == 7
# By default create the MonetDB-lidar package on Fedora and RHEL 7
%bcond_without lidar
%endif
@@ -958,12 +959,10 @@ export CFLAGS
--enable-embedded=no \
--enable-embedded-r=no \
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
- --enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-int128=%{?with_hugeint:yes}%{!?with_hugeint:no} \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
--enable-mapi=yes \
- --enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
--enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \
@@ -971,7 +970,6 @@ export CFLAGS
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sanitizer=no \
--enable-shp=no \
- --enable-sql=yes \
--enable-static-analysis=no \
--enable-strict=no \
--enable-testing=yes \
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -55,8 +55,8 @@ def main():
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- if vs == '17':
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Redist\MSVC'
+ if vs in ('17', '19'):
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_%s.msm' % arch
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -114,8 +114,8 @@ def main():
print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- if vs == '17':
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Redist\MSVC'
+ if vs in ('17', '19'):
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_%s.msm' % arch
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -297,11 +297,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_FITS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
