Changeset: cfa650a59a66 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cfa650a59a66
Removed Files:
buildtools/selinux/monetdb.fc
buildtools/selinux/monetdb.if
buildtools/selinux/monetdb.te
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/test/sysmon/Tests/sys_queue_expand.sql
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
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/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: ir_imprints
Log Message:
Merge with default
diffs (truncated from 169715 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.38.0
+current_version = 11.40.0
commit = False
tag = False
@@ -11,10 +11,6 @@ serialize = set(MONETDB_VERSION_MAJOR "{
search = %global version {current_version}
replace = %global version {new_version}
-[bumpversion:file:NT/rules.msc]
-
-[bumpversion:file:NT/monetdb_config.h.in]
-
[bumpversion:file:gdk/libbat.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
@@ -34,3 +30,4 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
+
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -780,3 +780,4 @@ 1e3bd8cd485a0880a7557aa5307e986a210a1e00
bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_11
1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release
+94231c85384d893701beeeb69996f57c70fade4d Oct2020_root
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
# 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/ChangeLog b/ChangeLog.Oct2020
copy from ChangeLog
copy to ChangeLog.Oct2020
diff --git a/ChangeLog.userstats b/ChangeLog.userstats
new file mode 100644
--- /dev/null
+++ b/ChangeLog.userstats
@@ -0,0 +1,19 @@
+# ChangeLog file for userstats
+# This file is updated with Maddlog
+
+* Mon Aug 10 2020 Ying Zhang <y.zh...@cwi.nl>
+- Finished a first version of the new monitoring function
+ user_statistics(), which is only intended for the DBAs.
+ For each database user who has logged in during the current mserver5
+ session, it returns
+ "username": login name of the database user,
+ "querycount": the number of queries this user has executed since his/her
+ first login,
+ "totalticks": the total execution time (in microsecond) of the queries ran
+ by this user,
+ "maxquery": the query with the longest execution time (if two queries have
+ the same execution time, the newer overwrites the older),
+ "maxticks": the execution time of the 'maxquery' (in microsecond),
+ "started": the start timestamp of the 'maxquery',
+ "finished": the finish timestamp of the 'maxquery'.
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.38.0
+%global version 11.40.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -111,7 +111,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
%endif
-BuildRequires: cmake >= 3.12
+BuildRequires: cmake3 >= 3.12
BuildRequires: gcc
BuildRequires: bison
BuildRequires: /usr/bin/python3
@@ -547,7 +547,6 @@ used from the MAL level.
%files -n MonetDB5-server-devel
%defattr(-,root,root)
-%dir %{_includedir}/monetdb
%{_includedir}/monetdb/mal*.h
%{_libdir}/libmonetdb5.so
%{_libdir}/pkgconfig/monetdb5.pc
@@ -606,7 +605,7 @@ 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/lib_sql.so*
+%{_libdir}/libmonetdbsql.so*
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
@@ -632,6 +631,8 @@ library. Also see %{name}-embedded-deve
%package embedded-devel
Summary: MonetDB as an embedded library development files
Group: Applications/Databases
+Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description embedded-devel
MonetDB is a database management system that is developed from a
@@ -639,12 +640,14 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
-This package contains the library and include files to turn MonetDB
-into an embeddable library.
+This package contains the library and include files to create a
+program that uses MonetDB as an embeddable library.
%files embedded-devel
+%defattr(-,root,root)
%{_libdir}/libmonetdbe.so
%{_includedir}/monetdb/monetdbe.h
+%{_libdir}/pkgconfig/monetdbe.pc
%package testing
Summary: MonetDB - Monet Database Management System
@@ -750,7 +753,8 @@ fi
%files selinux
%defattr(-,root,root,0755)
-%doc buildtools/selinux/*
+%docdir %{_datadir}/doc/MonetDB-selinux
+%{_datadir}/doc/MonetDB-selinux/*
%{_datadir}/selinux/*/monetdb.pp
%endif
@@ -759,7 +763,7 @@ fi
%setup -q
%build
-%{cmake} \
+%cmake3 \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -788,26 +792,10 @@ fi
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
-%cmake_build
-
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-cd buildtools/selinux
-%if 0%{?fedora} < 27
-# no `map' policy available before Fedora 27
-sed -i '/map/d' monetdb.te
-%endif
-
-for selinuxvariant in %{selinux_variants}
-do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- mv monetdb.pp monetdb.pp.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
-%endif
+%cmake3_build
%install
-%cmake_install
+%cmake3_install
# move file to correct location
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -821,7 +809,6 @@ rmdir %{buildroot}%{_sysconfdir}/tmpfile
install -d -m 0750 %{buildroot}%{_localstatedir}/lib/monetdb
install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm
-touch %{buildroot}%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
install -d -m 0775 %{buildroot}%{_localstatedir}/log/monetdb
install -d -m 0775 %{buildroot}%{_rundir}/monetdb
@@ -834,12 +821,6 @@ rm -f %{buildroot}%{_bindir}/monetdb_mte
rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-for selinuxvariant in %{selinux_variants}
-do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 buildtools/selinux/monetdb.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/monetdb.pp
-done
if [ -x /usr/sbin/hardlink ]; then
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
else
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -41,23 +41,29 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ with open('CMakeCache.txt') as cache:
+ for line in cache:
+ if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
+ comdir = line.split('=', 1)[1].strip().replace('/', '\\')
+ break
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB ODBC Driver" UpgradeCode="{}"
Version="{}">'.format(upgradecode[arch], sys.argv[1]))
print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB BV" Platform="{}"/>'.format(arch))
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
- print(r' <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>')
- print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>')
+ print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
+ print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
# print(r' <WixVariable Id="WixUIDialogBmp"
Value="backgroundRipple.bmp"/>')
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
- print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
+ print(r' <Property Id="ARPPRODUCTICON" Value="share\monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
@@ -80,12 +86,12 @@ def main():
vcpkg.format(r'bin\zlib1.dll')])
print(r' </Directory>')
id = comp(features, id, 12,
- [r'license.rtf'])
+ [r'share\license.rtf'])
id = comp(features, id, 12,
[r'bin\odbcinstall.exe'],
fid = 'odbcinstall')
id = comp(features, id, 12,
- [r'website.html'],
+ [r'share\website.html'],
name = 'MonetDB Web Site',
sid = 'website_html',
vital = 'no')
@@ -109,7 +115,7 @@ def main():
print(r' </Feature>')
print(r' <UIRef Id="WixUI_InstallDir"/>')
print(r' <UIRef Id="WixUI_ErrorProgressText"/>')
- print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>')
+ print(r' <Icon Id="monetdb.ico" SourceFile="share\monetdb.ico"/>')
print(r' <InstallExecuteSequence>')
print(r' <Custom Action="driverinstall" Before="RegisterUser">')
print(r' NOT Installed OR REINSTALL')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -48,7 +48,14 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ with open('CMakeCache.txt') as cache:
+ for line in cache:
+ if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
+ comdir = line.split('=', 1)[1].strip().replace('/', '\\')
+ break
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
extend = []
debug = []
@@ -65,8 +72,8 @@ def main():
print(r' <UpgradeVersion OnlyDetect="no" Minimum="11.29.3"
IncludeMinimum="no" Maximum="{}"
Property="GEOMINSTALLED"/>'.format(sys.argv[1]))
print(r' </Upgrade>')
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
- print(r' <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>')
- print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>')
+ print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
+ print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
# print(r' <WixVariable Id="WixUIDialogBmp"
Value="backgroundRipple.bmp"/>')
print(r' <Property Id="INSTALLDIR">')
print(r' <RegistrySearch Id="MonetDBRegistry"
Key="Software\[Manufacturer]\[ProductName]" Name="InstallPath" Root="HKLM"
Type="raw"/>')
@@ -99,10 +106,9 @@ def main():
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
