Changeset: fd08f0dca97d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd08f0dca97d
Added Files:
ctest/tools/embedded/example_connections.c
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.ppc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.ppc64
sql/test/SQLancer/Tests/All
sql/test/SQLancer/Tests/sqlancer01.sql
sql/test/SQLancer/Tests/sqlancer01.stable.err
sql/test/SQLancer/Tests/sqlancer01.stable.out
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/out2in/Tests/out2in.stable.out.int128
Removed Files:
cmake/Modules/FindLiblas.cmake
cmake/Modules/FindLidar.cmake
debian/libmonetdb5-server-lidar.install
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/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
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
Modified Files:
.bumpversion.cfg
CMakeLists.txt
ChangeLog
Config.cmake.in
MonetDB.spec
NT/rules.msc
README-Debian
README-Fedora
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
cmake/monetdb-deb-packages.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-options.cmake
cmake/monetdb-rpm-packages.cmake
cmake/monetdb-toolchain.cmake
cmake/monetdb-versions.cmake
ctest/tools/embedded/CMakeLists.txt
ctest/tools/embedded/backup.c
ctest/tools/embedded/example2.c
ctest/tools/embedded/mapi.c
debian/control
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/rules
gdk/CMakeLists.txt
gdk/gdk_tracer.h
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb_config.h.in
monetdb_config_win32.h.in
rpm.mk.in
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/CMakeLists.txt
sql/server/rel_exp.c
sql/server/sql_env.c
sql/storage/store.c
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/out2in/Tests/out2in.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/embedded/CMakeLists.txt
tools/embedded/monetdb_embedded.c
tools/mserver/CMakeLists.txt
Branch: unlock
Log Message:
merged
diffs (truncated from 14898 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/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,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
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 <sjo...@acm.org>
+- Removed support for LiDAR data, that is the SQL procedures
+ sys.lidarattach, sys.lidarload, and sys.lidarexport.
+
* Thu Apr 2 2020 Martin Kersten <m...@cwi.nl>
- 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}/embeddedTargets.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
@@ -400,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
@@ -566,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
@@ -584,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
@@ -709,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}
@@ -889,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 \
@@ -903,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/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -278,11 +278,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_CURL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_DEVELOPER
- $(ECHO) HAVE_DEVELOPER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_DEVELOPER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_FITS
$(ECHO) HAVE_FITS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -333,11 +328,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBZ_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_LIDAR
- $(ECHO) HAVE_LIDAR_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_LIDAR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_NETCDF
$(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -368,11 +358,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_MAL_DEBUGGER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_TESTING
- $(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_TESTING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF NATIVE_WIN32
$(ECHO) NATIVE_WIN32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/README-Debian b/README-Debian
--- a/README-Debian
+++ b/README-Debian
@@ -15,7 +15,6 @@ These packages are optional, but require
libbz2-dev # optional: read and write .bz2 compressed files
libcurl4-gnutls-dev # optional: read remote files with sys.getcontent(url)
libgeos-dev # optional: required for geom module
-liblas-c-dev # optional: read LIDAR files
liblzma-dev # optional: read and write .xz compressed files
libpcre3-dev # optional: use PCRE library, enable some functions
libreadline-dev # optional, enable editing in mclient
diff --git a/README-Fedora b/README-Fedora
--- a/README-Fedora
+++ b/README-Fedora
@@ -31,7 +31,6 @@ These packages are optional.
cfitsio-devel # optional: read FITS files
libasan # optional: --enable-sanitizer configuration
(debug)
-liblas-devel # optional: read LIDAR files
lz4-devel # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
netcdf-devel # optional: read NetCDF files
proj-devel # optional, only optionally used in geom module
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
exports
-HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_LIDAR&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
#MERCURIAL?malcheck
mclient-uri
diff --git a/cmake/Modules/FindLiblas.cmake b/cmake/Modules/FindLiblas.cmake
deleted file mode 100644
--- a/cmake/Modules/FindLiblas.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-# - Find liblas
-# Find the native liblas headers and libraries.
-#
-# LIBLAS_INCLUDE_DIR - where to find liblas.h, etc.
-# LIBLAS_LIBRARIES - List of libraries when using liblas.
-# LIBLAS_VERSION - liblas version if found
-# LIBLAS_FOUND - True if liblas found.
-
-# Look for the header file.
-find_path(LIBLAS_INCLUDE_DIR NAMES liblas/capi/liblas.h
liblas/capi/las_version.h liblas/capi/las_config.h)
-
-find_library(LIBLAS_LIBRARIES NAMES las)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBLAS DEFAULT_MSG LIBLAS_LIBRARIES
LIBLAS_INCLUDE_DIR)
-
-# Look for the library.
-if(LIBLAS_FOUND)
- file(STRINGS "${LIBLAS_INCLUDE_DIR}/liblas/capi/las_version.h"
LIBLAS_VERSION_LINES REGEX "#define[ \t]+LIBLAS_VERSION_(MAJOR|MINOR|REV)")
- string(REGEX REPLACE ".*LIBLAS_VERSION_MAJOR *\([0-9]*\).*" "\\1"
LIBLAS_VERSION_MAJOR "${LIBLAS_VERSION_LINES}")
- string(REGEX REPLACE ".*LIBLAS_VERSION_MINOR *\([0-9]*\).*" "\\1"
LIBLAS_VERSION_MINOR "${LIBLAS_VERSION_LINES}")
- string(REGEX REPLACE ".*LIBLAS_VERSION_REV *\([0-9]*\).*" "\\1"
LIBLAS_VERSION_REV "${LIBLAS_VERSION_LINES}")
- set(LIBLAS_VERSION
"${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_REV}")
-endif()
-
-mark_as_advanced(LIBLAS_INCLUDE_DIR LIBLAS_LIBRARIES LIBLAS_VERSION)
-
-if(LIBLAS_FOUND)
- add_library(Liblas::Liblas UNKNOWN IMPORTED)
- set_target_properties(Liblas::Liblas
- PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${LIBLAS_INCLUDE_DIR}")
- set_target_properties(Liblas::Liblas
- PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${LIBLAS_LIBRARIES}")
-endif()
diff --git a/cmake/Modules/FindLidar.cmake b/cmake/Modules/FindLidar.cmake
deleted file mode 100644
--- a/cmake/Modules/FindLidar.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
- #include(/usr/share/cmake/libLAS/liblas-config.cmake)
- #include(/usr/share/cmake/libLAS/liblas-config-version.cmake)
-
- #if(LIBLAS_FOUND)
- #set(LIBLAS_VERSION_REQUIRED_MIN "1.8.0")
- #if(LIBLAS_VERSION VERSION_LESS "${LIBLAS_MINIMUM_VERSION}")
- ##if(${WITH_LIBLAS} STREQUAL "YES")
- ## message(FATAL_ERROR "liblas library found, but the version is
too old: ${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
- ##else()
- #message(STATUS "liblas library found, but the version is too old:
${LIBLAS_VERSION} < ${LIBLAS_MINIMUM_VERSION}")
- ##endif()
- #else()
- #set(HAVE_LIDAR "${LIBLAS_FOUND}")
- #endif()
- ##else()
- ## message(FATAL_ERROR "liblas library required for lidar module")
- #endif()
diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake
--- a/cmake/monetdb-deb-packages.cmake
+++ b/cmake/monetdb-deb-packages.cmake
@@ -148,18 +148,6 @@ set(CPACK_COMPONENT_GEOM_DESCRIPTION "Mo
extensions for MonetDB-SQL-server5.
")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
