Changeset: ab10b76bb186 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab10b76bb186
Added Files:
.editorconfig
README
cmake/Modules/FindSphinx.cmake
ctest/tools/monetdbe/CMakeLists.txt
ctest/tools/monetdbe/backup.c
ctest/tools/monetdbe/cmocka_test.c
ctest/tools/monetdbe/example1.c
ctest/tools/monetdbe/example2.c
ctest/tools/monetdbe/example_append.c
ctest/tools/monetdbe/example_backup.c
ctest/tools/monetdbe/example_blob.c
ctest/tools/monetdbe/example_connections.c
ctest/tools/monetdbe/example_decimals.c
ctest/tools/monetdbe/example_remote.c
ctest/tools/monetdbe/example_temporal.c
ctest/tools/monetdbe/test_helper.c
ctest/tools/monetdbe/test_helper.h
ctest/tools/monetdbe/test_helper_template.h
documentation/CMakeLists.txt
documentation/conf.py.in
documentation/index.rst
documentation/monetdbe/architecture.png
documentation/monetdbe/authors.rst
documentation/monetdbe/conf.py
documentation/monetdbe/dev_notes.rst
documentation/monetdbe/examples.rst
documentation/monetdbe/installation.rst
documentation/monetdbe/introduction.rst
documentation/monetdbe/monetdbe_api.rst
documentation/old/HowToRelease.rst
documentation/old/HowToStart.rst
documentation/old/README.rst
documentation/old/windowsbuild.rst
documentation/source/build-debian.rst
documentation/source/build-fedora.rst
documentation/source/build.rst
documentation/source/cmake.rst
documentation/source/design.rst
documentation/source/release.rst
gdk/gdk_subquery.c
gdk/gdk_subquery.h
misc/AUTHORS
misc/CMakeLists.txt
misc/ChangeLog
misc/ChangeLog-Archive
misc/ChangeLog.Jun2020
misc/NEWS
misc/python/CMakeLists.txt
misc/python/create_include_object.py.in
misc/python/fixlicense.py
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.ppc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.ppc64
sql/test/BugTracker-2020/Tests/select-and.Bug-6878.sql
sql/test/BugTracker-2020/Tests/select-and.Bug-6878.stable.err
sql/test/BugTracker-2020/Tests/select-and.Bug-6878.stable.out
sql/test/BugTracker-2020/Tests/url-getuser.Bug-6844.sql
sql/test/BugTracker-2020/Tests/url-getuser.Bug-6844.stable.err
sql/test/BugTracker-2020/Tests/url-getuser.Bug-6844.stable.out
sql/test/BugTracker-2020/Tests/url-nulls.Bug-6845.sql
sql/test/BugTracker-2020/Tests/url-nulls.Bug-6845.stable.err
sql/test/BugTracker-2020/Tests/url-nulls.Bug-6845.stable.out
sql/test/SQLancer/Tests/All
sql/test/SQLancer/Tests/SingleServer
sql/test/SQLancer/Tests/sqlancer01.sql
sql/test/SQLancer/Tests/sqlancer01.stable.err
sql/test/SQLancer/Tests/sqlancer01.stable.out
sql/test/SQLancer/Tests/sqlancer02.sql
sql/test/SQLancer/Tests/sqlancer02.stable.err
sql/test/SQLancer/Tests/sqlancer02.stable.out
sql/test/Tests/hot_snapshot.py
sql/test/Tests/hot_snapshot.stable.err
sql/test/Tests/hot_snapshot.stable.out
sql/test/Tests/hot_snapshot_bz2.py
sql/test/Tests/hot_snapshot_bz2.stable.err
sql/test/Tests/hot_snapshot_bz2.stable.out
sql/test/Tests/hot_snapshot_gz.py
sql/test/Tests/hot_snapshot_gz.stable.err
sql/test/Tests/hot_snapshot_gz.stable.out
sql/test/Tests/hot_snapshot_lz4.py
sql/test/Tests/hot_snapshot_lz4.stable.err
sql/test/Tests/hot_snapshot_lz4.stable.out
sql/test/Tests/hot_snapshot_lz4_lite.py
sql/test/Tests/hot_snapshot_lz4_lite.stable.err
sql/test/Tests/hot_snapshot_lz4_lite.stable.out
sql/test/Tests/hot_snapshot_xz.py
sql/test/Tests/hot_snapshot_xz.stable.err
sql/test/Tests/hot_snapshot_xz.stable.out
sql/test/Tests/like_tests.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/json/Tests/jsonkeyarray.Bug-6858.sql
sql/test/json/Tests/jsonkeyarray.Bug-6858.stable.err
sql/test/json/Tests/jsonkeyarray.Bug-6858.stable.out
sql/test/json/Tests/jsontext.Bug-6859.sql
sql/test/miscellaneous/Tests/simple_plans.stable.out.single
sql/test/out2in/Tests/All
sql/test/out2in/Tests/out2in.sql
sql/test/out2in/Tests/out2in.stable.err
sql/test/out2in/Tests/out2in.stable.out
sql/test/out2in/Tests/out2in.stable.out.int128
tools/monetdbe/CMakeLists.txt
tools/monetdbe/monetdbe.c
tools/monetdbe/monetdbe.h
tools/monetdbe/monetdbe_mapi.c
tools/monetdbe/monetdbe_mapi.h
Removed Files:
HowToStart.rst
NT/Makefile
NT/makelibdef.py
NT/monetdb_config.h.in
NT/rules.msc
NT/wincompile.py
NT/winconfig.py
README-Debian
README-Fedora
README.md
README.rst
Release.md
buildtools/AUTHORS
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jun2020
buildtools/NEWS
buildtools/autogen/autogen.py
buildtools/autogen/autogen/__init__.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/filesplit.py
buildtools/autogen/autogen/msc.py
buildtools/autogen/autogen/var.py
buildtools/conf/config.rpath
buildtools/conf/fixlicense.py
buildtools/conf/rules.mk
buildtools/doc/HowToRelease.rst
buildtools/doc/Makefile
buildtools/doc/windowsbuild.rst
cmake/Modules/FindLiblas.cmake
cmake/Modules/FindLidar.cmake
create_include_object.py.in
ctest/tools/embedded/CMakeLists.txt
ctest/tools/embedded/example1.c
ctest/tools/embedded/example2.c
ctest/tools/embedded/example_append.c
ctest/tools/embedded/example_blob.c
ctest/tools/embedded/example_decimals.c
ctest/tools/embedded/example_temporal.c
debian/libmonetdb5-server-lidar.install
documentation/source/index.rst
monetdb5/extras/mal_optimizer_template/opt_sql_append.h
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/url.h
monetdb5/modules/kernel/batcolor.h
monetdb5/modules/mal/json_util.h
sql/backends/monet5/vaults/lidar/75_lidar.mal
sql/backends/monet5/vaults/lidar/75_lidar.sql
sql/backends/monet5/vaults/lidar/CMakeLists.txt
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
sql/backends/monet5/vaults/lidar/lidar.mal
sql/scripts/10_math.sql
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
sql/test/Tests/hot-snapshot-bz2.py
sql/test/Tests/hot-snapshot-bz2.stable.err
sql/test/Tests/hot-snapshot-bz2.stable.out
sql/test/Tests/hot-snapshot-gz.py
sql/test/Tests/hot-snapshot-gz.stable.err
sql/test/Tests/hot-snapshot-gz.stable.out
sql/test/Tests/hot-snapshot-lz4.py
sql/test/Tests/hot-snapshot-lz4.stable.err
sql/test/Tests/hot-snapshot-lz4.stable.out
sql/test/Tests/hot-snapshot-xz.py
sql/test/Tests/hot-snapshot-xz.stable.err
sql/test/Tests/hot-snapshot-xz.stable.out
sql/test/Tests/hot-snapshot.py
sql/test/Tests/hot-snapshot.stable.err
sql/test/Tests/hot-snapshot.stable.out
sql/test/Tests/hot_snapshot_compression.py
sql/test/Tests/like_tests.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/like_tests.sql
tools/embedded/CMakeLists.txt
tools/embedded/monetdb_embedded.c
tools/embedded/monetdb_embedded.h
Modified Files:
.bumpversion.cfg
CMakeLists.txt
ChangeLog
Config.cmake.in
MonetDB.spec
NT/mksqlwxs.py
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/CMakeLists.txt
clients/mapilib/monetdb-mapi.pc.in
clients/odbc/winsetup/CMakeLists.txt
cmake/Modules/FindLZ4.cmake
cmake/Modules/FindReadline.cmake
cmake/monetdb-custom-targets.cmake
cmake/monetdb-deb-packages.cmake
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-functions.cmake
cmake/monetdb-options.cmake
cmake/monetdb-rpm-packages.cmake
cmake/monetdb-toolchain.cmake
cmake/monetdb-versions.cmake
common/options/CMakeLists.txt
common/stream/CMakeLists.txt
common/stream/monetdb-stream.pc.in
common/stream/stream.c
common/stream/stream_internal.h
common/utils/CMakeLists.txt
ctest/cmake/detect-iconv.cmake
ctest/tools/CMakeLists.txt
debian/control
debian/libmonetdb-dev.install
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/rules
documentation/source/manual_pages/monetdbd.rst.in
documentation/source/manual_pages/mserver5.rst.in
gdk/CMakeLists.txt
gdk/ChangeLog.Jun2020
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_cross.c
gdk/gdk_hash.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_tracer.c
gdk/gdk_tracer.h
gdk/gdk_utils.c
gdk/monetdb-gdk.pc.in
geom/lib/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
geom/monetdb5/geom.c
geom/monetdb5/geom.h
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/mal/CMakeLists.txt
monetdb5/mal/Tests/tst201.malC
monetdb5/mal/mal.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_prelude.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_session.c
monetdb5/mal/mel.h
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.mal
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/group.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/batExtensions.h
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
monetdb5/modules/mal/json_util.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_postfix.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_support.c
monetdb5/tools/CMakeLists.txt
monetdb5/tools/monetdb5.pc.in
monetdb_config.h.in
monetdb_config_win32.h.in
rpm.mk.in
sql/ChangeLog
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_subquery.c
sql/backends/monet5/sql_subquery.h
sql/backends/monet5/sql_subquery.mal
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/CMakeLists.txt
sql/backends/monet5/wlr.h
sql/common/sql_types.c
sql/common/sql_types.h
sql/include/sql_catalog.h
sql/scripts/12_url.sql
sql/scripts/40_json.sql
sql/scripts/CMakeLists.txt
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_out2inner_join.txt
sql/server/rel_rel.c
sql/server/rel_rewriter.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_unnest.h
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/server/sql_env.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_qc.h
sql/server/sql_query.c
sql/server/sql_query.h
sql/server/sql_semantic.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/bat/res_table.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
sql/test/BugTracker-2008/Tests/decimal_cast_in_view.SF-2075223.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.err
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.out
sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.out
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/string-to-inet.Bug-3666.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.sql
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out
sql/test/BugTracker-2019/Tests/cast-interval.Bug-6793.stable.out
sql/test/BugTracker-2020/Tests/All
sql/test/BugTracker/Tests/convert_dec2varchar.SF-1774312.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/50ways.stable.out
sql/test/Tests/All
sql/test/analytics/Tests/analytics07.stable.err
sql/test/analytics/Tests/analytics07.stable.out
sql/test/bugs/Tests/cast_varchar2int-bug-sf-964165.stable.out
sql/test/bugs/Tests/select_select_bug.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/All
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-hge/Tests/All
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/All
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/All
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/json/Tests/All
sql/test/mergetables/Tests/mergeinit.stable.err
sql/test/miscellaneous/Tests/groupings.stable.out
sql/test/miscellaneous/Tests/simple_plans.sql
sql/test/miscellaneous/Tests/simple_plans.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/osm/Tests/drop_constraint_bug.stable.out
sql/test/pg_regress/Tests/date.stable.out
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/int8.stable.out.int128
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/subquery/Tests/any_all.sql
sql/test/subquery/Tests/any_all.stable.out
sql/test/subquery/Tests/correlated.stable.out
sql/test/subquery/Tests/subquery.stable.out
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/subquery/Tests/subquery4.stable.out
sql/test/subquery/Tests/subquery5.stable.out
sql/test/subquery/Tests/subquery6.sql
sql/test/subquery/Tests/subquery6.stable.err
sql/test/subquery/Tests/subquery6.stable.out
sql/test/sys-schema/Tests/All
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
testing/CMakeLists.txt
testing/Mtest.py.in
tools/CMakeLists.txt
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/monetdbd.1.in
tools/mserver/CMakeLists.txt
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: makelibstreamgreatagain
Log Message:
Merge 'default' into 'makelibstreamgreatagain'
Everything before the whitespace fixes.
diffs (truncated from 164046 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -3,7 +3,9 @@ current_version = 11.38.0
commit = False
tag = False
-[bumpversion:file:configure.ag]
+[bumpversion:file:cmake/monetdb-versions.cmake]
+parse = set(MONETDB_VERSION_MAJOR "(?P<major>\d+)")\nset(MONETDB_VERSION_MINOR
"(?P<minor>\d+)")\nset(MONETDB_VERSION_PATCH "(?P<patch>\d+)")
+serialize = set(MONETDB_VERSION_MAJOR "{major}")\nset(MONETDB_VERSION_MINOR
"{minor}")\nset(MONETDB_VERSION_PATCH "{patch}")
[bumpversion:file:MonetDB.spec]
search = %global version {current_version}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{c,h}]
+indent_style = tab
+tab_width = 4
+indent_size = tab
+trim_trailing_whitespace = true
+charset = utf-8
+max_line_length = 120
+
+[*.py]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+charset = utf-8
+
+[gdk/*.{c,h}]
+tab_width = 8
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ include(TestBigEndian REQUIRED)
if(WIN32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32.lib shell32.lib advapi32.lib)
endif()
+test_big_endian(IS_BIG_ENDIAN)
# Include MonetDB specific functions
include(monetdb-functions)
@@ -75,6 +76,10 @@ monetdb_configure_crypto()
monetdb_configure_sizes()
include(GNUInstallDirs)
+# The documentation is unclear on what is the best location to install
+# the configuration for the exported targets, especially when building
+# the packages (deb/rpm). For now set the variable to a reasonable value
+set(EXPORT_TARGET_PATH "${CMAKE_INSTALL_DATAROOTDIR}/monetdb/cmake")
# Define the macro variables after configuring the install directories.
# Some variables define additional installation settings.
@@ -86,7 +91,7 @@ include(monetdb-custom-targets)
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+SET(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_FULL_LIBDIR};${CMAKE_INSTALL_FULL_LIBDIR}/monetdb5")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# required for some instalation files
@@ -127,7 +132,7 @@ install(TARGETS
install(EXPORT monetdb_config_headerTargets
FILE monetdb_config_headerTargets.cmake
NAMESPACE MonetDB::
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
install(FILES
@@ -135,11 +140,6 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT monetdbdev)
-# [TODO]: install created python file
-configure_file(create_include_object.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/create_include_object.py
- @ONLY)
-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-undefined,dynamic_lookup
-Wl,-undefined,dynamic_lookup")
endif()
@@ -147,6 +147,7 @@ endif()
add_subdirectory(common)
add_subdirectory(clients)
add_subdirectory(gdk)
+add_subdirectory(misc)
add_subdirectory(monetdb5)
add_subdirectory(sql)
add_subdirectory(geom)
@@ -158,7 +159,7 @@ endif()
include(CMakePackageConfigHelpers)
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake"
- INSTALL_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cmake)"
+ INSTALL_DESTINATION "${EXPORT_TARGET_PATH}"
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
@@ -169,13 +170,14 @@ write_basic_package_version_file(
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
include(monetdb-packages)
include(CTest)
add_subdirectory(ctest)
+add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Wed Jun 10 2020 Sjoerd Mullender <[email protected]>
+- Removed support for LiDAR data, that is the SQL procedures
+ sys.lidarattach, sys.lidarload, and sys.lidarexport.
+
* Thu Apr 2 2020 Martin Kersten <[email protected]>
- The sys.queue() has been turned into a circular buffer to allow for
inspection of both active, paused and recently executed queries.
diff --git a/Config.cmake.in b/Config.cmake.in
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -14,3 +14,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/mapiT
include("${CMAKE_CURRENT_LIST_DIR}/matomicTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/gdkTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/monetdb5Targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/sqlTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/monetdbeTargets.cmake")
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -61,17 +61,6 @@
%endif
%endif
-# On Fedora, the liblas library is available, and so we can require it
-# and build the lidar modules. On RedHat Enterprise Linux and
-# 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
-# By default create the MonetDB-lidar package on Fedora and RHEL 7
-%bcond_without lidar
-%endif
-%endif
-
# By default use PCRE for the implementation of the SQL LIKE and ILIKE
# operators. Otherwise the POSIX regex functions are used.
%bcond_without pcre
@@ -133,10 +122,6 @@ BuildRequires: pkgconfig(cfitsio)
%if %{with geos}
BuildRequires: geos-devel >= 3.4.0
%endif
-%if %{with lidar}
-BuildRequires: liblas-devel >= 1.8.0
-BuildRequires: pkgconfig(gdal)
-%endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
# BuildRequires: libmicrohttpd-devel
@@ -201,6 +186,7 @@ functionality of MonetDB.
%dir %{_includedir}/monetdb
%{_includedir}/monetdb/gdk*.h
%{_includedir}/monetdb/matomic.h
+%{_includedir}/monetdb/mstring.h
%{_includedir}/monetdb/monet*.h
%{_libdir}/libbat.so
%{_libdir}/pkgconfig/monetdb-gdk.pc
@@ -399,28 +385,6 @@ extensions for %{name}-SQL-server5.
%{_libdir}/monetdb5/lib_geom.so
%endif
-%if %{with lidar}
-%package lidar
-Summary: MonetDB5 SQL support for working with LiDAR data
-Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-
-%description lidar
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL front end.
-
-This package contains support for reading and writing LiDAR data.
-
-%files lidar
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_lidar.mal
-%{_libdir}/monetdb5/createdb/*_lidar.sql
-%{_libdir}/monetdb5/lidar.mal
-%{_libdir}/monetdb5/lib_lidar.so
-%endif
-
%if %{with rintegration}
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
@@ -565,9 +529,6 @@ exit 0
%if %{with geos}
%exclude %{_libdir}/monetdb5/geom.mal
%endif
-%if %{with lidar}
-%exclude %{_libdir}/monetdb5/lidar.mal
-%endif
%if %{with py3integration}
%exclude %{_libdir}/monetdb5/pyapi3.mal
%endif
@@ -583,9 +544,6 @@ exit 0
%if %{with geos}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
%endif
-%if %{with lidar}
-%exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
-%endif
%if %{with py3integration}
%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
%endif
@@ -708,9 +666,6 @@ use SQL with MonetDB, you will need to i
%if %{with geos}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
%endif
-%if %{with lidar}
-%exclude %{_libdir}/monetdb5/createdb/*_lidar.sql
-%endif
%{_libdir}/monetdb5/createdb/*.sql
%{_libdir}/monetdb5/sql*.mal
%if %{with hugeint}
@@ -888,7 +843,6 @@ export CFLAGS
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
--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-netcdf=no \
--enable-odbc=yes \
@@ -902,9 +856,8 @@ export CFLAGS
--enable-testing=yes \
--with-bz2=yes \
--with-curl=yes \
- --with-gdal=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --with-gdal=no \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
- --with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \
--with-libxml2=yes \
--with-lz4=no \
--with-lzma=yes \
diff --git a/NT/Makefile b/NT/Makefile
deleted file mode 100644
--- a/NT/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- makefile -*-
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-
-TOPDIR = .
-srcdir = $(TOPDIR)\..
-
-# location of NT directory
-NT = $(srcdir)\NT
-
-prefix = $(MAKEDIR)
-
-# ensure "all" is first target
-all: _all
-
-!INCLUDE "$(NT)\rules.msc"
-
-_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h
unistd.h .monetdb monetdb_hgversion.h
- $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
-
-install: targetdirs all
- $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
- $(INSTALL) .monetdb "$(sysconfdir)"
-
-makewxs:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
