MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...
Changeset: aba8c31c6048 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/aba8c31c6048
Modified Files:
MonetDB.spec
clients/mapiclient/mclient.1
clients/mapilib/ChangeLog-Archive
clients/mapilib/ChangeLog.Jun2023
clients/odbc/ChangeLog-Archive
clients/odbc/ChangeLog.Jun2023
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jun2023
sql/ChangeLog-Archive
sql/ChangeLog.Jun2023
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jun2023
tools/merovingian/client/monetdb.1
tools/merovingian/daemon/monetdbd.1.in
tools/mserver/mserver5.1.in
Branch: Jun2023
Log Message:
Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (truncated from 1623 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Sep2022-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023/%{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
@@ -860,6 +860,120 @@ fi
%endif
%changelog
+* Fri Jun 16 2023 Sjoerd Mullender - 11.47.1-20230616
+- Rebuilt.
+- GH#7311: Missing `REGEXP_REPLACE` function.
+- GH#7348: Subquery inside case always evaluated
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Function 'similarity(x string, y string)' marked as deprecated and will
+ be removed in the next release.
+
+* Tue Jun 6 2023 Martin van Dinther
- 11.47.1-20230616
+- odbc: Extended Windows MonetDB ODBC Data Source setup program with option
+ to specify a logfile to enable tracing of ODBC Driver API calls.
+ On other platforms users can edit the odbc.ini file and add a line:
+ logfile=/home/username/odbctrace.log
+ When a logfile is specified it will start logging the ODBC Driver API calls
+ to the logfile after a new connection is made via SQLConnect() or
+ SQLDriverConnect() or SQLBrowseConnect().
+ Note that enabling ODBC logging will slow down the performance of ODBC
+ applications, so enable it only for analysing ODBC Driver problems.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: New functionality for string matching and similarity: startswith,
+ endswith, contains, Levenshtein distance and Jaro-Winkler similarity.
+ The functions startswith, endswith and contains have a version where
+ a case insentive flag can be used.
+ Also, there are new custom join functionality for startswith, endswith,
+ contains, Levenshtein distance and Jaro-Winkler similarity.
+- sql: Renamed previous Levenshtein distance to Damerau-Levenshtein distance.
+- sql: New string function that transform from UTF-8 encoding to Ascii called
+ asciify.
+
+* Tue Jun 6 2023 Martin van Dinther
- 11.47.1-20230616
+- odbc: Enhanced SQLTables() by adding support for table type names: 'BASE
TABLE',
+ 'GLOBAL TEMPORARY' and 'LOCAL TEMPORARY' in parameter TableType. These are
+ synonyms of: 'TABLE', 'GLOBAL TEMPORARY TABLE' and 'LOCAL TEMPORARY TABLE'.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Session timeout feature improvement to start evaluating from the moment
+ the procedure is called, instead of beginning of the session.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Queries stopped with the stop procedure are now marked as 'aborted'
+ 'finished'.
+
+* Tue Jun 6 2023 Niels Nes - 11.47.1-20230616
+- monetdb5: The MAL debugger code has been removed.
+
+* Tue Jun 6 2023 Niels Nes - 11.47.1-20230616
+- sql: The DEBUG statement has been removed.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: SQL function sys.queue() overloaded with sys.queue(username string),
+ SYSADMIN only, allowing to filter the global queue by username or
+ use 'ALL' to retrieve the global queue. Calling the function without
+ arguments returns the queue for the current user.
+- sql: SQL procedures sys.pause(tag bigint), sys.resume(tag bigint),
+ sys.stop(tag bigint) overloaded with sys.pause(tag bigint, username string),
+ sys.resume(tag bigint, username string) and sys.stop(tag bigint, username
+ string), SYSADMIN only, allowing to pause, resume and stop query
+ executions by TAG, USERNAME. The call without arguments is a public
+ procedure giving access to users to pause, resume and stop their
+ own query executions.
+
+* Tue Jun 6 2023 svetlin -
11.47.1-20230616
+- sql: Added support of ODBC escape sequences syntax to SQL layer. Now all
clients
+ (including ODBC/JDBC/pymonetdb) can use them without further processing
MonetDB: Jun2023 - Setting tag Jun2023_1 for the release build.
Changeset: 90cf15636aaa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/90cf15636aaa Modified Files: .hgtags Branch: Jun2023 Log Message: Setting tag Jun2023_1 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -804,3 +804,4 @@ ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 d11af9398029c117b92a9be9efa971ac0299ffc4 Sep2022_15 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release +aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Pre-release version number update.
Changeset: f0af876f3408 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f0af876f3408
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Pre-release version number update.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.0
+current_version = 11.47.1
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.0
+%global version 11.47.1
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,0)
- PRODUCTVERSION version(11,47,0)
+ FILEVERSION version(11,47,1)
+ PRODUCTVERSION version(11,47,1)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,0)
+ VALUE "FileVersion", sversion(11,47,1)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,0)
+ VALUE "ProductVersion", sversion(11,47,1)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,0)
- PRODUCTVERSION version(11,47,0)
+ FILEVERSION version(11,47,1)
+ PRODUCTVERSION version(11,47,1)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,0)
+ VALUE "FileVersion", sversion(11,47,1)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,0)
+ VALUE "ProductVersion", sversion(11,47,1)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,0)
- PRODUCTVERSION version(11,47,0)
+ FILEVERSION version(11,47,1)
+ PRODUCTVERSION version(11,47,1)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,0)
+VALUE "FileVersion", sversion(11,47,1)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,0)
+VALUE "ProductVersion", sversion(11,47,1)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "0")
+set(MONETDB_VERSION_PATCH "1")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jun2023")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 2be6b1a386dd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2be6b1a386dd Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with Jun2023 branch, not changing any files. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Updated library versions.
Changeset: d433e05fbcdc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d433e05fbcdc
Added Files:
debian/libmonetdb27.install
Removed Files:
debian/libmonetdb26.install
Modified Files:
cmake/monetdb-versions.cmake
debian/control
Branch: Jun2023
Log Message:
Updated library versions.
diffs (138 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -40,37 +40,37 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-set(GDK_VERSION_MAJOR "26")
+set(GDK_VERSION_MAJOR "27")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "6")
+set(GDK_VERSION_PATCH "0")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
set(MAPI_VERSION_MAJOR "26")
-set(MAPI_VERSION_MINOR "0")
+set(MAPI_VERSION_MINOR "1")
set(MAPI_VERSION_PATCH "0")
set(MAPI_VERSION
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
-set(MONETDB5_VERSION_MAJOR "33")
+set(MONETDB5_VERSION_MAJOR "34")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "6")
+set(MONETDB5_VERSION_PATCH "0")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "1")
+set(MONETDBE_VERSION_PATCH "2")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_MAJOR "26")
-set(STREAM_VERSION_MINOR "0")
-set(STREAM_VERSION_PATCH "3")
+set(STREAM_VERSION_MINOR "1")
+set(STREAM_VERSION_PATCH "0")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
# version of the SQL library (subdirectory sql)
-set(SQL_VERSION_MAJOR "13")
+set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "6")
+set(SQL_VERSION_PATCH "0")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), cmake (
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
-Package: libmonetdb26
+Package: libmonetdb27
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libmonetdb-stream26 (= ${source:Version})
@@ -35,7 +35,7 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
libmonetdb-stream-dev (= ${source:Version})
Description: MonetDB development files
MonetDB is a database management system that is developed from a
@@ -132,7 +132,7 @@ Architecture: any
Depends: ${shlibs:Depends}, libmonetdb-client-odbc (= ${source:Version}),
libmonetdb-client26 (= ${source:Version}),
libmonetdb-stream26 (= ${source:Version}),
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
monetdb5-server (= ${source:Version}),
libdbd-monetdb-perl (>= 1.0),
php-monetdb (>= 1.0),
@@ -152,7 +152,7 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libmonetdb-stream26 (= ${source:Version}),
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
monetdb5-server (= ${source:Version})
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
@@ -167,7 +167,7 @@ Package: libmonetdb5-server-cfitsio
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
monetdb5-server (= ${source:Version})
Description: MonetDB5 add on module for FITS files
MonetDB is a database management system that is developed from a
@@ -183,7 +183,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
libmonetdb-client26 (= ${source:Version}),
libmonetdb-stream26 (= ${source:Version}),
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
Recommends: monetdb5-sql (= ${source:Version})
Suggests: monetdb-client (= ${source:Version})
Conflicts: monetdb5-server-hugeint (<< 11.38.0),
@@ -247,7 +247,7 @@ Description: MonetDB SQL support for mon
Package: monetdb-python3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb26 (= ${source:Version}),
+ libmonetdb27 (= ${source:Version}),
monetdb5-server (= ${source:Version}), python3-numpy
Description: Integration of MonetDB and Python, allowing
MonetDB: default - Merge with Jun2023 branch.
Changeset: e8a2d02cbde9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e8a2d02cbde9
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (truncated from 1769 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -804,3 +804,4 @@ ed34ab4283cbfcc57fb9d7387bc9d781c91902b1
d11af9398029c117b92a9be9efa971ac0299ffc4 Sep2022_15
8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release
+aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Sep2022-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jun2023/%{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
@@ -860,6 +860,120 @@ fi
%endif
%changelog
+* Fri Jun 16 2023 Sjoerd Mullender - 11.47.1-20230616
+- Rebuilt.
+- GH#7311: Missing `REGEXP_REPLACE` function.
+- GH#7348: Subquery inside case always evaluated
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Function 'similarity(x string, y string)' marked as deprecated and will
+ be removed in the next release.
+
+* Tue Jun 6 2023 Martin van Dinther
- 11.47.1-20230616
+- odbc: Extended Windows MonetDB ODBC Data Source setup program with option
+ to specify a logfile to enable tracing of ODBC Driver API calls.
+ On other platforms users can edit the odbc.ini file and add a line:
+ logfile=/home/username/odbctrace.log
+ When a logfile is specified it will start logging the ODBC Driver API calls
+ to the logfile after a new connection is made via SQLConnect() or
+ SQLDriverConnect() or SQLBrowseConnect().
+ Note that enabling ODBC logging will slow down the performance of ODBC
+ applications, so enable it only for analysing ODBC Driver problems.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: New functionality for string matching and similarity: startswith,
+ endswith, contains, Levenshtein distance and Jaro-Winkler similarity.
+ The functions startswith, endswith and contains have a version where
+ a case insentive flag can be used.
+ Also, there are new custom join functionality for startswith, endswith,
+ contains, Levenshtein distance and Jaro-Winkler similarity.
+- sql: Renamed previous Levenshtein distance to Damerau-Levenshtein distance.
+- sql: New string function that transform from UTF-8 encoding to Ascii called
+ asciify.
+
+* Tue Jun 6 2023 Martin van Dinther
- 11.47.1-20230616
+- odbc: Enhanced SQLTables() by adding support for table type names: 'BASE
TABLE',
+ 'GLOBAL TEMPORARY' and 'LOCAL TEMPORARY' in parameter TableType. These are
+ synonyms of: 'TABLE', 'GLOBAL TEMPORARY TABLE' and 'LOCAL TEMPORARY TABLE'.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Session timeout feature improvement to start evaluating from the moment
+ the procedure is called, instead of beginning of the session.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: Queries stopped with the stop procedure are now marked as 'aborted'
+ 'finished'.
+
+* Tue Jun 6 2023 Niels Nes - 11.47.1-20230616
+- monetdb5: The MAL debugger code has been removed.
+
+* Tue Jun 6 2023 Niels Nes - 11.47.1-20230616
+- sql: The DEBUG statement has been removed.
+
+* Tue Jun 6 2023 Lucas Pereira -
11.47.1-20230616
+- sql: SQL function sys.queue() overloaded with sys.queue(username string),
+ SYSADMIN only, allowing to filter the global queue by username or
+ use 'ALL' to retrieve the global queue. Calling the function without
+ arguments returns the queue for the current user.
+- sql: SQL procedures sys.pause(tag bigint), sys.resume(tag bigint),
+ sys.stop(tag bigint) overloaded with sys.pause(tag bigint, username string),
+ sys.resume(tag bigint, username string) and sys.stop(tag bigint, username
+ string), SYSADMIN only, allowing to pause, resume and stop query
+ executions by TAG, USERNAME. The call without arguments is a public
+ procedure giving access to users to pause, resume and stop their
+ own query executions.
+
+* Tue Jun 6 2023 svetlin -
11.47.1-20230616
+- sql: Added support of ODBC escape sequences syntax to SQL layer. Now all
clients
+ (including ODBC/JDBC/pymonetdb) can use them without further processing.
+ For details on ODBC escape sequences syntax see:
+
https://learn.microsoft.com/en-us/sql/odbc/reference/appendixes/odbc-escape-sequences
+
+* Tue Jun 6 2023 Aris Koning -
11.47.1-20230616
+- merovingian: The monetdb get, inherit, lock and release commands are
extended with
+ ‘apply-to-all’ syntax similar to related
MonetDB: Jun2023 - Post release build.
Changeset: 9599c087e3b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9599c087e3b5
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Post release build.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.1
+current_version = 11.47.2
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.1
+%global version 11.47.2
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,1)
- PRODUCTVERSION version(11,47,1)
+ FILEVERSION version(11,47,2)
+ PRODUCTVERSION version(11,47,2)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,1)
+ VALUE "FileVersion", sversion(11,47,2)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,1)
+ VALUE "ProductVersion", sversion(11,47,2)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,1)
- PRODUCTVERSION version(11,47,1)
+ FILEVERSION version(11,47,2)
+ PRODUCTVERSION version(11,47,2)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,1)
+ VALUE "FileVersion", sversion(11,47,2)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,1)
+ VALUE "ProductVersion", sversion(11,47,2)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,1)
- PRODUCTVERSION version(11,47,1)
+ FILEVERSION version(11,47,2)
+ PRODUCTVERSION version(11,47,2)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,1)
+VALUE "FileVersion", sversion(11,47,2)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,1)
+VALUE "ProductVersion", sversion(11,47,2)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "1")
+set(MONETDB_VERSION_PATCH "2")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jun2023")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 0caf19f11bf1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0caf19f11bf1 Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with Jun2023 branch, not changing any files.. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - removed useless tests.
Changeset: b42f9e759815 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b42f9e759815
Removed Files:
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test
Modified Files:
sql/test/BugTracker/Tests/All
Branch: default
Log Message:
removed useless tests.
The tests in this file don't address the problem mentioned in the bug report,
instead, they sometimes fail due to expected differences in the output. Hence,
removing this test now and if the original problem pops up again (most
improbable), we'll deal with it.
diffs (74 lines):
diff --git a/sql/test/BugTracker/Tests/All b/sql/test/BugTracker/Tests/All
--- a/sql/test/BugTracker/Tests/All
+++ b/sql/test/BugTracker/Tests/All
@@ -75,7 +75,6 @@ explain.SF-1739353
limit_timestampz.SF-1774217
convert_dec2varchar.SF-1774312
convert_dec2varchar_crash.SF-1775550
-jdbc_no_debug.SF-1739356
cascade_operations_in_different_sessions.SF-1823387_create
cascade_operations_in_different_sessions.SF-1823387_drop
number_null_first_row.SF-1833286
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test
+++ /dev/null
@@ -1,58 +0,0 @@
-query T nosrt
-plan select count(*) from tables
-
-project (
-| group by (
-| | union (
-| | | group by (
-| | | | project (
-| | | | | select (
-| | | | | | table("sys"."_tables") [ "_tables"."id", "_tables"."type" ]
-| | | | | ) [ ("_tables"."type") != (smallint(16) "2") ]
-| | | | ) [ "_tables"."id" as "tables"."id" ]
-| | | ) [ ] [ "sys"."count"() NOT NULL UNIQUE as "%10"."%10" ],
-| | | group by (
-| | | | project (
-| | | | | table("tmp"."_tables") [ "_tables"."id" NOT NULL UNIQUE ]
-| | | | ) [ "_tables"."id" NOT NULL UNIQUE as "tables"."id" ]
-| | | ) [ ] [ "sys"."count"() NOT NULL UNIQUE as "%10"."%10" ]
-| | ) [ "%10"."%10" NOT NULL ]
-| ) [ ] [ "sys"."sum" no nil ("%10"."%10" NOT NULL) NOT NULL UNIQUE as
"%10"."%10" ]
-) [ "%10"."%10" NOT NULL UNIQUE ]
-
-statement ok
-set optimizer='sequential_pipe'
-
-query T python .explain.function_histogram
-explain select count(*) from tables
-
-aggr.count
-2
-aggr.sum
-1
-algebra.thetaselect
-2
-bat.append
-2
-bat.new
-1
-bat.single
-1
-querylog.define
-1
-sql.bind
-2
-sql.mvc
-1
-sql.resultSet
-1
-sql.subdelta
-1
-sql.tid
-2
-user.main
-1
-
-statement ok
-set optimizer='default_pipe'
-
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Remove some unnecessary casts and fix one bad...
Changeset: 54442fdf7d93 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/54442fdf7d93
Modified Files:
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
Branch: Jun2023
Log Message:
Remove some unnecessary casts and fix one bad one.
diffs (67 lines):
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -173,9 +173,9 @@ OPTwrapper(Client cntxt, MalBlkPtr mb, M
str
OPTstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
- bat *nme = (bat*) getArgReference_bat(stk, p, 0);
- bat *cnt = (bat*) getArgReference_bat(stk, p, 1);
- bat *time = (bat*) getArgReference_bat(stk, p, 2);
+ bat *nme = getArgReference_bat(stk, p, 0);
+ bat *cnt = getArgReference_bat(stk, p, 1);
+ bat *time = getArgReference_bat(stk, p, 2);
BAT *n, *c, *t;
int i;
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -510,7 +510,7 @@ static str CUDFeval(Client cntxt, MalBlk
(void)pthread_sigmask(SIG_UNBLOCK, _set, NULL);
}
- sqlfun = *(sql_func **)getArgReference_ptr(stk, pci, pci->retc);
+ sqlfun = (sql_func *)*getArgReference_ptr(stk, pci, pci->retc);
funcname = sqlfun ? sqlfun->base.name : "yet_another_c_function";
args = (str *)GDKzalloc(sizeof(str) * pci->argc);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -517,7 +517,7 @@ mvc_claim_wrap(Client cntxt, MalBlkPtr m
str msg;
const char *sname = *getArgReference_str(stk, pci, 3);
const char *tname = *getArgReference_str(stk, pci, 4);
- lng cnt = *(lng*)getArgReference_lng(stk, pci, 5);
+ lng cnt = *getArgReference_lng(stk, pci, 5);
BAT *pos = NULL;
sql_schema *s;
sql_table *t;
@@ -554,7 +554,7 @@ mvc_add_dependency_change(Client cntxt,
mvc *m = NULL;
const char *sname = *getArgReference_str(stk, pci, 1);
const char *tname = *getArgReference_str(stk, pci, 2);
- lng cnt = *(lng*)getArgReference_lng(stk, pci, 3);
+ lng cnt = *getArgReference_lng(stk, pci, 3);
sql_schema *s;
sql_table *t;
@@ -993,7 +993,7 @@ mvc_next_value_bulk(Client cntxt, MalBlk
sql_schema *s;
sql_sequence *seq;
bat *res = getArgReference_bat(stk, pci, 0);
- BUN card = *(BUN*)getArgReference_lng(stk, pci, 1);
+ BUN card = (BUN)*getArgReference_lng(stk, pci, 1);
const char *sname = *getArgReference_str(stk, pci, 2);
const char *seqname = *getArgReference_str(stk, pci, 3);
BAT *r = NULL;
@@ -1789,7 +1789,7 @@ mvc_append_wrap(Client cntxt, MalBlkPtr
const char *sname = *getArgReference_str(stk, pci, 2);
const char *tname = *getArgReference_str(stk, pci, 3);
const char *cname = *getArgReference_str(stk, pci, 4);
- BUN offset = *(BUN*)getArgReference_oid(stk, pci, 5);
+ BUN offset = (BUN)*getArgReference_oid(stk, pci, 5);
bat Pos = *getArgReference_bat(stk, pci, 6);
ptr ins = getArgReference(stk, pci, 7);
int tpe = getArgType(mb, pci, 7), log_res = LOG_OK;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Use __builtin_frame_address builtin function ...
Changeset: 46698f698796 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/46698f698796
Modified Files:
gdk/gdk_utils.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
Branch: Jun2023
Log Message:
Use __builtin_frame_address builtin function to get stack address.
This function is available in both GCC and CLANG.
diffs (51 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1622,10 +1622,14 @@ THRget(int tid)
static inline uintptr_t
THRsp(void)
{
+#if defined(__GNUC__) || defined(__clang__)
+ return (uintptr_t) __builtin_frame_address(0);
+#else
int l = 0;
uintptr_t sp = (uintptr_t) ();
return sp;
+#endif
}
static inline Thread
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -794,7 +794,11 @@ mvc_create(sql_store *store, sql_allocat
m->pa = pa;
m->sa = NULL;
m->ta = sa_create(m->pa);
+#if defined(__GNUC__) || defined(__clang__)
+ m->sp = (uintptr_t) __builtin_frame_address(0);
+#else
m->sp = (uintptr_t)();
+#endif
m->params = NULL;
m->sizeframes = MAXPARAMS;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -319,8 +319,13 @@ extern int symbol_cmp(mvc* sql, symbol *
static inline int mvc_highwater(mvc *sql)
{
- int l = 0, rc = 0;
+#if defined(__GNUC__) || defined(__clang__)
+ uintptr_t c = (uintptr_t) __builtin_frame_address(0);
+#else
+ int l = 0;
uintptr_t c = (uintptr_t) ();
+#endif
+ int rc = 0;
size_t diff = c < sql->sp ? sql->sp - c : c - sql->sp;
if (diff > THREAD_STACK_SIZE - 280 * 1024)
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Add ALTER USER MAX_MEMORY MAX_WORKERS
Changeset: 4dfceb6180d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4dfceb6180d6
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
clients/mapiclient/mhelp.c
sql/ChangeLog.Jun2023
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_user.c
sql/common/sql_backend.c
sql/common/sql_backend.h
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/test/Users/Tests/create_user_options.test
Branch: Jun2023
Log Message:
Add ALTER USER MAX_MEMORY MAX_WORKERS
diffs (truncated from 327 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -50290,7 +50290,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str, X_7:lng, X_8:int):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -38615,7 +38615,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str, X_7:lng, X_8:int):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -83,9 +83,10 @@ SQLhelp sqlhelp1[] = {
"Change a user's login name or password or default schema",
"ALTER USER ident RENAME TO ident\n"
"ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string\n"
-"ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string\n"
-"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string] SET
SCHEMA ident\n"
-"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]
SCHEMA PATH string [DEFAULT ROLE ident]",
+"ALTER USER ident\n"
+"[WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]\n"
+"[SET SCHEMA ident] [SCHEMA PATH string] [DEFAULT ROLE ident]\n"
+"[MAX_MEMORY posbytes | NO MAX_MEMORY] [MAX_WORKERS poscount | NO
MAX_WORKERS]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/"},
{"ANALYZE",
@@ -249,7 +250,8 @@ SQLhelp sqlhelp1[] = {
{"CREATE USER",
"Create a new database user",
"CREATE USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string NAME
string [SCHEMA ident] [SCHEMA PATH string]\n"
-"[MAX_MEMORY poslng] [MAX_WORKERS posint] [OPTIMIZER string] [DEFAULT
ROLE ident]",
+"[MAX_MEMORY posbytes | NO MAX_MEMORY] [MAX_WORKERS poscount | NO
MAX_WORKERS]\n"
+"[OPTIMIZER string] [DEFAULT ROLE ident]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/"},
{"CREATE VIEW",
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -1,3 +1,6 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Jun 16 2023 Joeri van Ruth
+- Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5859,7 +5859,7 @@ pattern("sql", "decypher", SQLdecypher,
pattern("sqlcatalog", "create_user", SQLcreate_user, false, "Catalog
operation create_user", args(0,10,
arg("sname",str),arg("passwrd",str),arg("enc",int),arg("schema",str),arg("schemapath",str),arg("fullname",str),
arg("max_memory", lng), arg("max_workers", int), arg("optimizer", str),
arg("default_role", str))),
pattern("sqlcatalog", "drop_user", SQLdrop_user, false, "Catalog operation
drop_user", args(0,2, arg("sname",str),arg("action",int))),
pattern("sqlcatalog", "drop_user", SQLdrop_user, false, "Catalog operation
drop_user", args(0,3, arg("sname",str),arg("auth",str),arg("action",int))),
- pattern("sqlcatalog", "alter_user", SQLalter_user, false, "Catalog operation
alter_user", args(0,7,
arg("sname",str),arg("passwrd",str),arg("enc",int),arg("schema",str),arg("schemapath",str),arg("oldpasswrd",str),arg("role",str))),
+ pattern("sqlcatalog", "alter_user", SQLalter_user, false, "Catalog operation
alter_user",
MonetDB: nilmask - and insert and select * a no-nil type (much m...
Changeset: 66f872574442 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/66f872574442
Modified Files:
gdk/gdk_value.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/bat/bat_table.c
sql/storage/bat/res_table.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/monetdbe/monetdbe.c
Branch: nilmask
Log Message:
and insert and select * a no-nil type (much more to do..)
diffs (truncated from 931 to 300 lines):
diff --git a/gdk/gdk_value.c b/gdk/gdk_value.c
--- a/gdk/gdk_value.c
+++ b/gdk/gdk_value.c
@@ -228,11 +228,16 @@ VALinit(ValPtr d, int tpe, const void *s
return d;
default:
assert(ATOMextern(ATOMstorage(tpe)));
- d->len = ATOMlen(tpe, s);
- d->val.pval = GDKmalloc(d->len);
- if (d->val.pval == NULL)
- return NULL;
- memcpy(d->val.pval, s, d->len);
+ if (s) {
+ d->len = ATOMlen(tpe, s);
+ d->val.pval = GDKmalloc(d->len);
+ if (d->val.pval == NULL)
+ return NULL;
+ memcpy(d->val.pval, s, d->len);
+ } else {
+ d->len = 0;
+ d->val.pval = NULL;
+ }
return d;
}
d->len = ATOMsize(d->vtype);
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -577,6 +577,23 @@ getBitConstant(MalBlkPtr mb, bit val)
}
InstrPtr
+pushMsk(MalBlkPtr mb, InstrPtr q, bit val)
+{
+ int _t;
+ ValRecord cst;
+
+ if (q == NULL)
+ return NULL;
+ cst.vtype= TYPE_msk;
+ cst.val.btval= val;
+ cst.len = 0;
+ _t = defConstant(mb,TYPE_msk,);
+ if( _t >= 0)
+ return pushArgument(mb, q, _t);
+ return q;
+}
+
+InstrPtr
pushBit(MalBlkPtr mb, InstrPtr q, bit val)
{
int _t;
@@ -663,24 +680,25 @@ InstrPtr
pushType(MalBlkPtr mb, InstrPtr q, int tpe)
{
int _t;
- ValRecord cst;
- str msg;
+ ValRecord cst = { 0 };
+ //str msg;
if (q == NULL)
return NULL;
- cst.vtype=TYPE_void;
- cst.val.oval= oid_nil;
- cst.len = 0;
- msg = convertConstant(tpe, );
- if (msg != MAL_SUCCEED){
- addMalException(mb, msg);
- freeException(msg);
- } else {
+ cst.vtype=tpe;
+ //cst.vtype=TYPE_void;
+ //cst.val.oval= oid_nil;
+ //cst.len = 0;
+ //msg = convertConstant(tpe, );
+ //if (msg != MAL_SUCCEED){
+ //addMalException(mb, msg);
+ //freeException(msg);
+ //} else {
_t = defConstant(mb,tpe,);
if( _t >= 0){
return pushArgument(mb, q, _t);
}
- }
+ //}
return q;
}
diff --git a/monetdb5/mal/mal_builder.h b/monetdb5/mal/mal_builder.h
--- a/monetdb5/mal/mal_builder.h
+++ b/monetdb5/mal/mal_builder.h
@@ -38,6 +38,7 @@ mal_export InstrPtr pushVoid(MalBlkPtr m
mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, dbl val);
mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, flt val);
mal_export InstrPtr pushStr(MalBlkPtr mb, InstrPtr q, const char *val);
+mal_export InstrPtr pushMsk(MalBlkPtr mb, InstrPtr q, bit val);
mal_export InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, bit val);
mal_export InstrPtr pushNil(MalBlkPtr mb, InstrPtr q, int tpe);
mal_export InstrPtr pushType(MalBlkPtr mb, InstrPtr q, int tpe);
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -84,6 +84,8 @@ TABLETdestroy_format(Tablet *as)
for (p = 0; p < as->nr_attrs; p++) {
BBPreclaim(fmt[p].c);
+ if (fmt[p].mask)
+ BBPreclaim(fmt[p].mask);
if (fmt[p].data)
GDKfree(fmt[p].data);
}
@@ -277,11 +279,15 @@ output_line(char **buf, size_t *len, cha
if (i == nr_attrs) {
for (i = 0; i < nr_attrs; i++) {
Column *f = fmt + i;
- const char *p;
+ const char *p = NULL;
ssize_t l;
if (f->c) {
- p =
MonetDB: default - Merge with Jun2023 branch.
Changeset: 0aa8b0e994d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0aa8b0e994d2
Modified Files:
sql/server/sql_parser.y
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (truncated from 442 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -50290,7 +50290,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str, X_7:lng, X_8:int):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -38615,7 +38615,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str, X_7:lng, X_8:int):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -83,9 +83,10 @@ SQLhelp sqlhelp1[] = {
"Change a user's login name or password or default schema",
"ALTER USER ident RENAME TO ident\n"
"ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string\n"
-"ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string\n"
-"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string] SET
SCHEMA ident\n"
-"ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]
SCHEMA PATH string [DEFAULT ROLE ident]",
+"ALTER USER ident\n"
+"[WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]\n"
+"[SET SCHEMA ident] [SCHEMA PATH string] [DEFAULT ROLE ident]\n"
+"[MAX_MEMORY posbytes | NO MAX_MEMORY] [MAX_WORKERS poscount | NO
MAX_WORKERS]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/"},
{"ANALYZE",
@@ -249,7 +250,8 @@ SQLhelp sqlhelp1[] = {
{"CREATE USER",
"Create a new database user",
"CREATE USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string NAME
string [SCHEMA ident] [SCHEMA PATH string]\n"
-"[MAX_MEMORY poslng] [MAX_WORKERS posint] [OPTIMIZER string] [DEFAULT
ROLE ident]",
+"[MAX_MEMORY posbytes | NO MAX_MEMORY] [MAX_WORKERS poscount | NO
MAX_WORKERS]\n"
+"[OPTIMIZER string] [DEFAULT ROLE ident]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/"},
{"CREATE VIEW",
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1622,10 +1622,14 @@ THRget(int tid)
static inline uintptr_t
THRsp(void)
{
+#if defined(__GNUC__) || defined(__clang__)
+ return (uintptr_t) __builtin_frame_address(0);
+#else
int l = 0;
uintptr_t sp = (uintptr_t) ();
return sp;
+#endif
}
static inline Thread
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -173,9 +173,9 @@ OPTwrapper(Client cntxt, MalBlkPtr mb, M
str
OPTstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
- bat *nme = (bat*) getArgReference_bat(stk, p, 0);
- bat *cnt = (bat*) getArgReference_bat(stk, p, 1);
- bat *time = (bat*) getArgReference_bat(stk, p, 2);
+ bat *nme = getArgReference_bat(stk, p, 0);
+ bat *cnt = getArgReference_bat(stk, p, 1);
+ bat *time = getArgReference_bat(stk, p, 2);
BAT *n, *c, *t;
int i;
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -1,3 +1,6 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Jun 16 2023 Joeri van Ruth
+- Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -510,7 +510,7 @@ static str CUDFeval(Client cntxt, MalBlk
(void)pthread_sigmask(SIG_UNBLOCK, _set, NULL);
}
- sqlfun = *(sql_func **)getArgReference_ptr(stk, pci, pci->retc);
+ sqlfun = (sql_func *)*getArgReference_ptr(stk, pci, pci->retc);
funcname = sqlfun ? sqlfun->base.name : "yet_another_c_function";
args = (str
