Changeset: 21b0cdd383d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/21b0cdd383d0
Removed Files:
ctest/cmake/detect-libr.cmake
ctest/cmake/set-cmake-vars.cmake
ctest/cmake/test_detect_libr.c.in
debian/monetdb-r.install
sql/backends/monet5/UDF/rapi/CMakeLists.txt
sql/backends/monet5/UDF/rapi/Tests/6674-r-date.test
sql/backends/monet5/UDF/rapi/Tests/All
sql/backends/monet5/UDF/rapi/Tests/SingleServer
sql/backends/monet5/UDF/rapi/Tests/malrapi00.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi01.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi02.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi03.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi04.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi05.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi07.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi08.maltest
sql/backends/monet5/UDF/rapi/Tests/malrapi10.maltest
sql/backends/monet5/UDF/rapi/Tests/rapi00.test
sql/backends/monet5/UDF/rapi/Tests/rapi01.test
sql/backends/monet5/UDF/rapi/Tests/rapi02.test
sql/backends/monet5/UDF/rapi/Tests/rapi03.test
sql/backends/monet5/UDF/rapi/Tests/rapi05.test
sql/backends/monet5/UDF/rapi/Tests/rapi06.test
sql/backends/monet5/UDF/rapi/Tests/rapi07.test
sql/backends/monet5/UDF/rapi/Tests/rapi09.test
sql/backends/monet5/UDF/rapi/Tests/rapi09a.test
sql/backends/monet5/UDF/rapi/Tests/rapi10.test
sql/backends/monet5/UDF/rapi/Tests/rapi12.test
sql/backends/monet5/UDF/rapi/Tests/rapi13.test
sql/backends/monet5/UDF/rapi/Tests/rapi14.test
sql/backends/monet5/UDF/rapi/Tests/rapi15.test
sql/backends/monet5/UDF/rapi/Tests/rapi16.test
sql/backends/monet5/UDF/rapi/Tests/rapi17.test
sql/backends/monet5/UDF/rapi/Tests/rapi18.test
sql/backends/monet5/UDF/rapi/Tests/rapi19.test
sql/backends/monet5/UDF/rapi/Tests/rapi20.test
sql/backends/monet5/UDF/rapi/rapi.R
sql/backends/monet5/UDF/rapi/rapi.c
Modified Files:
.github/workflows/linux.yml
ChangeLog
MonetDB.spec
README.rst
clients/Tests/All
clients/Tests/MAL-signatures-hge.test
clients/Tests/SingleServer
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-options.cmake
ctest/cmake/CMakeLists.txt
debian/control
debian/monetdb-server.install
debian/rules
documentation/source/build-debian.rst
documentation/source/build-fedora.rst
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.h
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_support.c
monetdb_config.h.in
sql/backends/monet5/UDF/CMakeLists.txt
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/include/sql_catalog.h
sql/scripts/10_sys_schema_extension.sql
sql/server/rel_psm.c
sql/server/sql_parser.y
sql/test/BugTracker-2020/Tests/All
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.py
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.int128
sql/test/testdb/Tests/dump-nogeom.stable.out
sql/test/testdb/Tests/dump.stable.out
sql/test/testdb/Tests/load.test
testing/CMakeLists.txt
testing/Mtest.py.in
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Removed embedded R support.
diffs (truncated from 4456 to 300 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -75,7 +75,6 @@ jobs:
cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/MDB \
-DPY3INTEGRATION=OFF \
- -DRINTEGRATION=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DASSERT=OFF \
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
@@ -94,7 +93,6 @@ jobs:
cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/MDB \
-DPY3INTEGRATION=OFF \
- -DRINTEGRATION=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DASSERT=OFF \
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
@@ -110,7 +108,6 @@ jobs:
cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/MDB \
-DPY3INTEGRATION=OFF \
- -DRINTEGRATION=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DASSERT=OFF \
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
@@ -130,7 +127,7 @@ jobs:
run: |
mkdir build
cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=C:\MDB
-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake
-DPY3INTEGRATION=OFF -DRINTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release
-DASSERT=OFF -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_SUMMARY=ON
+ cmake .. -DCMAKE_INSTALL_PREFIX=C:\MDB
-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_SUMMARY=ON
cmake --build . --target install
if: runner.os == 'Windows'
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
# This file is updated with Maddlog
* Fri Jun 19 2026 Sjoerd Mullender <[email protected]>
+- Removed embedded R support. It is no longer possible to use
+ user-defined functions which are written in R (i.e. using `CREATE
+ FUNCTION ... LANGUAGE R ...`). Upgrading to this version will succeed
+ if such functions are defined, but they cannot be used anymore.
+ Use this query to find all affected functions: `SELECT s.name, f.name
+ FROM sys.functions f JOIN sys.schemas s ON s.id = f.schema_id WHERE
+ f.language = 3;`. These functions can then be dropped manually.
- Removed embedded C support. It is no longer possible to use user-defined
functions which are written in C or C++ (i.e. using `CREATE FUNCTION
... LANGUAGE C ...`). Upgrading to this version will succeed if such
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -67,11 +67,6 @@
# operators. Otherwise the POSIX regex functions are used.
%bcond_without pcre
-%if %{fedpkgs}
-# By default, create the MonetDB-R package.
-%bcond_without rintegration
-%endif
-
# By default, include Python 3 integration.
%bcond_without py3integration
@@ -131,9 +126,6 @@ BuildRequires: pkgconfig(liblz4) >= 1.8
BuildRequires: pkgconfig(python3) >= 3.5
BuildRequires: python3dist(numpy)
%endif
-%if %{with rintegration}
-BuildRequires: pkgconfig(libR)
-%endif
# optional packages:
# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
# BuildRequires: pkgconfig(gdal) # -DSHP=ON
@@ -481,31 +473,6 @@ extensions for %{name}-server.
%{_libdir}/monetdb5*/lib_geom.so
%endif
-%if %{with rintegration}
-%package R
-Summary: Integration of MonetDB and R, allowing use of R from within SQL
-Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-
-%description R
-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 the interface to use the R language from within
-SQL queries.
-
-NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES. If you don't
-know how this package affects the security of your system, do not
-install it.
-
-%files R
-%defattr(-,root,root)
-%{_libdir}/monetdb5*/rapi.R
-%{_libdir}/monetdb5*/lib_rapi.so
-%endif
-
%if %{with py3integration}
%package python3
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
@@ -952,7 +919,6 @@ fi
-DNETCDF=OFF \
-DODBC=ON \
-DPY3INTEGRATION=%{?with_py3integration:ON}%{!?with_py3integration:OFF} \
- -DRINTEGRATION=%{?with_rintegration:ON}%{!?with_rintegration:OFF} \
-DSANITIZER=OFF \
-DSHP=OFF \
-DSTRICT=OFF \
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -65,7 +65,6 @@ Available options are:
Option Explanation
=================
===============================================================================================
ASSERT Enable asserts (default=ON for development sources, OFF
for tarball installation)
-CINTEGRATION Enable support for C UDFs (default=ON except on Windows)
CMAKE_SUMMARY Show a summary of the cmake configuration (for debug
purposes, default=OFF)
CMAKE_UNITTESTS Build and run the unittest for the build system
(default=OFF)
FITS Enable support for FITS
@@ -74,7 +73,6 @@ INT128 Enable support for 1
NETCDF Enable support for netcdf
ODBC Compile the MonetDB ODBC driver
PY3INTEGRATION Enable support for Python 3 integration into MonetDB
-RINTEGRATION Enable support for R integration into MonetDB
SANITIZER Enable support for the GCC address sanitizer (default=OFF)
SHP Enable support for ESRI Shapefiles
STRICT Enable strict compiler flags (default=ON for development
sources, OFF for tarball installation)
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,6 +1,6 @@
MERCURIAL?exports
-HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP?MAL-signatures-hge
-!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP?MAL-signatures
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP?MAL-signatures-hge
+!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP?MAL-signatures
NOT_WIN32?melcheck
mclient-uri
testcondvar
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -34148,26 +34148,6 @@ subeval_aggr
unsafe pattern batpyapi3.subeval_aggr(X_0:ptr, X_1:str, X_2:any...):any...
PYAPI3PyAPIevalAggr
grouped aggregates through Python
-batrapi
-eval
-pattern batrapi.eval(X_0:lng, X_1:ptr, X_2:str):any...
-RAPIevalStd
-Execute a simple R script value
-batrapi
-eval
-pattern batrapi.eval(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalStd
-Execute a simple R script value
-batrapi
-eval_aggr
-pattern batrapi.eval_aggr(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalAggr
-grouped aggregates through R
-batrapi
-subeval_aggr
-pattern batrapi.subeval_aggr(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalAggr
-grouped aggregates through R
batsql
all
pattern batsql.all(X_0:bat[:bit], X_1:bat[:bit], X_2:bat[:bit]):bat[:bit]
@@ -49268,26 +49248,6 @@ isset
command querylog.isset():int
QLOGissetFcn
Return status of query logger
-rapi
-eval
-pattern rapi.eval(X_0:ptr, X_1:str):any
-RAPIevalStd
-Execute a simple R script returning a single value
-rapi
-eval
-pattern rapi.eval(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalStd
-Execute a simple R script value
-rapi
-eval_aggr
-pattern rapi.eval_aggr(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalAggr
-grouped aggregates through R
-rapi
-subeval_aggr
-pattern rapi.subeval_aggr(X_0:ptr, X_1:str, X_2:any...):any...
-RAPIevalAggr
-grouped aggregates through R
remote
batbincopy
pattern remote.batbincopy():bat[:any]
diff --git a/clients/Tests/SingleServer b/clients/Tests/SingleServer
--- a/clients/Tests/SingleServer
+++ b/clients/Tests/SingleServer
@@ -1,2 +1,1 @@
---set embedded_r=yes
--set embedded_py=3
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -851,7 +851,6 @@ const char batmkeyRef[];
const char batmmathRef[];
const char batmtimeRef[];
const char batpyapi3Ref[];
-const char batrapiRef[];
const char batsqlRef[];
const char batstrRef[];
bool batstr_func_has_candidates(const char *func);
@@ -1184,7 +1183,6 @@ const char querylogRef[];
const char raiseRef[];
const char rangejoinRef[];
const char rankRef[];
-const char rapiRef[];
MalStkPtr reallocGlobalStack(allocator *ma, MalStkPtr s, int cnt);
const char reconnectRef[];
str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2447,6 +2447,9 @@ dump_function(Mapi mid, stream *sqlf, co
/* backward compatibility: dump language types for
removed
* implementations */
switch (flang) {
+ case 3:
+ mnstr_printf(sqlf, " LANGUAGE R");
+ break;
case 4:
mnstr_printf(sqlf, " LANGUAGE C");
break;
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -141,8 +141,6 @@ macro(monetdb_macro_variables)
set(HAVE_NETCDF ${NETCDF_FOUND})
set(HAVE_READLINE ${READLINE_FOUND})
set(HAVE_ODBCINST ${ODBCinst_FOUND})
- set(HAVE_LIBR ${LIBR_FOUND})
- set(RHOME "${LIBR_HOME}")
set(HAVE_GEOM ${GEOS_FOUND})
set(HAVE_SHP ${GDAL_FOUND})
set(SANITIZER ${SANITIZER})
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -98,10 +98,6 @@ if(ODBC)
find_package(ODBCinst)
endif()
-if(RINTEGRATION)
- find_package(LibR)
-endif()
-
if(WITH_MALLOC)
find_package(PkgConfig QUIET)
if(${WITH_MALLOC} STREQUAL "mimalloc")
diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake
--- a/cmake/monetdb-options.cmake
+++ b/cmake/monetdb-options.cmake
@@ -35,10 +35,6 @@ option(PY3INTEGRATION
"Enable support for Python 3 integration into MonetDB (default=ON)"
ON)
-option(RINTEGRATION
- "Enable support for R integration into MonetDB (default=ON)"
- ON)
-
option(FITS
"Enable support for FITS (default=ON)"
ON)
diff --git a/ctest/cmake/CMakeLists.txt b/ctest/cmake/CMakeLists.txt
--- a/ctest/cmake/CMakeLists.txt
+++ b/ctest/cmake/CMakeLists.txt
@@ -28,7 +28,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/dete
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-proj.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-netcdf.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-readline.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/detect-libr.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-fits.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-valgrind.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-geos.cmake)
@@ -42,7 +41,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/dete
include(${CMAKE_CURRENT_SOURCE_DIR}/detect-pthreadsig.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/set-dir-vars.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/set-cmake-vars.cmake)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
