Changeset: d1a81764e88c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/d1a81764e88c Removed Files: monetdb5/extras/rapi/rapi.c Modified Files: sql/backends/monet5/UDF/rapi/rapi.c Branch: default Log Message:
Merge with Dec2025 branch. diffs (truncated from 479 to 300 lines): diff --git a/monetdb5/CMakeLists.txt b/monetdb5/CMakeLists.txt --- a/monetdb5/CMakeLists.txt +++ b/monetdb5/CMakeLists.txt @@ -12,7 +12,6 @@ add_subdirectory(mal) add_subdirectory(modules) add_subdirectory(optimizer) add_subdirectory(tools) -add_subdirectory(extras) if(WIN32) add_subdirectory(NT) endif() diff --git a/monetdb5/extras/CMakeLists.txt b/monetdb5/extras/CMakeLists.txt deleted file mode 100644 --- a/monetdb5/extras/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# 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/. -# -# For copyright information, see the file debian/copyright. -#]] - -add_subdirectory(rapi) diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All --- a/sql/backends/monet5/Tests/All +++ b/sql/backends/monet5/Tests/All @@ -1,26 +1,5 @@ optimizers -HAVE_LIBR?rapi00 -HAVE_LIBR?rapi01 -HAVE_LIBR?rapi02 -HAVE_LIBR?rapi03 -HAVE_LIBR?rapi05 -HAVE_LIBR?rapi06 -HAVE_LIBR?rapi07 -HAVE_LIBR?rapi09 -HAVE_LIBR&!R_VERSION>=4.2.0?rapi09a -HAVE_LIBR?rapi10 -HAVE_LIBR?rapi12 -HAVE_LIBR?rapi13 -HAVE_LIBR?rapi14 -HAVE_LIBR?rapi15 -HAVE_LIBR?rapi16 -HAVE_LIBR?rapi17 -HAVE_LIBR?rapi18 -HAVE_LIBR?rapi19 -HAVE_LIBR?rapi20 - - # should this work? #inlineUDF diff --git a/sql/backends/monet5/Tests/SingleServer b/sql/backends/monet5/Tests/SingleServer --- a/sql/backends/monet5/Tests/SingleServer +++ b/sql/backends/monet5/Tests/SingleServer @@ -1,1 +0,0 @@ ---set embedded_r=yes diff --git a/sql/backends/monet5/UDF/CMakeLists.txt b/sql/backends/monet5/UDF/CMakeLists.txt --- a/sql/backends/monet5/UDF/CMakeLists.txt +++ b/sql/backends/monet5/UDF/CMakeLists.txt @@ -11,3 +11,4 @@ add_subdirectory(udf) add_subdirectory(capi) add_subdirectory(pyapi3) +add_subdirectory(rapi) diff --git a/sql/test/BugTracker-2022/Tests/cudf-grouped-aggr.Bug-7285.test b/sql/backends/monet5/UDF/capi/Tests/7285-cudf-grouped-aggr.test rename from sql/test/BugTracker-2022/Tests/cudf-grouped-aggr.Bug-7285.test rename to sql/backends/monet5/UDF/capi/Tests/7285-cudf-grouped-aggr.test diff --git a/sql/test/BugTracker-2024/Tests/7525-cudf-aggr-var-input.test b/sql/backends/monet5/UDF/capi/Tests/7525-cudf-aggr-var-input.test rename from sql/test/BugTracker-2024/Tests/7525-cudf-aggr-var-input.test rename to sql/backends/monet5/UDF/capi/Tests/7525-cudf-aggr-var-input.test diff --git a/sql/backends/monet5/UDF/capi/Tests/All b/sql/backends/monet5/UDF/capi/Tests/All --- a/sql/backends/monet5/UDF/capi/Tests/All +++ b/sql/backends/monet5/UDF/capi/Tests/All @@ -18,3 +18,6 @@ HAVE_CUDF?capi15 HAVE_CUDF?capi16 HAVE_CUDF?capi17 HAVE_CUDF?capi18 + +HAVE_CUDF?7285-cudf-grouped-aggr +HAVE_CUDF?7525-cudf-aggr-var-input diff --git a/sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.test b/sql/backends/monet5/UDF/pyapi3/Tests/6385-aggr_udf_with_more_than_2params.test rename from sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6385-aggr_udf_with_more_than_2params.test diff --git a/sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.test b/sql/backends/monet5/UDF/pyapi3/Tests/6444-table_returning_with.test rename from sql/test/BugTracker-2017/Tests/table_returning_with.Bug-6444.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6444-table_returning_with.test diff --git a/sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.test b/sql/backends/monet5/UDF/pyapi3/Tests/6464-python_loader_clobbers_default_with_null.test rename from sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6464-python_loader_clobbers_default_with_null.test diff --git a/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.test b/sql/backends/monet5/UDF/pyapi3/Tests/6508-pyUDF-crash.test rename from sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6508-pyUDF-crash.test diff --git a/sql/test/BugTracker-2019/Tests/python-aggregate-no-groups.Bug-6726.test b/sql/backends/monet5/UDF/pyapi3/Tests/6726-python-aggregate-no-groups.test rename from sql/test/BugTracker-2019/Tests/python-aggregate-no-groups.Bug-6726.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6726-python-aggregate-no-groups.test diff --git a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py b/sql/backends/monet5/UDF/pyapi3/Tests/6759-python-loader-string.py rename from sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py rename to sql/backends/monet5/UDF/pyapi3/Tests/6759-python-loader-string.py diff --git a/sql/test/BugTracker-2019/Tests/python3-udf-modules.Bug-6797.test b/sql/backends/monet5/UDF/pyapi3/Tests/6797-python3-udf-modules.test rename from sql/test/BugTracker-2019/Tests/python3-udf-modules.Bug-6797.test rename to sql/backends/monet5/UDF/pyapi3/Tests/6797-python3-udf-modules.test diff --git a/sql/test/BugTracker-2021/Tests/python-aggregates-void-bat.Bug-7138.test b/sql/backends/monet5/UDF/pyapi3/Tests/7138-python-aggregates-void-bat.test rename from sql/test/BugTracker-2021/Tests/python-aggregates-void-bat.Bug-7138.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7138-python-aggregates-void-bat.test diff --git a/sql/test/BugTracker-2021/Tests/aggregates-tables.Bug-7142.test b/sql/backends/monet5/UDF/pyapi3/Tests/7142-aggregates-tables.test rename from sql/test/BugTracker-2021/Tests/aggregates-tables.Bug-7142.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7142-aggregates-tables.test diff --git a/sql/test/BugTracker-2021/Tests/python-aggregates-empty.Bug-7158.test b/sql/backends/monet5/UDF/pyapi3/Tests/7158-python-aggregates-empty.test rename from sql/test/BugTracker-2021/Tests/python-aggregates-empty.Bug-7158.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7158-python-aggregates-empty.test diff --git a/sql/test/BugTracker-2021/Tests/python-empty-arrays.Bug-7206.test b/sql/backends/monet5/UDF/pyapi3/Tests/7206-python-empty-arrays.test rename from sql/test/BugTracker-2021/Tests/python-empty-arrays.Bug-7206.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7206-python-empty-arrays.test diff --git a/sql/test/BugTracker-2022/Tests/python-udf-inside-udf.Bug-7252.test b/sql/backends/monet5/UDF/pyapi3/Tests/7252-python-udf-inside-udf.test rename from sql/test/BugTracker-2022/Tests/python-udf-inside-udf.Bug-7252.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7252-python-udf-inside-udf.test diff --git a/sql/test/BugTracker-2023/Tests/aggregate-vararg.Bug-7422.test b/sql/backends/monet5/UDF/pyapi3/Tests/7422-aggregate-vararg.test rename from sql/test/BugTracker-2023/Tests/aggregate-vararg.Bug-7422.test rename to sql/backends/monet5/UDF/pyapi3/Tests/7422-aggregate-vararg.test diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/All b/sql/backends/monet5/UDF/pyapi3/Tests/All --- a/sql/backends/monet5/UDF/pyapi3/Tests/All +++ b/sql/backends/monet5/UDF/pyapi3/Tests/All @@ -31,3 +31,17 @@ HAVE_LIBPY3?pyapi3_32 HAVE_LIBPY3?pyloader3_01 HAVE_LIBPY3?pyloader3_02 HAVE_LIBPY3?pyloader3_05 + +HAVE_LIBPY3?6385-aggr_udf_with_more_than_2params +HAVE_LIBPY3?6444-table_returning_with +HAVE_LIBPY3?6464-python_loader_clobbers_default_with_null +HAVE_LIBPY3?6508-pyUDF-crash +HAVE_LIBPY3?6726-python-aggregate-no-groups +HAVE_LIBPY3?6759-python-loader-string +HAVE_LIBPY3?6797-python3-udf-modules +HAVE_LIBPY3?7138-python-aggregates-void-bat +HAVE_LIBPY3?7142-aggregates-tables +HAVE_LIBPY3?7158-python-aggregates-empty +HAVE_LIBPY3?7206-python-empty-arrays +HAVE_LIBPY3?7252-python-udf-inside-udf +HAVE_LIBPY3?7422-aggregate-vararg diff --git a/monetdb5/extras/rapi/CMakeLists.txt b/sql/backends/monet5/UDF/rapi/CMakeLists.txt rename from monetdb5/extras/rapi/CMakeLists.txt rename to sql/backends/monet5/UDF/rapi/CMakeLists.txt diff --git a/sql/test/BugTracker-2019/Tests/r-date.Bug-6674.test b/sql/backends/monet5/UDF/rapi/Tests/6674-r-date.test rename from sql/test/BugTracker-2019/Tests/r-date.Bug-6674.test rename to sql/backends/monet5/UDF/rapi/Tests/6674-r-date.test diff --git a/monetdb5/extras/rapi/Tests/All b/sql/backends/monet5/UDF/rapi/Tests/All rename from monetdb5/extras/rapi/Tests/All rename to sql/backends/monet5/UDF/rapi/Tests/All --- a/monetdb5/extras/rapi/Tests/All +++ b/sql/backends/monet5/UDF/rapi/Tests/All @@ -1,9 +1,31 @@ +HAVE_LIBR?malrapi00 +HAVE_LIBR?malrapi01 +HAVE_LIBR&HAVE_HGE?malrapi02 +HAVE_LIBR?malrapi03 +HAVE_LIBR?malrapi04 +HAVE_LIBR?malrapi05 +HAVE_LIBR?malrapi07 +HAVE_LIBR?malrapi08 +HAVE_LIBR?malrapi10 + HAVE_LIBR?rapi00 HAVE_LIBR?rapi01 -HAVE_LIBR&HAVE_HGE?rapi02 +HAVE_LIBR?rapi02 HAVE_LIBR?rapi03 -HAVE_LIBR?rapi04 HAVE_LIBR?rapi05 +HAVE_LIBR?rapi06 HAVE_LIBR?rapi07 -HAVE_LIBR?rapi08 +HAVE_LIBR?rapi09 +HAVE_LIBR&!R_VERSION>=4.2.0?rapi09a HAVE_LIBR?rapi10 +HAVE_LIBR?rapi12 +HAVE_LIBR?rapi13 +HAVE_LIBR?rapi14 +HAVE_LIBR?rapi15 +HAVE_LIBR?rapi16 +HAVE_LIBR?rapi17 +HAVE_LIBR?rapi18 +HAVE_LIBR?rapi19 +HAVE_LIBR?rapi20 + +HAVE_LIBR?6674-r-date diff --git a/monetdb5/extras/rapi/Tests/SingleServer b/sql/backends/monet5/UDF/rapi/Tests/SingleServer rename from monetdb5/extras/rapi/Tests/SingleServer rename to sql/backends/monet5/UDF/rapi/Tests/SingleServer diff --git a/monetdb5/extras/rapi/Tests/rapi00.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi00.maltest rename from monetdb5/extras/rapi/Tests/rapi00.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi00.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi01.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi01.maltest rename from monetdb5/extras/rapi/Tests/rapi01.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi01.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi02.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi02.maltest rename from monetdb5/extras/rapi/Tests/rapi02.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi02.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi03.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi03.maltest rename from monetdb5/extras/rapi/Tests/rapi03.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi03.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi04.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi04.maltest rename from monetdb5/extras/rapi/Tests/rapi04.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi04.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi05.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi05.maltest rename from monetdb5/extras/rapi/Tests/rapi05.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi05.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi07.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi07.maltest rename from monetdb5/extras/rapi/Tests/rapi07.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi07.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi08.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi08.maltest rename from monetdb5/extras/rapi/Tests/rapi08.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi08.maltest diff --git a/monetdb5/extras/rapi/Tests/rapi10.maltest b/sql/backends/monet5/UDF/rapi/Tests/malrapi10.maltest rename from monetdb5/extras/rapi/Tests/rapi10.maltest rename to sql/backends/monet5/UDF/rapi/Tests/malrapi10.maltest diff --git a/sql/backends/monet5/Tests/rapi00.test b/sql/backends/monet5/UDF/rapi/Tests/rapi00.test rename from sql/backends/monet5/Tests/rapi00.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi00.test diff --git a/sql/backends/monet5/Tests/rapi01.test b/sql/backends/monet5/UDF/rapi/Tests/rapi01.test rename from sql/backends/monet5/Tests/rapi01.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi01.test diff --git a/sql/backends/monet5/Tests/rapi02.test b/sql/backends/monet5/UDF/rapi/Tests/rapi02.test rename from sql/backends/monet5/Tests/rapi02.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi02.test diff --git a/sql/backends/monet5/Tests/rapi03.test b/sql/backends/monet5/UDF/rapi/Tests/rapi03.test rename from sql/backends/monet5/Tests/rapi03.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi03.test diff --git a/sql/backends/monet5/Tests/rapi05.test b/sql/backends/monet5/UDF/rapi/Tests/rapi05.test rename from sql/backends/monet5/Tests/rapi05.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi05.test diff --git a/sql/backends/monet5/Tests/rapi06.test b/sql/backends/monet5/UDF/rapi/Tests/rapi06.test rename from sql/backends/monet5/Tests/rapi06.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi06.test diff --git a/sql/backends/monet5/Tests/rapi07.test b/sql/backends/monet5/UDF/rapi/Tests/rapi07.test rename from sql/backends/monet5/Tests/rapi07.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi07.test diff --git a/sql/backends/monet5/Tests/rapi09.test b/sql/backends/monet5/UDF/rapi/Tests/rapi09.test rename from sql/backends/monet5/Tests/rapi09.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi09.test diff --git a/sql/backends/monet5/Tests/rapi09a.test b/sql/backends/monet5/UDF/rapi/Tests/rapi09a.test rename from sql/backends/monet5/Tests/rapi09a.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi09a.test diff --git a/sql/backends/monet5/Tests/rapi10.test b/sql/backends/monet5/UDF/rapi/Tests/rapi10.test rename from sql/backends/monet5/Tests/rapi10.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi10.test diff --git a/sql/backends/monet5/Tests/rapi12.test b/sql/backends/monet5/UDF/rapi/Tests/rapi12.test rename from sql/backends/monet5/Tests/rapi12.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi12.test diff --git a/sql/backends/monet5/Tests/rapi13.test b/sql/backends/monet5/UDF/rapi/Tests/rapi13.test rename from sql/backends/monet5/Tests/rapi13.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi13.test diff --git a/sql/backends/monet5/Tests/rapi14.test b/sql/backends/monet5/UDF/rapi/Tests/rapi14.test rename from sql/backends/monet5/Tests/rapi14.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi14.test diff --git a/sql/backends/monet5/Tests/rapi15.test b/sql/backends/monet5/UDF/rapi/Tests/rapi15.test rename from sql/backends/monet5/Tests/rapi15.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi15.test diff --git a/sql/backends/monet5/Tests/rapi16.test b/sql/backends/monet5/UDF/rapi/Tests/rapi16.test rename from sql/backends/monet5/Tests/rapi16.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi16.test diff --git a/sql/backends/monet5/Tests/rapi17.test b/sql/backends/monet5/UDF/rapi/Tests/rapi17.test rename from sql/backends/monet5/Tests/rapi17.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi17.test diff --git a/sql/backends/monet5/Tests/rapi18.test b/sql/backends/monet5/UDF/rapi/Tests/rapi18.test rename from sql/backends/monet5/Tests/rapi18.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi18.test diff --git a/sql/backends/monet5/Tests/rapi19.test b/sql/backends/monet5/UDF/rapi/Tests/rapi19.test rename from sql/backends/monet5/Tests/rapi19.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi19.test diff --git a/sql/backends/monet5/Tests/rapi20.test b/sql/backends/monet5/UDF/rapi/Tests/rapi20.test rename from sql/backends/monet5/Tests/rapi20.test rename to sql/backends/monet5/UDF/rapi/Tests/rapi20.test diff --git a/monetdb5/extras/rapi/rapi.R b/sql/backends/monet5/UDF/rapi/rapi.R rename from monetdb5/extras/rapi/rapi.R rename to sql/backends/monet5/UDF/rapi/rapi.R diff --git a/monetdb5/extras/rapi/rapi.c b/sql/backends/monet5/UDF/rapi/rapi.c rename from monetdb5/extras/rapi/rapi.c rename to sql/backends/monet5/UDF/rapi/rapi.c diff --git a/sql/test/BugTracker-2017/Tests/All b/sql/test/BugTracker-2017/Tests/All --- a/sql/test/BugTracker-2017/Tests/All +++ b/sql/test/BugTracker-2017/Tests/All @@ -75,7 +75,6 @@ spurious_error.Bug-6344 caching_stats_bug.6374 name-interference.Bug-6348 parsererror.Bug-6381 -HAVE_LIBPY3?aggr_udf_with_more_than_2params.Bug-6385 exists.Bug-6392 case.Bug-6386 sqllitelogistest_case.Bug-6335 @@ -102,10 +101,8 @@ sqlitelogictest-select-not-in.Bug-6435 drop_schema_restrict.Bug-6438 date-arithmetic.Bug-6415 sqlitelogictest-cast-decimal.Bug-6445 _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
