MonetDB: typing - Merged with default
Changeset: cad0445566c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cad0445566c5 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out monetdb5/modules/atoms/mtime.c sql/backends/monet5/sql_upgrades.c 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: typing Log Message: Merged with default diffs (truncated from 92255 to 300 lines): 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 +- 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/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -3788,15 +3788,22 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str]):bat[:bte] ", "CMDbatCMP;", "" ] [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str], X_3:bat[:oid]):bat[:bte] ","CMDbatCMP;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:date]):bat[:date] ", "MTIMEdate_date_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:date], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_date_bulk_cand;","" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "MTIMEdate_fromstr_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_fromstr_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date] ","MTIMEtimestamp_extract_date_bulk;","" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "batstr_2_date;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:oid]):bat[:date] ", "batstr_2_date_cand;", "" ] [ "batcalc", "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ", "nil_2_date;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:int):bat[:daytime] ", "batstr_2time_daytime;","" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:oid], X_3:int):bat[:daytime] ","batstr_2time_daytime_cand;", "" ] [ "batcalc", "daytime", "pattern
MonetDB: typing - Merged with default
Changeset: 61d27edb7f89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61d27edb7f89
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/server/rel_select.c
Branch: typing
Log Message:
Merged with default
diffs (truncated from 6376 to 300 lines):
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -12,7 +12,7 @@ if(WIN32)
license.rtf
monetdb.ico
website.html
-DESTINATION ${CMAKE_INSTALL_PREFIX}
+DESTINATION ${CMAKE_INSTALL_DATADIR}
COMPONENT server)
endif()
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -6,11 +6,15 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
#]]
+# These files have to be installed in the root of the project. But you
+# cannot use the CMAKE_INSTALL_PREFIX variable, because the WIX
+# generator does not allow for absolute install paths. That is why we use
+# the "." as a relative path.
if(WIN32)
install(FILES
mclient.bat
msqldump.bat
-DESTINATION ${CMAKE_INSTALL_PREFIX}
+DESTINATION "."
COMPONENT server)
endif()
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -3533,7 +3533,8 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ", "batsht_dec2dec_cand_bte;",
"" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:int,
X_3:int):bat[:bte] ", "batsht_num2dec_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batsht_num2dec_cand_bte;", "" ]
-[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:str], X_2:int,
X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ]
+[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batstr_2dec_bte;", "" ]
+[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:int,
X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ]
[ "batcalc", "bte_noerror", "pattern
batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ","CMDconvert_bte;",
"" ]
[ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit],
X_2:bat[:oid]):bat[:bte] ", "CMDconvert_bte;", "" ]
[ "batcalc", "bte_noerror", "pattern
batcalc.bte_noerror(X_1:bat[:bte]):bat[:bte] ","CMDconvert_bte;",
"" ]
@@ -3790,16 +3791,22 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",
"MTIMEdate_fromstr_bulk;", "" ]
[ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date]
","MTIMEtimestamp_extract_date_bulk;","" ]
[ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",
"batstr_2_date;", "" ]
+[ "batcalc", "date", "command batcalc.date(X_1:bat[:str],
X_2:bat[:oid]):bat[:date] ", "batstr_2_date_cand;", "" ]
[ "batcalc", "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ",
"nil_2_date;", "" ]
[ "batcalc", "daytime", "command
batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ",
"MTIMEdaytime_daytime_bulk;", "" ]
[ "batcalc", "daytime", "command
batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ",
"MTIMEdaytime_fromseconds_bulk;", "" ]
[ "batcalc", "daytime", "command
batcalc.daytime(X_1:bat[:str]):bat[:daytime] ",
"MTIMEdaytime_fromstr_bulk;", "" ]
[ "batcalc", "daytime", "command
batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ",
"MTIMEtimestamp_extract_daytime_bulk;", "" ]
[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str],
X_2:int):bat[:daytime] ", "batstr_2time_daytime;","" ]
+[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str],
X_2:bat[:oid], X_3:int):bat[:daytime] ","batstr_2time_daytime_cand;",
"" ]
+[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime],
X_2:bat[:oid], X_3:int):bat[:daytime] ","daytime_2time_daytime;", ""
]
[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime],
X_2:int):bat[:daytime] ", "daytime_2time_daytime;", "" ]
[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:oid],
X_2:int):bat[:daytime] ", "nil_2time_daytime;", "" ]
+[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:lng],
X_2:bat[:oid], X_3:int):bat[:daytime] ",
MonetDB: typing - Merged with default
Changeset: eb57d68c6e9b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb57d68c6e9b
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
sql/common/sql_types.c
sql/server/rel_select.c
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: typing
Log Message:
Merged with default
diffs (truncated from 10763 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -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
@@ -605,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
@@ -762,7 +762,7 @@ fi
%setup -q
%build
-%{cmake} \
+%cmake3 \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -791,7 +791,7 @@ fi
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
-%cmake_build
+%cmake3_build
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
@@ -810,7 +810,7 @@ cd -
%endif
%install
-%cmake_install
+%cmake3_install
# move file to correct location
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -124,9 +124,10 @@ def main():
[r'bin\mclient.exe',
r'bin\mserver5.exe',
r'bin\msqldump.exe',
- r'bin\gdk.dll',
+ r'bin\bat.dll',
r'bin\mapi.dll',
r'bin\monetdb5.dll',
+ r'bin\monetdbsql.dll',
r'bin\stream.dll',
vcpkg.format(r'bin\libiconv.dll'),
vcpkg.format(r'bin\bz2.dll'),
@@ -166,18 +167,19 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\microbenchmark.mal'])
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'])
id = comp(geom, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'])
id = comp(pyapi3, id, 16,
[r'lib\monetdb5\_pyapi3.dll'])
print(r' ')
id = comp(extend, id, 14,
- [r'lib\gdk.lib',
+ [r'lib\bat.lib',
r'lib\mapi.lib',
r'lib\monetdb5.lib',
+ r'lib\monetdbsql.lib',
r'lib\stream.lib',
vcpkg.format(r'lib\libiconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -757,14 +757,30 @@ stdout of test 'MAL-signatures` in direc
[ "bataggr", "not_exist","pattern bataggr.not_exist(X_1:any_1):bat[:bit]
",
MonetDB: typing - Merged with default
Changeset: c7a44fe49243 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7a44fe49243
Modified Files:
sql/server/rel_select.c
sql/server/rel_unnest.c
Branch: typing
Log Message:
Merged with default
diffs (truncated from 3218 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -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
@@ -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
@@ -821,7 +824,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
diff --git a/ctest/tools/monetdbe/test_helper.h
b/ctest/tools/monetdbe/test_helper.h
--- a/ctest/tools/monetdbe/test_helper.h
+++ b/ctest/tools/monetdbe/test_helper.h
@@ -36,22 +36,22 @@ TYPE_DEFTEST_TPE(timestamp, monetdbe_dat
#define Null ._is_null = 1
-monetdbe_export bool check_column_bool (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int8_t)
expected_column[]);
-monetdbe_export bool check_column_int8_t(monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int8_t)*
expected_column);
-monetdbe_export bool check_column_int16_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int16_t)*
expected_column);
-monetdbe_export bool check_column_int32_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int32_t)*
expected_column);
-monetdbe_export bool check_column_int64_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int64_t)*
expected_column);
+extern bool check_column_bool (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int8_t)
expected_column[]);
+extern bool check_column_int8_t(monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int8_t)*
expected_column);
+extern bool check_column_int16_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int16_t)*
expected_column);
+extern bool check_column_int32_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int32_t)*
expected_column);
+extern bool check_column_int64_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int64_t)*
expected_column);
#if HAVE_HGE
-monetdbe_export bool check_column_int128_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int128_t)*
expected_column);
+extern bool check_column_int128_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int128_t)*
expected_column);
#endif
-monetdbe_export bool check_column_size_t(monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(size_t)*
expected_column);
-monetdbe_export bool check_column_float (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(float)*
expected_column);
-monetdbe_export bool check_column_double(monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(double)*
expected_column);
-monetdbe_export bool check_column_str (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(str)*
expected_column);
-monetdbe_export bool check_column_blob (monetdbe_result* result, size_t
column_index, size_t
MonetDB: typing - Merged with default
Changeset: b518b991674d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b518b991674d
Modified Files:
clients/Tests/exports.stable.out
sql/common/sql_types.c
sql/server/rel_select.c
sql/server/rel_unnest.c
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: typing
Log Message:
Merged with default
diffs (truncated from 189398 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -15,32 +15,7 @@ syntax: glob
# recommended build process plus a few patterns of files that we never
# want in the repository (object files and such).
-# files generated by bootstrap
-Makefile.am
-Makefile.in
-Makefile.msc
-aclocal.m4
-acout.in
-autom4te.cache
-buildtools/conf/compile
-buildtools/conf/config.guess
-buildtools/conf/config.sub
-buildtools/conf/install-sh
-buildtools/conf/libtool.m4
-buildtools/conf/ltmain.sh
-buildtools/conf/ltoptions.m4
-buildtools/conf/ltsugar.m4
-buildtools/conf/ltversion.m4
-buildtools/conf/lt~obsolete.m4
-buildtools/conf/missing
-buildtools/conf/ylwrap
-configure
-configure.ac
-doc.lst
-install.lst
-monetdb_config.h.in
*.pyc
-sql/backends/monet5/UDF/capi/cheader.text.h
# files generated by various editors
*.swp
@@ -73,21 +48,6 @@ tags
*.rej
*.orig
-# build results on Windows
-NT/.monetdb
-NT/buildtools
-NT/clients
-NT/common
-NT/gdk
-NT/geom
-NT/java
-NT/monetdb5
-NT/monetdb_config.h
-NT/sql
-NT/testing
-NT/tools
-NT/unistd.h
-
# package building on Mac OS X
MacOSX/build
MacOSX/usr
diff --git a/misc/packages/rpm/COPYING b/COPYING
rename from misc/packages/rpm/COPYING
rename to COPYING
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -65,6 +65,9 @@
# operators. Otherwise the POSIX regex functions are used.
%bcond_without pcre
+# By default, include C integration
+%bcond_without cintegration
+
%if %{fedpkgs}
# By default, create the MonetDB-R package.
%bcond_without rintegration
@@ -108,6 +111,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
%endif
+BuildRequires: cmake >= 3.12
BuildRequires: gcc
BuildRequires: bison
BuildRequires: /usr/bin/python3
@@ -187,6 +191,7 @@ functionality of MonetDB.
%{_includedir}/monetdb/gdk*.h
%{_includedir}/monetdb/matomic.h
%{_includedir}/monetdb/mstring.h
+%exclude %{_includedir}/monetdb/monetdbe.h
%{_includedir}/monetdb/monet*.h
%{_libdir}/libbat.so
%{_libdir}/pkgconfig/monetdb-gdk.pc
@@ -462,7 +467,6 @@ Provides: MonetDB5-server-hugeint%{?_isa
%endif
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
# versions up to 1.0.5 don't accept the queryid field in the result set
@@ -515,7 +519,10 @@ exit 0
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%{_libdir}/monetdb5/microbenchmark.mal
+%{_libdir}/monetdb5/run_*.mal
+%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
+%endif
%{_libdir}/monetdb5/lib_generator.so
%{_libdir}/monetdb5/lib_udf.so
%doc %{_mandir}/man1/mserver5.1.gz
@@ -599,13 +606,46 @@ 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}/monetdb5/lib_sql.so*
%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/*
+%package embedded
+Summary: MonetDB as an embedded library
+Group: Applications/Databases
+
+%description embedded
+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 library to turn MonetDB into an embeddable
+library. Also see %{name}-embedded-devel to use this in a program.
+
+%files embedded
+%{_libdir}/libmonetdbe.so.*
+
+%package embedded-devel
+Summary: MonetDB as an embedded library development files
+Group: Applications/Databases
+
+%description embedded-devel
+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 library and include files to turn MonetDB
+into an embeddable library.
+
+%files
MonetDB: typing - Merged with default
Changeset: c8c2500abb2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8c2500abb2c
Modified Files:
clients/Tests/exports.stable.out
sql/common/sql_types.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/test/BugTracker-2011/Tests/CASE_nested_functions.Bug-2852.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/miscellaneous/Tests/simple_selects.stable.out
sql/test/pg_regress/Tests/date.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: typing
Log Message:
Merged with default
diffs (truncated from 231588 to 300 lines):
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/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-# python mkodbcwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB-ODBC-Installer.wxs
+# python mkodbcwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB-ODBC-Installer.wixobj
@@ -29,21 +29,19 @@ def comp(features, id, depth, files, fid
def main():
if len(sys.argv) != 4:
-print(r'Usage: mkodbcwxs.py version makedefs.txt installdir')
+print(r'Usage: mkodbcwxs.py version bits installdir')
return 1
-makedefs = {}
-for line in open(sys.argv[2]):
-key, val = line.strip().split('=', 1)
-makedefs[key] = val
-if makedefs['bits'] == '64':
+if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
libcrypto = '-x64'
+vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
libcrypto = ''
-vs = os.getenv('vs')# inherited from TestTools\common.bat
+vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
+vs = '2019'
features = []
print(r'')
print(r'http://schemas.microsoft.com/wix/2006/wi;>')
@@ -59,7 +57,7 @@ def main():
print(r'')
print(r'')
print(r'')
-msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20{}\Community\VC\Redist\MSVC'.format(vs)
+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'))):
@@ -72,14 +70,14 @@ def main():
id = 1
print(r'')
id = comp(features, id, 14,
- [r'lib\libmapi.dll', r'lib\libmapi.pdb',
- r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
- r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
- r'lib\libstream.dll', r'lib\libstream.pdb',
- r'{}\bin\iconv-2.dll'.format(makedefs['LIBICONV']),
- r'{}\bin\libbz2.dll'.format(makedefs['LIBBZIP2']),
- r'{}\bin\libcrypto-1_1{}.dll'.format(makedefs['LIBOPENSSL'],
libcrypto),
- r'{}\bin\zlib1.dll'.format(makedefs['LIBZLIB'])])
+ [r'bin\mapi.dll', # r'lib\mapi.pdb',
+ r'bin\MonetODBC.dll', # r'lib\MonetODBC.pdb',
+ r'bin\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
+ r'bin\stream.dll', # r'lib\stream.pdb',
+ vcpkg.format(r'bin\libiconv.dll'),
+ vcpkg.format(r'bin\bz2.dll'),
+ vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\zlib1.dll')])
print(r'')
id = comp(features, id, 12,
[r'license.rtf'])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-# python mksqlwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB5-SQL-Installer.wxs
+# python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program
MonetDB: typing - Merged with default
Changeset: c946327214dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c946327214dc
Branch: typing
Log Message:
Merged with default
diffs (truncated from 2261 to 300 lines):
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1677,25 +1677,19 @@ GDKanalyticalavg(BAT *r, BAT *b, BAT *s,
#ifdef TRUNCATE_NUMBERS
#define ANALYTICAL_AVERAGE_INT_CALC_FINALIZE(avg, rem, ncnt) \
do {
- if (rem > 0 && avg < 0) { \
+ if (rem > 0 && avg < 0) \
avg++; \
- rem -= ncnt; \
- }
} while(0)
#else
#define ANALYTICAL_AVERAGE_INT_CALC_FINALIZE(avg, rem, ncnt) \
do { \
if (rem > 0) { \
if (avg < 0) { \
- if (2*rem > ncnt) { \
+ if (2*rem > ncnt) \
avg++; \
- rem -= ncnt; \
- } \
} else { \
- if (2*rem >= ncnt) { \
+ if (2*rem >= ncnt) \
avg++; \
- rem -= ncnt; \
- } \
} \
} \
} while(0)
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1157,6 +1157,11 @@ SQLparser(Client c)
if (msg != MAL_SUCCEED) {
str other = c->curprg->def->errors;
+ /* In debugging mode you may want to
assess what went wrong in the optimizers*/
+#ifndef NDEBUG
+ if( m->emod & mod_debug)
+ runMALDebugger(c,
c->curprg->def);
+#endif
c->curprg->def->errors = 0;
MSresetInstructions(c->curprg->def,
oldstop);
freeVariables(c, c->curprg->def, NULL,
oldvtop);
diff --git a/sql/benchmarks/tpcds/Tests/47.stable.out
b/sql/benchmarks/tpcds/Tests/47.stable.out
--- a/sql/benchmarks/tpcds/Tests/47.stable.out
+++ b/sql/benchmarks/tpcds/Tests/47.stable.out
@@ -37,112 +37,112 @@ stdout of test '47` in directory 'sql/be
# s_company_name,
% sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2, sys.v2,
sys.v2 # table_name
% i_category, i_brand,s_store_name, s_company_name, d_year, d_moy,
avg_monthly_sales, sum_sales, psum, nsum # name
-% char,char, varchar,varchar,int,int,double,
decimal,decimal,decimal # type
-% 50, 50, 5, 7, 4, 1, 24, 20, 20, 20 #
length
-[ "Men", "importoimporto #1","ese", "Unknown", 1999, 3,
5492.817525,2070.65,3307.78,2784.11 ]
-[ "Music", "exportischolar #1","eing", "Unknown", 1999, 2,
5134.238322,1740.21,4401.89,2721.61 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 4,
5463.700806,2091.07,3391.39,3095.31 ]
-[ "Music", "edu packscholar #1", "ought","Unknown", 1999,
7, 5552.305013,2226.34,4081.99,7573.33 ]
-[ "Music", "edu packscholar #1", "ese", "Unknown", 1999, 2,
5463.700806,2268.27,4139.47,3391.39 ]
-[ "Men", "edu packimporto #1", "ought","Unknown", 1999,
7, 5176.257426,1993.73,3542.54,5764.35 ]
-[ "Children", "exportiexporti #1","ese", "Unknown", 1999, 3,
5185.898254,2019.69,3479.21,2982.05 ]
-[ "Shoes", "amalgedu pack #1", "ation","Unknown", 1999,
6, 5152.095886,2077.67,3123.43,2368.73 ]
-[ "Men", "edu packimporto #1", "eing", "Unknown", 1999, 3,
5501.180766,2453.88,2683.70,2615.32 ]
-[ "Children", "exportiexporti #1","ation","Unknown", 1999,
4, 5238.357524,2232.03,3221.70,3649.52 ]
-[ "Shoes", "importoedu pack #1", "eing", "Unknown", 1999, 5,
4698.612447,1703.27,2687.15,2757.83 ]
-[ "Music", "exportischolar #1","bar", "Unknown", 1999, 7,
5318.146708,2346.06,3483.88,7658.62 ]
-[ "Music", "edu packscholar #1", "ation","Unknown", 1999,
2, 5622.227458,2657.68,4207.03,3543.82 ]
-[ "Children", "exportiexporti #1",
MonetDB: typing - Merged with default
Changeset: e76a5c0cb85f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e76a5c0cb85f
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
sql/common/sql_types.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_decimal.c
sql/server/sql_decimal.h
sql/server/sql_parser.y
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_interval.SF.1280682.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_interval.SF.1280682.stable.out
sql/test/BugTracker-2011/Tests/CASE_nested_functions.Bug-2852.stable.out
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.err
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.sql
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.out
sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.sql
sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.err
sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.stable.out
sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.out
sql/test/bugs/Tests/interval_convert_bugs-sf-1274077-1274085.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/pg_regress/Tests/date.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: typing
Log Message:
Merged with default
diffs (truncated from 217180 to 300 lines):
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,3 +19,4 @@ charset = utf-8
[gdk/*.{c,h}]
tab_width = 8
+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
@@ -34,6 +34,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
set(CMAKE_FIND_APPBUNDLE LAST)
include(CheckCSourceCompiles REQUIRED)
+include(CheckCCompilerFlag REQUIRED)
include(CheckIncludeFile REQUIRED)
include(CMakePushCheckState REQUIRED)
include(CheckStructHasMember REQUIRED)
@@ -52,6 +53,8 @@ include(monetdb-functions)
include(monetdb-findpackages)
include(monetdb-toolchain)
monetdb_default_toolchain()
+#monetdb_default_compiler_options()
+
include(monetdb-defines)
monetdb_hg_revision()
@@ -106,14 +109,11 @@ set(PROGRAM_PERMISSIONS_DEFAULT
find_program(BASH NAMES bash DOC "bash interpreter fullpath")
+configure_file(monetdb_config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/monetdb_config.h)
if(WIN32)
- configure_file(monetdb_config_win32.h.in
-${CMAKE_CURRENT_BINARY_DIR}/monetdb_config.h)
configure_file(unistd.h.in
${CMAKE_CURRENT_BINARY_DIR}/unistd.h)
-else()
- configure_file(monetdb_config.h.in
-${CMAKE_CURRENT_BINARY_DIR}/monetdb_config.h)
endif()
add_library(monetdb_config_header
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)
MonetDB: typing - merged with default
Changeset: 8194f306e8b7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8194f306e8b7
Modified Files:
cmake/monetdb-defines.cmake
monetdb5/modules/atoms/mtime.c
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
sql/backends/monet5/sql.c
sql/backends/monet5/sql_subquery.mal
Branch: typing
Log Message:
merged with default
diffs (170 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -57,7 +57,7 @@ function(monetdb_configure_defines)
check_symbol_exists("gettimeofday" "sys/time.h" HAVE_SYS_TIME_H)
# Linux specific, in the future, it might be ported to other platforms
check_symbol_exists("S_ISREG" "sys/stat.h" HAVE_SYS_STAT_H)
- check_symbol_exists("getaddrinfo" "netdb.h" UNIX_GETADDRINFO)
+ check_symbol_exists("getaddrinfo" "sys/types.h;sys/socket.h;netdb.h"
UNIX_GETADDRINFO)
check_symbol_exists("getaddrinfo" "ws2tcpip.h" WIN_GETADDRINFO)
#check_symbol_exists("WSADATA" "winsock2.h" HAVE_WINSOCK_H)
check_symbol_exists("fdatasync" "unistd.h" HAVE_FDATASYNC)
@@ -113,8 +113,13 @@ function(monetdb_configure_defines)
check_function_exists("uname" HAVE_UNAME)
# Some libc versions on Linux distributions don't have it
check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h"
HAVE_SEMTIMEDOP)
- check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
- check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK)
+ cmake_push_check_state()
+if (NOT APPLE)
+ set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};pthread")
+endif()
+check_symbol_exists("pthread_kill" "pthread.h;signal.h" HAVE_PTHREAD_KILL)
+check_symbol_exists("pthread_sigmask" "pthread.h;signal.h"
HAVE_PTHREAD_SIGMASK)
+ cmake_pop_check_state()
check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
endfunction()
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -884,6 +884,9 @@ static mel_func mtime_init_funcs[] = {
command("batmtime", "time_add_msec_interval",
MTIMEtime_add_msec_interval_bulk_p1, false, "", args(1,3,
batarg("",daytime),arg("t",daytime),batarg("ms",lng))),
command("batmtime", "time_add_msec_interval",
MTIMEtime_add_msec_interval_bulk_p2, false, "", args(1,3,
batarg("",daytime),batarg("t",daytime),arg("ms",lng))),
command("mtime", "diff", MTIMEdaytime_diff_msec, false, "returns the number
of msec between 'val1' and 'val2'.", args(1,3,
arg("",lng),arg("val1",daytime),arg("val2",daytime))),
+ command("batmtime", "diff", MTIMEdaytime_diff_msec_bulk, false, "", args(1,3,
batarg("",lng),batarg("val1",daytime),batarg("val2",daytime))),
+ command("batmtime", "diff", MTIMEdaytime_diff_msec_bulk_p1, false, "",
args(1,3, batarg("",lng),arg("val1",daytime),batarg("val2",daytime))),
+ command("batmtime", "diff", MTIMEdaytime_diff_msec_bulk_p2, false, "",
args(1,3, batarg("",lng),batarg("val1",daytime),arg("val2",daytime))),
command("mtime", "date_sub_month_interval", MTIMEdate_submonths, false,
"Subtract months from a date", args(1,3,
arg("",date),arg("t",date),arg("months",int))),
command("batmtime", "date_sub_month_interval", MTIMEdate_submonths_bulk,
false, "", args(1,3, batarg("",date),batarg("t",date),batarg("months",int))),
command("batmtime", "date_sub_month_interval", MTIMEdate_submonths_bulk_p1,
false, "", args(1,3, batarg("",date),arg("t",date),batarg("months",int))),
@@ -912,6 +915,9 @@ static mel_func mtime_init_funcs[] = {
command("batmtime", "addmonths", MTIMEdate_addmonths_bulk_p1, false, "",
args(1,3, batarg("",date),arg("value",date),batarg("months",int))),
command("batmtime", "addmonths", MTIMEdate_addmonths_bulk_p2, false, "",
args(1,3, batarg("",date),batarg("value",date),arg("months",int))),
command("mtime", "diff", MTIMEdate_diff, false, "returns the number of
days\nbetween 'val1' and 'val2'.", args(1,3,
arg("",int),arg("val1",date),arg("val2",date))),
+ command("batmtime", "diff", MTIMEdate_diff_bulk, false, "", args(1,3,
batarg("",int),batarg("val1",date),batarg("val2",date))),
+ command("batmtime", "diff", MTIMEdate_diff_bulk_p1, false, "", args(1,3,
batarg("",int),arg("val1",date),batarg("val2",date))),
+ command("batmtime", "diff", MTIMEdate_diff_bulk_p2, false, "", args(1,3,
batarg("",int),batarg("val1",date),arg("val2",date))),
command("mtime", "dayofyear", MTIMEdate_extract_dayofyear, false, "Returns N
where d is the Nth day\nof the year (january 1 returns 1)", args(1,2,
arg("",int),arg("d",date))),
command("batmtime", "dayofyear", MTIMEdate_extract_dayofyear_bulk, false, "",
args(1,2, batarg("",int),batarg("d",date))),
command("mtime", "weekofyear", MTIMEdate_extract_weekofyear, false, "Returns
the week number in the year.", args(1,2, arg("",int),arg("d",date))),
@@ -919,6 +925,9 @@ static mel_func
MonetDB: typing - merged with default
Changeset: 8c22fd0cbd9b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c22fd0cbd9b Added Files: .bumpversion.cfg CMakeLists.txt Config.cmake.in README.md Release.md clients/CMakeLists.txt clients/examples/C/CMakeLists.txt clients/examples/CMakeLists.txt clients/examples/perl/CMakeLists.txt clients/examples/php/CMakeLists.txt clients/mapiclient/CMakeLists.txt clients/mapilib/CMakeLists.txt clients/odbc/CMakeLists.txt clients/odbc/ChangeLog-Archive clients/odbc/driver/CMakeLists.txt clients/odbc/samples/CMakeLists.txt clients/odbc/setup/CMakeLists.txt clients/odbc/winsetup/CMakeLists.txt cmake/Modules/FindCFitsIO.cmake cmake/Modules/FindCommonCrypto.cmake cmake/Modules/FindGeos.cmake cmake/Modules/FindGetopt.cmake cmake/Modules/FindKVM.cmake cmake/Modules/FindLZ4.cmake cmake/Modules/FindLibR.cmake cmake/Modules/FindLiblas.cmake cmake/Modules/FindLidar.cmake cmake/Modules/FindLzma.cmake cmake/Modules/FindNetCDF.cmake cmake/Modules/FindNumPy.cmake cmake/Modules/FindPCRE.cmake cmake/Modules/FindProj.cmake cmake/Modules/FindReadline.cmake cmake/Modules/FindSnappy.cmake cmake/Modules/FindUUID.cmake cmake/Modules/FindValgrind.cmake cmake/Toolchains/linux-clang.cmake cmake/Toolchains/linux-gnu.cmake cmake/Toolchains/linux-icc.cmake cmake/monetdb-custom-targets.cmake cmake/monetdb-deb-packages.cmake cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake cmake/monetdb-options.cmake cmake/monetdb-packages.cmake cmake/monetdb-rpm-packages.cmake cmake/monetdb-toolchain.cmake cmake/monetdb-versions.cmake cmake/os_release_info.cmake common/CMakeLists.txt common/options/CMakeLists.txt common/stream/CMakeLists.txt common/utils/CMakeLists.txt common/utils/monetdb_hgversion.h.in create_include_object.py.in ctest/CMakeLists.txt ctest/cmake/CMakeLists.txt ctest/cmake/detect-bz2.cmake ctest/cmake/detect-commoncrypto.cmake ctest/cmake/detect-curl.cmake ctest/cmake/detect-fits.cmake ctest/cmake/detect-gdal.cmake ctest/cmake/detect-geos.cmake ctest/cmake/detect-getaddrinfo.cmake ctest/cmake/detect-iconv.cmake ctest/cmake/detect-libpy3.cmake ctest/cmake/detect-libr.cmake ctest/cmake/detect-libz.cmake ctest/cmake/detect-lz4.cmake ctest/cmake/detect-lzma.cmake ctest/cmake/detect-netcdf.cmake ctest/cmake/detect-openssl.cmake ctest/cmake/detect-pcre.cmake ctest/cmake/detect-proj.cmake ctest/cmake/detect-pthreadh.cmake ctest/cmake/detect-pthreadinit.cmake ctest/cmake/detect-pthreadkill.cmake ctest/cmake/detect-pthreadsig.cmake ctest/cmake/detect-readline.cmake ctest/cmake/detect-snappy.cmake ctest/cmake/detect-unixgetaddrinfo.cmake ctest/cmake/detect-uuid.cmake ctest/cmake/detect-valgrind.cmake ctest/cmake/detect-wingetaddrinfo.cmake ctest/cmake/detect-xml.cmake ctest/cmake/set-cmake-vars.cmake ctest/cmake/set-dir-vars.cmake ctest/cmake/test_cmake_var.c.in ctest/cmake/test_detect_bz2.c.in ctest/cmake/test_detect_commoncrypto.c.in ctest/cmake/test_detect_curl.c.in ctest/cmake/test_detect_fits.c.in ctest/cmake/test_detect_gdal.c.in ctest/cmake/test_detect_geos.c.in ctest/cmake/test_detect_getaddrinfo.c.in ctest/cmake/test_detect_iconv.c.in ctest/cmake/test_detect_libpy3.c.in ctest/cmake/test_detect_libr.c.in ctest/cmake/test_detect_libz.c.in ctest/cmake/test_detect_lz4.c.in ctest/cmake/test_detect_lzma.c.in ctest/cmake/test_detect_netcdf.c.in ctest/cmake/test_detect_openssl.c.in ctest/cmake/test_detect_pcre.c.in ctest/cmake/test_detect_proj.c.in ctest/cmake/test_detect_pthreadh.c.in ctest/cmake/test_detect_pthreadinit.c.in ctest/cmake/test_detect_pthreadkill.c.in ctest/cmake/test_detect_pthreadsig.c.in ctest/cmake/test_detect_readline.c.in ctest/cmake/test_detect_snappy.c.in ctest/cmake/test_detect_unixgetaddrinfo.c.in ctest/cmake/test_detect_uuid.c.in ctest/cmake/test_detect_valgrind.c.in ctest/cmake/test_detect_wingetaddrinfo.c.in ctest/cmake/test_detect_xml.c.in ctest/monetdb5/CMakeLists.txt ctest/monetdb5/mal/CMakeLists.txt ctest/monetdb5/mal/test_malEmbeddedBoot.c ctest/monetdb5/mal/test_malInclude.c
MonetDB: typing - Merged with default
Changeset: 27d750370ead for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27d750370ead Added Files: buildtools/selinux/ChangeLog.Jun2020 sql/test/Triggers/Tests/trigger_projection.sql.src sql/test/Triggers/Tests/trigger_projection.stable.err sql/test/Triggers/Tests/trigger_projection.stable.out sql/test/Triggers/trigger_projection.sql sql/test/Users/Tests/createUserRollback.SQL.py sql/test/Users/Tests/createUserRollback.stable.err sql/test/Users/Tests/createUserRollback.stable.out sql/test/subquery/Tests/subquery6.sql sql/test/subquery/Tests/subquery6.stable.err sql/test/subquery/Tests/subquery6.stable.out Modified Files: MonetDB.spec buildtools/selinux/monetdb.te clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mclient.c configure.ag gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_calc.c gdk/gdk_cross.c gdk/gdk_heap.c gdk/gdk_utils.h monetdb5/ChangeLog.Jun2020 monetdb5/extras/rapi/rapi.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/mkey.c monetdb5/optimizer/opt_mergetable.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/benchmarks/tpcds/Tests/alter.timeout sql/include/sql_relation.h sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/Triggers/Tests/All sql/test/Triggers/run.all sql/test/Users/Tests/All sql/test/analytics/Tests/analytics11.stable.err sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py 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/miscellaneous/Tests/All sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.out sql/test/subquery/Tests/All sql/test/subquery/Tests/all.stable.out sql/test/subquery/Tests/any.stable.out sql/test/subquery/Tests/any_all.stable.out sql/test/subquery/Tests/correlated.stable.err sql/test/subquery/Tests/correlated.stable.out sql/test/subquery/Tests/exists.stable.out
MonetDB: typing - Merged with default
Changeset: 6f687c56979d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f687c56979d Added Files: clients/odbc/ChangeLog.Jun2020 sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.out sql/test/Tests/sysqueue.sql sql/test/Tests/sysqueue.stable.err sql/test/Tests/sysqueue.stable.out sql/test/analytics/Tests/analytics18.sql sql/test/analytics/Tests/analytics18.stable.err sql/test/analytics/Tests/analytics18.stable.out sql/test/merge-partitions/Tests/mergepart30.sql sql/test/merge-partitions/Tests/mergepart30.stable.err sql/test/merge-partitions/Tests/mergepart30.stable.out sql/test/miscellaneous/Tests/create_func_temp.sql sql/test/miscellaneous/Tests/create_func_temp.stable.err sql/test/miscellaneous/Tests/create_func_temp.stable.out sql/test/miscellaneous/Tests/simple_plans.sql sql/test/miscellaneous/Tests/simple_plans.stable.err sql/test/miscellaneous/Tests/simple_plans.stable.out sql/test/miscellaneous/Tests/table_udf_missing_var.py sql/test/miscellaneous/Tests/table_udf_missing_var.stable.err sql/test/miscellaneous/Tests/table_udf_missing_var.stable.out sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out tools/merovingian/daemon/snapshot.c tools/merovingian/daemon/snapshot.h Modified Files: ChangeLog ChangeLog.Jun2020 MonetDB.spec NT/Makefile NT/makelibdef.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc NT/winconfig.py buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/conf/fixlicense.py buildtools/conf/monetdbd.conf buildtools/selinux/monetdb.fc buildtools/selinux/monetdb.te clients/ChangeLog.Jun2020 clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SingleServer clients/Tests/exports.stable.out clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/perl/sqlsample.pl clients/examples/python/basics.py clients/examples/python/sqlsample.py clients/mapiclient/dotfile.py clients/mapiclient/dotmonetdb.c clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.c clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testStmtAttr.c clients/odbc/samples/testgetinfo.c clients/odbc/winsetup/setup.c common/options/getopt.c common/options/getopt1.c common/stream/stream.c common/stream/stream.h common/utils/mcrypt.c common/utils/mcrypt.h common/utils/msabaoth.c common/utils/mstring.h common/utils/mutils.h common/utils/muuid.c configure.ag debian/changelog debian/control debian/monetdb5-server.dirs debian/monetdb5-server.postinst debian/monetdb5-sql.install debian/monetdb5-sql.postinst gdk/ChangeLog.Jun2020 gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_analytic.h gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_cand.c gdk/gdk_delta.h gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_sample.c
