Changeset: 72a13bd9a955 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72a13bd9a955 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 Modified Files: ChangeLog MonetDB.spec NT/rules.msc README-Debian README-Fedora clients/Tests/All cmake/monetdb-deb-packages.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-options.cmake cmake/monetdb-rpm-packages.cmake debian/control debian/monetdb5-server.install debian/monetdb5-sql.install debian/rules gdk/gdk_tracer.h rpm.mk.in sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/CMakeLists.txt sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade/Tests/All sql/test/emptydb/Tests/All sql/test/sys-schema/Tests/All testing/CMakeLists.txt testing/Mtest.py.in Branch: default Log Message:
Removed support for LiDAR. diffs (truncated from 1822 to 300 lines): 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/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 @@ -328,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 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. ") -set(CPACK_DEBIAN_LIDAR_PACKAGE_NAME "libmonetdb5-server-lidar") -set(CPACK_DEBIAN_LIDAR_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}") -set(CPACK_DEBIAN_LIDAR_PACKAGE_SECTION "libs") -set(CPACK_COMPONENT_LIDAR_DESCRIPTION "MonetDB5 SQL GIS support module - 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. -") - set(CPACK_DEBIAN_FITS_PACKAGE_NAME "libmonetdb5-server-cfitsio") set(CPACK_DEBIAN_FITS_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}") set(CPACK_DEBIAN_FITS_PACKAGE_SECTION "libs") diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake --- a/cmake/monetdb-findpackages.cmake +++ b/cmake/monetdb-findpackages.cmake @@ -94,10 +94,6 @@ if(SHP) endif() endif() -if(LIDAR) - find_package(Lidar) -endif() - if(ODBC) find_package(ODBC) set(HAVE_ODBC "${ODBC_FOUND}") diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake --- a/cmake/monetdb-options.cmake +++ b/cmake/monetdb-options.cmake @@ -51,10 +51,6 @@ option(INT128 "Enable support for 128-bit integers (default=ON)" ON) -option(LIDAR - "Enable support for LiDAR data (default=ON)" - ON) - option(NETCDF "Enable support for netcdf (default=ON)" ON) diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake --- a/cmake/monetdb-rpm-packages.cmake +++ b/cmake/monetdb-rpm-packages.cmake @@ -68,11 +68,6 @@ set(CPACK_RPM_geom_FILE_NAME "${CMAKE_PR set(CPACK_RPM_geom_PACKAGE_SUMMARY "MonetDB5 SQL GIS support module") set(CPACK_RPM_geom_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_lidar_PACKAGE_NAME "lidar") -set(CPACK_RPM_lidar_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_lidar_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") -set(CPACK_RPM_lidar_PACKAGE_SUMMARY "MonetDB5 SQL support for working with LiDAR data") -set(CPACK_RPM_lidar_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} = %{version}-%{release}") - set(CPACK_RPM_rapi_PACKAGE_NAME "R") set(CPACK_RPM_rapi_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_rapi_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_rapi_PACKAGE_SUMMARY "Integration of MonetDB and R, allowing use of R from within SQL") diff --git a/debian/control b/debian/control _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
