Changeset: 264c7c0c4e71 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=264c7c0c4e71
Removed Files:
buildtools/selinux/ChangeLog.Jun2020
Modified Files:
clients/CMakeLists.txt
clients/Tests/exports.stable.out
debian/libmonetdb20.install
gdk/gdk_logger.c
gdk/gdk_utils.c
misc/selinux/ChangeLog.Jun2020
monetdb5/CMakeLists.txt
sql/CMakeLists.txt
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/storage/bat/bat_logger.c
sql/storage/store.c
Branch: makelibstreamgreatagain
Log Message:
Merge with default branch.
diffs (truncated from 179623 to 300 lines):
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,4 +19,4 @@ charset = utf-8
[gdk/*.{c,h}]
tab_width = 8
-max_line_length = 80
+max_line_length = 72
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -775,3 +775,8 @@ 28480e096722b7f76ab021c0d16c68c6949f41b4
80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_7
28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_release
80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_release
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_9
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
+bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_11
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
+bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,6 @@ include(monetdb-toolchain)
monetdb_default_toolchain()
#monetdb_default_compiler_options()
-
include(monetdb-defines)
monetdb_hg_revision()
@@ -155,6 +154,7 @@ add_subdirectory(tools)
if(TESTING)
add_subdirectory(testing)
endif()
+add_subdirectory(buildtools)
include(CMakePackageConfigHelpers)
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# The --with OPTION and --without OPTION arguments can be passed on
# the commandline of both rpmbuild and mock.
-# On 64 bit architectures we build "hugeint" packages.
+# On 64 bit architectures compile with 128 bit integer support.
%if "%{?_lib}" == "lib64"
%bcond_without hugeint
%endif
@@ -94,7 +94,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jun2020/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2020-SP1/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -379,9 +379,6 @@ extensions for %{name}-SQL-server5.
%files geom-MonetDB5
%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_geom.mal
-%{_libdir}/monetdb5/createdb/*_geom.sql
-%{_libdir}/monetdb5/geom.mal
%{_libdir}/monetdb5/lib_geom.so
%endif
@@ -406,8 +403,7 @@ install it.
%files R
%defattr(-,root,root)
-%{_libdir}/monetdb5/rapi.*
-%{_libdir}/monetdb5/autoload/*_rapi.mal
+%{_libdir}/monetdb5/rapi.R
%{_libdir}/monetdb5/lib_rapi.so
%endif
@@ -432,8 +428,6 @@ install it.
%files python3
%defattr(-,root,root)
-%{_libdir}/monetdb5/pyapi3.*
-%{_libdir}/monetdb5/autoload/*_pyapi3.mal
%{_libdir}/monetdb5/lib_pyapi3.so
%endif
@@ -454,9 +448,6 @@ format.
%files cfitsio
%defattr(-,root,root)
-%{_libdir}/monetdb5/fits.mal
-%{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/createdb/*_fits.sql
%{_libdir}/monetdb5/lib_fits.so
%endif
@@ -465,10 +456,12 @@ Summary: MonetDB - Monet Database Manage
Group: Applications/Databases
Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Obsoletes: MonetDB5-server-hugeint < 11.38.0
+%if %{with hugeint}
+Provides: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%if %{with hugeint}
-Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
@@ -521,37 +514,7 @@ exit 0
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
-%dir %{_libdir}/monetdb5/autoload
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/fits.mal
-%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
-%{_libdir}/monetdb5/*.mal
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/autoload/??_sql*.mal
-%{_libdir}/monetdb5/autoload/*.mal
+%{_libdir}/monetdb5/microbenchmark.mal
%{_libdir}/monetdb5/lib_capi.so
%{_libdir}/monetdb5/lib_generator.so
%{_libdir}/monetdb5/lib_udf.so
@@ -560,28 +523,6 @@ exit 0
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
-%if %{with hugeint}
-%package -n MonetDB5-server-hugeint
-Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa}
-
-%description -n MonetDB5-server-hugeint
-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 provides HUGEINT (128-bit integer) support for the
-MonetDB5-server component.
-
-%files -n MonetDB5-server-hugeint
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
-
%package -n MonetDB5-server-devel
Summary: MonetDB development files
Group: Applications/Databases
@@ -608,10 +549,11 @@ used from the MAL level.
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
-%if (0%{?fedora} >= 22)
+Obsoletes: %{name}-SQL-server5-hugeint < 11.38.0
%if %{with hugeint}
-Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+Provides: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
%endif
+%if (0%{?fedora} >= 22)
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -657,50 +599,13 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
-%dir %{_libdir}/monetdb5/createdb
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
-%endif
-%{_libdir}/monetdb5/createdb/*.sql
-%{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%if %{with hugeint}
-%package SQL-server5-hugeint
-Summary: MonetDB5 128 bit integer (hugeint) support for SQL
-Group: Applications/Databases
-Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
-
-%description SQL-server5-hugeint
-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 provides HUGEINT (128-bit integer) support for the SQL
-front end of MonetDB.
-
-%files SQL-server5-hugeint
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/sql*_hge.mal
-%endif
-
%package testing
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -913,9 +818,7 @@ install -d -m 0775 %{buildroot}%{_rundir
# .la files
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
-rm -f %{buildroot}%{_libdir}/monetdb5/opt_sql_append.mal
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5/autoload/??_opt_sql_append.mal
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
for selinuxvariant in %{selinux_variants}
@@ -937,6 +840,77 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Thu Jul 23 2020 Sjoerd Mullender <[email protected]> - 11.37.11-20200723
+- Rebuilt.
+- BZ#6917: Decimal parsing fails
+- BZ#6932: Syntax error while parsing JSON numbers with exponent
+- BZ#6934: sys.isauuid() returns wrong answer for some invalid uuid
+ strings
+
+* Mon Jul 20 2020 Sjoerd Mullender <[email protected]> - 11.37.9-20200720
+- Rebuilt.
+- BZ#6844: sys.getUser('https://me:[email protected]/Doc') does not
+ return the user: me
+- BZ#6845: the url sys.get...(url) functions do not allow null as
+ a parameter
+- BZ#6858: json.keyarray(json '{ "":0 }') fails with error: Could not
+ allocate space
+- BZ#6859: only first character of the separator string in json.text(js
+ json, sep string) is used
+- BZ#6873: sys.hot_snapshot() creates incomplete snapshots if the
+ write-ahead log is very large
+- BZ#6876: tar files created by sys.hot_snapshot() produce warnings on
+ some implementations of tar
+- BZ#6877: MonetDB produces malformed LZ4 files
+- BZ#6878: SQL Connection Error when running SELECT queries containing
+ AND command
+- BZ#6880: Left fuzzy queries are much slower than other fuzzy queries.
+- BZ#6882: cgroups limits no longer respected?
+- BZ#6883: SQLancer crash on delete query
+- BZ#6884: SQLancer generates query with unclear error message
+- BZ#6885: SQLancer causes assertion error on UTF8_strlen
+- BZ#6886: SQLancer alter table add unique gives strange error message
+- BZ#6887: SQLancer crash on complex query
+- BZ#6888: SQLancer crash on cross join on view
+- BZ#6889: SQLancer crash on long query
+- BZ#6892: SQLancer crash on query with HAVING
+- BZ#6893: SQLancer inner join reporting GDK error
+- BZ#6894: SQLancer crash on rtrim function
+- BZ#6895: SQLancer causing 'algebra.select' undefined error
+- BZ#6896: SQLancer algebra.select' undefined 2
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
