MonetDB: Jul2021 - Pre-release version number update.
Changeset: 73fe2d8d8c8f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/73fe2d8d8c8f
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: Jul2021
Log Message:
Pre-release version number update.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.41.32
+current_version = 11.41.33
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.41.32
+%global version 11.41.33
%{!?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,41,32)
- PRODUCTVERSION version(11,41,32)
+ FILEVERSION version(11,41,33)
+ PRODUCTVERSION version(11,41,33)
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,41,32)
+ VALUE "FileVersion", sversion(11,41,33)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,41,32)
+ VALUE "ProductVersion", sversion(11,41,33)
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,41,32)
- PRODUCTVERSION version(11,41,32)
+ FILEVERSION version(11,41,33)
+ PRODUCTVERSION version(11,41,33)
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,41,32)
+ VALUE "FileVersion", sversion(11,41,33)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,41,32)
+ VALUE "ProductVersion", sversion(11,41,33)
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,41,32)
- PRODUCTVERSION version(11,41,32)
+ FILEVERSION version(11,41,33)
+ PRODUCTVERSION version(11,41,33)
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,41,32)
+VALUE "FileVersion", sversion(11,41,33)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,41,32)
+VALUE "ProductVersion", sversion(11,41,33)
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
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "41")
-set(MONETDB_VERSION_PATCH "32")
+set(MONETDB_VERSION_PATCH "33")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jul2021-SP10")
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 @@ LANGUAGE LANG_ENGLISH, SUBLAN
MonetDB: Jan2022 - Merge with Jul2021 branch, not changing any f...
Changeset: 18077584fa50 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/18077584fa50 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: Jan2022 Log Message: Merge with Jul2021 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: Jul2021 - Updated library versions.
Changeset: 7140937220c2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7140937220c2
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jul2021
Log Message:
Updated library versions.
diffs (21 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -53,7 +53,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_CURRENT "24")
set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "3")
+set(GDK_VERSION_PATCH "4")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
@@ -67,7 +67,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "31")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "9")
+set(MONETDB5_VERSION_PATCH "10")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_MINOR}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Moved contents of ChangeLog.Jul2021 to MonetD...
Changeset: 24385ee61304 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/24385ee61304
Modified Files:
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2021
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2021
sql/ChangeLog-Archive
sql/ChangeLog.Jul2021
Branch: Jul2021
Log Message:
Moved contents of ChangeLog.Jul2021 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (211 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -84,7 +84,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2021-SP9/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2021-SP10/%{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
@@ -850,6 +850,23 @@ else
fi
%changelog
+* Mon May 01 2023 Sjoerd Mullender - 11.41.33-20230501
+- Rebuilt.
+
+* Tue Apr 25 2023 Sjoerd Mullender - 11.41.33-20230501
+- gdk: Fixed parsing of the BBP.dir files when BAT ids grow larger than 2**24
+ (i.e. 1 in octal).
+
+* Mon Apr 24 2023 Sjoerd Mullender - 11.41.33-20230501
+- monetdb5: A bug was fixed where data from a client context was freed after
the
+ context was closed. This meant that the data being freed could belong
+ to the next user of the context (a next client that just connected),
+ leading to chaos (i.e. crashes).
+
+* Wed Apr 5 2023 Sjoerd Mullender - 11.41.33-20230501
+- sql: When creating a hot snapshot, allow other clients to proceed, even
+ with updating queries.
+
* Fri Mar 24 2023 Sjoerd Mullender - 11.41.31-20230324
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+monetdb (11.41.33) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 01 May 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * gdk: Fixed parsing of the BBP.dir files when BAT ids grow larger than 2**24
+(i.e. 1 in octal).
+
+ -- Sjoerd Mullender Tue, 25 Apr 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * monetdb5: A bug was fixed where data from a client context was freed after
the
+context was closed. This meant that the data being freed could belong
+to the next user of the context (a next client that just connected),
+leading to chaos (i.e. crashes).
+
+ -- Sjoerd Mullender Mon, 24 Apr 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * sql: When creating a hot snapshot, allow other clients to proceed, even
+with updating queries.
+
+ -- Sjoerd Mullender Wed, 5 Apr 2023 09:28:44 +0200
+
monetdb (11.41.31) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Apr 25 2023 Sjoerd Mullender - 11.41.33-20230501
+- Fixed parsing of the BBP.dir files when BAT ids grow larger than 2**24
+ (i.e. 1 in octal).
+
* Fri Mar 24 2023 Sjoerd Mullender - 11.41.31-20230324
- When processing the WAL, if a to-be-destroyed object cannot be found,
don't stop, but keep processing the rest of the WAL.
diff --git a/gdk/ChangeLog.Jul2021 b/gdk/ChangeLog.Jul2021
--- a/gdk/ChangeLog.Jul2021
+++ b/gdk/ChangeLog.Jul2021
@@ -1,7 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Tue Apr 25 2023 Sjoerd Mullender
-- Fixed parsing of the BBP.dir files when BAT ids grow larger than 2**24
- (i.e. 1 in octal).
-
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,32 @@
+monetdb (11.41.33) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 01 May 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * gdk: Fixed parsing of the BBP.dir files when BAT ids grow larger than 2**24
+(i.e. 1 in octal).
+
+ -- Sjoerd Mullender Tue, 25 Apr 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * monetdb5: A bug was fixed where data from a client context was freed after
the
+context was closed. This meant that the data being freed could belong
+to the next user of the context (a next client that just connected),
+leading to chaos (i.e. crashes).
+
+ -- Sjoerd Mullender Mon, 24 Apr 2023 09:28:44 +0200
+
+monetdb (11.41.33) unstable; urgency=low
+
+ * sql: When creating a hot snapshot, allow other clients to proceed, even
+with updating queries.
+
+ -- Sjoerd Mullender Wed,
MonetDB: Jul2021 - Setting tag Jul2021_33 for the release build.
Changeset: db00584d7fcd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/db00584d7fcd Modified Files: .hgtags Branch: Jul2021 Log Message: Setting tag Jul2021_33 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -839,3 +839,4 @@ bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1 700e099bfee85318da09aabcd78ec7ea6e8fb6ef Jul2021_29 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release +24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jan2022 - Merge with Jul2021 branch.
Changeset: 2d48ff4d0494 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2d48ff4d0494 Modified Files: .hgtags MonetDB.spec cmake/monetdb-versions.cmake debian/changelog gdk/ChangeLog-Archive misc/packages/deb/changelog misc/packages/rpm/changelog monetdb5/ChangeLog-Archive sql/ChangeLog-Archive Branch: Jan2022 Log Message: Merge with Jul2021 branch. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -784,3 +784,4 @@ 43d4a717410d6f6692a16a878640fc7e0f248725 700e099bfee85318da09aabcd78ec7ea6e8fb6ef Jul2021_29 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release +24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Post release build.
Changeset: 86c3900231f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/86c3900231f9
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: Jul2021
Log Message:
Post release build.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.41.33
+current_version = 11.41.34
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.41.33
+%global version 11.41.34
%{!?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,41,33)
- PRODUCTVERSION version(11,41,33)
+ FILEVERSION version(11,41,34)
+ PRODUCTVERSION version(11,41,34)
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,41,33)
+ VALUE "FileVersion", sversion(11,41,34)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,41,33)
+ VALUE "ProductVersion", sversion(11,41,34)
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,41,33)
- PRODUCTVERSION version(11,41,33)
+ FILEVERSION version(11,41,34)
+ PRODUCTVERSION version(11,41,34)
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,41,33)
+ VALUE "FileVersion", sversion(11,41,34)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,41,33)
+ VALUE "ProductVersion", sversion(11,41,34)
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,41,33)
- PRODUCTVERSION version(11,41,33)
+ FILEVERSION version(11,41,34)
+ PRODUCTVERSION version(11,41,34)
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,41,33)
+VALUE "FileVersion", sversion(11,41,34)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,41,33)
+VALUE "ProductVersion", sversion(11,41,34)
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
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "41")
-set(MONETDB_VERSION_PATCH "33")
+set(MONETDB_VERSION_PATCH "34")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jul2021-SP10")
+ 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 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#d
MonetDB: Jan2022 - Merge with Jul2021 branch, not changing any f...
Changeset: c947305c2ce4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c947305c2ce4 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: Jan2022 Log Message: Merge with Jul2021 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: Jul2021 - Add extra test to make sure type is known.
Changeset: 1eae19517bde for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1eae19517bde
Modified Files:
gdk/gdk_tm.c
Branch: Jul2021
Log Message:
Add extra test to make sure type is known.
diffs (12 lines):
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -80,7 +80,7 @@ epilogue(int cnt, bat *subcommit, bool l
}
}
b = BBP_desc(bid);
- if (b && ATOMvarsized(b->ttype)) {
+ if (b && b->ttype >= 0 && ATOMvarsized(b->ttype)) {
MT_lock_set(&b->theaplock);
ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
if (p != NULL) {
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Add extra test to make sure type is known.
Changeset: 05b3d9ea9165 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/05b3d9ea9165
Modified Files:
gdk/gdk_tm.c
Branch: Jul2021
Log Message:
Add extra test to make sure type is known.
diffs (12 lines):
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -80,7 +80,7 @@ epilogue(int cnt, bat *subcommit, bool l
}
}
b = BBP_desc(bid);
- if (b && ATOMvarsized(b->ttype)) {
+ if (b && b->ttype >= 0 && ATOMvarsized(b->ttype)) {
MT_lock_set(&b->theaplock);
ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
if (p != NULL) {
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - Added tag Jul2021_33 for changeset 05b3d9ea9165
Changeset: 7235c0ac6388 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7235c0ac6388 Modified Files: .hgtags Branch: Jul2021 Log Message: Added tag Jul2021_33 for changeset 05b3d9ea9165 diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -839,3 +839,5 @@ bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1 700e099bfee85318da09aabcd78ec7ea6e8fb6ef Jul2021_29 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release +24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 +05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jul2021 - merge heads
Changeset: 1258a1b4b80c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1258a1b4b80c Modified Files: .hgtags Branch: Jul2021 Log Message: merge heads diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -840,3 +840,4 @@ 700e099bfee85318da09aabcd78ec7ea6e8fb6ef 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release 24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 +05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jan2022 - Merge with Jul2021 branch.
Changeset: a12a70b2412c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a12a70b2412c
Modified Files:
.hgtags
gdk/gdk_tm.c
Branch: Jan2022
Log Message:
Merge with Jul2021 branch.
diffs (20 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -785,3 +785,4 @@ 700e099bfee85318da09aabcd78ec7ea6e8fb6ef
8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -80,7 +80,7 @@ epilogue(int cnt, bat *subcommit, bool l
}
}
b = BBP_desc(bid);
- if (b && ATOMvarsized(b->ttype)) {
+ if (b && b->ttype >= 0 && ATOMvarsized(b->ttype)) {
MT_lock_set(&b->theaplock);
ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
if (p != NULL) {
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Sep2022 - Merge with Jan2022 branch.
Changeset: 4a00d0dadea5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4a00d0dadea5 Modified Files: .bumpversion.cfg .hgtags MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake debian/changelog gdk/ChangeLog-Archive gdk/gdk_tm.c gdk/libbat.rc misc/packages/deb/changelog misc/packages/rpm/changelog monetdb5/ChangeLog-Archive monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive Branch: Sep2022 Log Message: Merge with Jan2022 branch. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -795,3 +795,5 @@ e8b0e5558313f4d98bc48316368299decc55ed4e e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release +24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 +05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Merge with Sep2022 branch.
Changeset: 73230f4c9f68 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/73230f4c9f68 Modified Files: .bumpversion.cfg .hgtags MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/gdk_bat.c gdk/libbat.rc monetdb5/tools/libmonetdb5.rc sql/storage/bat/bat_logger.c Branch: Jun2023 Log Message: Merge with Sep2022 branch. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -796,3 +796,5 @@ e8b0e5558313f4d98bc48316368299decc55ed4e 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release bb95192134c0d8ef8fea525204eefcd0de099a54 Jun2023_root +24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33 +05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Merge with Jun2023 branch.
Changeset: 6170f73d2595 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6170f73d2595
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.
diffs (truncated from 471 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -796,3 +796,5 @@ e8b0e5558313f4d98bc48316368299decc55ed4e
8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
bb95192134c0d8ef8fea525204eefcd0de099a54 Jun2023_root
+24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ include(monetdb-toolchain)
monetdb_default_compiler_options()
include(monetdb-defines)
-monetdb_hg_revision()
# required for symbol existance tests
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -289,7 +289,7 @@ bool GDKgetenv_istrue(const char *name);
bool GDKgetenv_isyes(const char *name);
gdk_return GDKgetsem(int sem_id, int count, int *semid);
gdk_return GDKgetsemval(int sem_id, int number, int *semval);
-gdk_return GDKinit(struct opt *set, int setlen, bool embedded);
+gdk_return GDKinit(struct opt *set, int setlen, bool embedded, const char
*caller_revision);
BAT *GDKinitialize_segment_tree(void);
void *GDKinitmmap(size_t id, size_t size, size_t *return_size);
bool GDKinmemory(int farmid);
@@ -1033,7 +1033,7 @@ void mal_atom_reset(void);
ClientRec *mal_clients;
MT_Lock mal_contextLock;
_Noreturn void mal_exit(int status);
-int mal_init(char *modules[], bool embedded, const char *initpasswd);
+int mal_init(char *modules[], bool embedded, const char *initpasswd, const
char *caller_revision);
void mal_instruction_reset(void);
void mal_module(const char *name, mel_atom *atoms, mel_func *funcs);
void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init
initfunc, const char *code);
diff --git a/clients/odbc/driver/ODBCDesc.c b/clients/odbc/driver/ODBCDesc.c
--- a/clients/odbc/driver/ODBCDesc.c
+++ b/clients/odbc/driver/ODBCDesc.c
@@ -227,7 +227,7 @@ ODBCLength(ODBCDescRec *rec, int lengtht
case SQL_VARCHAR:
case SQL_LONGVARCHAR:
if (lengthtype == SQL_DESC_OCTET_LENGTH)
- return rec->sql_desc_length * 6;
+ return rec->sql_desc_length * 4;
else
return rec->sql_desc_length;
case SQL_WCHAR:
diff --git a/clients/odbc/driver/SQLExecute.c b/clients/odbc/driver/SQLExecute.c
--- a/clients/odbc/driver/SQLExecute.c
+++ b/clients/odbc/driver/SQLExecute.c
@@ -376,9 +376,23 @@ ODBCInitResult(ODBCStmt *stmt)
/* this must come after other fields have been
* initialized */
- rec->sql_desc_length = ODBCLength(rec, SQL_DESC_LENGTH);
- rec->sql_desc_display_size = ODBCLength(rec,
SQL_DESC_DISPLAY_SIZE);
- rec->sql_desc_octet_length = ODBCLength(rec,
SQL_DESC_OCTET_LENGTH);
+ if (rec->sql_desc_concise_type == SQL_CHAR ||
+ rec->sql_desc_concise_type == SQL_VARCHAR ||
+ rec->sql_desc_concise_type == SQL_LONGVARCHAR ||
+ rec->sql_desc_concise_type == SQL_WCHAR ||
+ rec->sql_desc_concise_type == SQL_WVARCHAR ||
+ rec->sql_desc_concise_type == SQL_WLONGVARCHAR) {
+ /* for strings, get the display size from what
+* the server told us the size is for this
+* column, and derive the octet length from
+* that */
+ rec->sql_desc_display_size = mapi_get_len(hdl, i);
+ rec->sql_desc_octet_length = 4 *
rec->sql_desc_display_size;
+ } else {
+ rec->sql_desc_length = ODBCLength(rec, SQL_DESC_LENGTH);
+ rec->sql_desc_display_size = ODBCLength(rec,
SQL_DESC_DISPLAY_SIZE);
+ rec->sql_desc_octet_length = ODBCLength(rec,
SQL_DESC_OCTET_LENGTH);
+ }
if (rec->sql_desc_length == 0) {
rec->sql_desc_length = SQL_NO_TOTAL;
rec->sql_desc_display_size = SQL_NO_TOTAL;
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -8,59 +8,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
#]]
-function(monetdb_hg
MonetDB: optimizer-testing - Properly handles alias exps in the ...
Changeset: 6a671c692262 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6a671c692262
Modified Files:
sql/server/rel_optimize_proj.c
Branch: optimizer-testing
Log Message:
Properly handles alias exps in the groupby_cse optimizer
diffs (38 lines):
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -1719,16 +1719,26 @@ rel_groupby_cse(visitor *v, sql_rel *rel
/* check if the expression are the same */
if (exp_match_exp(e1, e2) || exp_refers(e1, e2)
|| (e1_sub && e2_sub && (exp_match_exp(e1_sub, e2_sub) || exp_refers(e1_sub,
e2_sub {
- /* if we cannot find the e2 in the exps
list (even though we should) better to just continue */
- sql_exp *e2_in_exps = rel_find_exp(rel,
e2);
- if (!e2_in_exps) continue;
+ sql_exp *e2_in_exps =
exps_bind_column2(rel->exps, e2->l, e2->r, NULL);
+ if (!e2_in_exps)
+ e2_in_exps =
exps_bind_column(rel->exps, e2->alias.name, NULL, NULL, 0);
+ if (!e2_in_exps)
+ /* TODO: should we ever be
here? */
+ continue;
+
+ /* use e1 as it is in exps instead of
e1 from the rel->r as it might be alias from the higher rel */
+ sql_exp *e1_in_exps =
exps_bind_column2(rel->exps, e1->l, e1->r, NULL);
+ if (!e1_in_exps)
+ e1_in_exps =
exps_bind_column(rel->exps, e1->alias.name, NULL, NULL, 0);
+ if (!e1_in_exps)
+ /* TODO: should we ever be
here? */
+ continue;
/* write e2 as an e1 alias since the
expressions are the same */
- /* XXX: should we use e1 or e1_in_exps
for the alias source */
- sql_exp* e2_as_e1_alias =
exp_copy(v->sql, e1);
- exp_setalias(e2_as_e1_alias, e2->l,
e2->r);
-
- /* replace e2 with e2_as_e1_alias in
expression list */
+ sql_exp* e2_as_e1_alias =
exp_copy(v->sql, e1_in_exps);
+ exp_setalias(e2_as_e1_alias,
e2_in_exps->l, e2_in_exps->r);
+
+ /* replace e2 with e2_as_e1_alias in
expressions list */
node *e2_exps_node =
list_find(rel->exps, e2_in_exps, NULL);
list_append_before(rel->exps,
e2_exps_node, e2_as_e1_alias);
list_remove_node(rel->exps, NULL,
e2_exps_node);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: optimizer-testing - Fixes crash due to missing error ch...
Changeset: 32b68676b6d7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/32b68676b6d7
Modified Files:
sql/server/rel_optimize_proj.c
Branch: optimizer-testing
Log Message:
Fixes crash due to missing error checking
diffs (35 lines):
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -1716,20 +1716,24 @@ rel_groupby_cse(visitor *v, sql_rel *rel
sql_exp *e2 = m->data;
sql_exp *e2_sub = e2->type == e_column ?
exps_find_exp(l->exps, e2) : NULL;
- /* check if the experssion are the same */
+ /* check if the expression are the same */
if (exp_match_exp(e1, e2) || exp_refers(e1, e2)
|| (e1_sub && e2_sub && (exp_match_exp(e1_sub, e2_sub) || exp_refers(e1_sub,
e2_sub {
- /* TODO: return checks!! */
+ /* if we cannot find the e2 in the exps
list (even though we should) better to just continue */
sql_exp *e2_in_exps = rel_find_exp(rel,
e2);
+ if (!e2_in_exps) continue;
+
+ /* write e2 as an e1 alias since the
expressions are the same */
+ /* XXX: should we use e1 or e1_in_exps
for the alias source */
+ sql_exp* e2_as_e1_alias =
exp_copy(v->sql, e1);
+ exp_setalias(e2_as_e1_alias, e2->l,
e2->r);
+
+ /* replace e2 with e2_as_e1_alias in
expression list */
node *e2_exps_node =
list_find(rel->exps, e2_in_exps, NULL);
-
- sql_exp* e2_as_e1_alias =
exp_copy(v->sql, e1);
- /* XXX: should we use e1 or e1_in_exps
for the alias source */
- exp_setalias(e2_as_e1_alias, e2->l,
e2->r);
list_append_before(rel->exps,
e2_exps_node, e2_as_e1_alias);
-
list_remove_node(rel->exps, NULL,
e2_exps_node);
+ /* finally remove e2 from the groups'
list (->r) since it's redundant */
node *e2_r_node = list_find(rel->r, e2,
NULL);
list_remove_node(rel->r, NULL,
e2_r_node);
v->changes++;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: optimizer-testing - Takes into account the expression a...
Changeset: 7b25c49d1b8b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b25c49d1b8b
Modified Files:
sql/server/rel_optimize_proj.c
Branch: optimizer-testing
Log Message:
Takes into account the expression alias in groupby_cse
diffs (45 lines):
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -1719,23 +1719,26 @@ rel_groupby_cse(visitor *v, sql_rel *rel
/* check if the expression are the same */
if (exp_match_exp(e1, e2) || exp_refers(e1, e2)
|| (e1_sub && e2_sub && (exp_match_exp(e1_sub, e2_sub) || exp_refers(e1_sub,
e2_sub {
- sql_exp *e2_in_exps =
exps_bind_column2(rel->exps, e2->l, e2->r, NULL);
- if (!e2_in_exps)
- e2_in_exps =
exps_bind_column(rel->exps, e2->alias.name, NULL, NULL, 0);
+ /* use e2 from rel->exps instead of e2
from the rel->r as it can have an alias from the higher rel */
+ sql_exp *e2_in_exps = (e2->alias.rname
== e2->l && e2->alias.name == e2->r) ?
+ exps_bind_column2(rel->exps,
e2->l, e2->r, NULL) :
+ exps_bind_column(rel->exps,
e2->alias.name, NULL, NULL, 0);
if (!e2_in_exps)
/* TODO: should we ever be
here? */
continue;
- /* use e1 as it is in exps instead of
e1 from the rel->r as it might be alias from the higher rel */
- sql_exp *e1_in_exps =
exps_bind_column2(rel->exps, e1->l, e1->r, NULL);
- if (!e1_in_exps)
- e1_in_exps =
exps_bind_column(rel->exps, e1->alias.name, NULL, NULL, 0);
+ /* same as e2 */
+ sql_exp *e1_in_exps = (e1->alias.rname
== e1->l && e1->alias.name == e1->r) ?
+ exps_bind_column2(rel->exps,
e1->l, e1->r, NULL) :
+ exps_bind_column(rel->exps,
e1->alias.name, NULL, NULL, 0);
if (!e1_in_exps)
/* TODO: should we ever be
here? */
continue;
/* write e2 as an e1 alias since the
expressions are the same */
sql_exp* e2_as_e1_alias =
exp_copy(v->sql, e1_in_exps);
+ /* NOTE: it is important to get the
rname (exp->l) and name (exp->r) from e2 IN the exps
+* (e2_in_exps), and not from e2, since
it could carry an alias from the higher rel */
exp_setalias(e2_as_e1_alias,
e2_in_exps->l, e2_in_exps->r);
/* replace e2 with e2_as_e1_alias in
expressions list */
@@ -1746,6 +1749,7 @@ rel_groupby_cse(visitor *v, sql_rel *rel
/* finally remove e2 from the groups'
list (->r) since it's redundant */
node *e2_r_node = list_find(rel->r, e2,
NULL);
list_remove_node(rel->r, NULL,
e2_r_node);
+
v->changes++;
}
}
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: optimizer-testing - Adapts plans in grouby-cse tests (n...
Changeset: f8e6c7e55be2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f8e6c7e55be2
Modified Files:
sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
Branch: optimizer-testing
Log Message:
Adapts plans in grouby-cse tests (now we do not inject a projection)
diffs (38 lines):
diff --git a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
--- a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
+++ b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
@@ -65,10 +65,8 @@ GROUP BY
project (
| group by (
-| | project (
-| | | table("sys"."foo") [ "foo"."c1", "foo"."c3" ]
-| | ) [ "foo"."c1", "foo"."c3", "foo"."c1" as "c1_alias2" ]
-| ) [ "foo"."c1" as "c1_alias1" ] [ "c1_alias1", "c1_alias2", "sys"."count" no
nil ("foo"."c3") as "%1"."%1" ]
+| | table("sys"."foo") [ "foo"."c1", "foo"."c3" ]
+| ) [ "foo"."c1" as "c1_alias1" ] [ "c1_alias1", "c1_alias1" as "c1_alias2",
"sys"."count" no nil ("foo"."c3") as "%1"."%1" ]
) [ "c1_alias1", "c1_alias2", "%1"."%1" ]
query III rowsort gb-over-bt
@@ -223,8 +221,8 @@ project (
| group by (
| | project (
| | | table("sys"."foo") [ "foo"."c1", "foo"."c2", "foo"."c3" ]
-| | ) [ "foo"."c1" as "sq"."c1", "foo"."c2" as "sq"."c2", "foo"."c3" as
"sq"."c3", "sq"."c1" as "c1_alias_2" ]
-| ) [ "sq"."c1" as "c1_alias_1", "sq"."c2" ] [ "c1_alias_1", "c1_alias_2",
"sys"."count" no nil ("sq"."c3") as "%1"."%1" ]
+| | ) [ "foo"."c1" as "sq"."c1", "foo"."c2" as "sq"."c2", "foo"."c3" as
"sq"."c3" ]
+| ) [ "sq"."c1" as "c1_alias_1", "sq"."c2" ] [ "c1_alias_1", "c1_alias_1" as
"c1_alias_2", "sys"."count" no nil ("sq"."c3") as "%1"."%1" ]
) [ "c1_alias_1", "c1_alias_2", "%1"."%1" ]
query III rowsort
@@ -281,8 +279,8 @@ project (
| group by (
| | project (
| | | table("sys"."foo") [ "foo"."c1", "foo"."c2", "foo"."c3" ]
-| | ) [ "foo"."c1" as "sq"."c1_in_alias_1", "foo"."c1" as
"sq"."c1_in_alias_2", "foo"."c2" as "sq"."c2", "foo"."c3" as "sq"."c3",
"sq"."c1_in_alias_2" as "c1_out_alias_2" ]
-| ) [ "sq"."c1_in_alias_1" as "c1_out_alias_1", "sq"."c2" ] [
"c1_out_alias_1", "c1_out_alias_2", "sys"."count" no nil ("sq"."c3") as
"%1"."%1" ]
+| | ) [ "foo"."c1" as "sq"."c1_in_alias_1", "foo"."c2" as "sq"."c2",
"foo"."c3" as "sq"."c3" ]
+| ) [ "sq"."c1_in_alias_1" as "c1_out_alias_1", "sq"."c2" ] [
"c1_out_alias_1", "c1_out_alias_1" as "c1_out_alias_2", "sys"."count" no nil
("sq"."c3") as "%1"."%1" ]
) [ "c1_out_alias_1", "c1_out_alias_2", "%1"."%1" ]
query III rowsort
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: optimizer-testing - Adds group-by over join test for gr...
Changeset: 4f4e605d7a9e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4f4e605d7a9e
Modified Files:
sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
Branch: optimizer-testing
Log Message:
Adds group-by over join test for groupby-cse optimizer
diffs (78 lines):
diff --git a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
--- a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
+++ b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
@@ -10,6 +10,19 @@ VALUES
(2,1,11),
(1,1,15)
+# bar tables is required for the examples that uses join ops
+statement ok
+create table bar (c1 int, c2 int, c3 int)
+
+statement ok
+INSERT INTO
+bar
+VALUES
+(10,1,13),
+(10,2,17),
+(20,2,11),
+(10,3,16)
+
## GROUPBY <--input-- BASETABLE
# the same expression should be removed from the GROUPBY op list of
@@ -312,14 +325,51 @@ 2
2
1
+## GROUPBY <--input-- JOIN
+
+query T nosort
+PLAN
+SELECT
+foo.c2 AS col,
+count(*)
+FROM
+foo JOIN bar
+ON
+foo.c2 = bar.c2
+GROUP BY
+foo.c2,
+col
+
+project (
+| group by (
+| | join (
+| | | table("sys"."foo") [ "foo"."c2" ],
+| | | table("sys"."bar") [ "bar"."c2" ]
+| | ) [ ("foo"."c2") = ("bar"."c2") ]
+| ) [ "foo"."c2" ] [ "foo"."c2" as "col", "sys"."count"() as "%1"."%1" ]
+) [ "col", "%1"."%1" ]
+
+query II rowsort
+SELECT
+foo.c2 AS col,
+count(*)
+FROM
+foo JOIN bar
+ON
+foo.c2 = bar.c2
+GROUP BY
+foo.c2,
+col
+
+1
+3
+2
+2
## GROUPBY <--input-- TOPN/SAMPLE
# this cannot happen since the TOPN/SAMPLE operators are pushed down to
# the projections
-## GROUPBY <--input-- JOIN
-# TODO
-
## GROUPBY <--input-- SEMI
# TODO
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: optimizer-testing - Reactivates commented out test for ...
Changeset: c50453ff690f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c50453ff690f
Modified Files:
sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
Branch: optimizer-testing
Log Message:
Reactivates commented out test for groupby-cse optimizer
diffs (127 lines):
diff --git a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
--- a/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
+++ b/sql/test/rel-optimizers/optimize-proj/Tests/groupby-cse.test
@@ -150,66 +150,65 @@ 1
## GROUPBY <--input-- PROJECT ##
-# TODO: fix that and uncomment
## in this example the order by groups are aliases of the same column
## coming from the inner projection operator
-#query T nosort
-#PLAN
-#SELECT
-#c1_alias1,
-#c1_alias2,
-#c2,
-#count(c1_alias2)
-#FROM (
-#SELECT
-#c1 AS c1_alias1,
-#c1 AS c1_alias2,
-#c2,
-#c3
-#FROM
-#foo
-#) AS sq
-#GROUP BY
-#c1_alias1,
-#c1_alias2,
-#c2
-#
-#project (
-#| group by (
-#| | project (
-#| | | table("sys"."foo") [ "foo"."c1", "foo"."c2" ]
-#| | ) [ "foo"."c1" as "sq"."c1_alias1", "foo"."c1" as "sq"."c1_alias2",
"foo"."c2" as "sq"."c2" ]
-#| ) [ "sq"."c1_alias1", "sq"."c2" ] [ "sq"."c1_alias1", "sq"."c1_alias2",
"sq"."c2", "sys"."count" no nil ("sq"."c1_alias2") as "%1"."%1" ]
-#) [ "sq"."c1_alias1", "sq"."c1_alias2", "sq"."c2", "%1"."%1" ]
-#
-#query III rowsort gb-over-pr
-#SELECT
-#c1_alias_1,
-#c1_alias_2,
-#count(c1_alias_2)
-#FROM (
-#SELECT
-#c1 AS c1_alias_1,
-#c1 AS c1_alias_2,
-#c2,
-#c3
-#FROM
-#foo
-#) AS sq
-#GROUP BY
-#c1_alias_1,
-#c1_alias_2,
-#c2
-#
-#1
-#1
-#1
-#1
-#1
-#2
-#2
-#2
-#1
+query T nosort
+PLAN
+SELECT
+c1_alias1,
+c1_alias2,
+c2,
+count(c1_alias2)
+FROM (
+SELECT
+c1 AS c1_alias1,
+c1 AS c1_alias2,
+c2,
+c3
+FROM
+foo
+) AS sq
+GROUP BY
+c1_alias1,
+c1_alias2,
+c2
+
+project (
+| group by (
+| | project (
+| | | table("sys"."foo") [ "foo"."c1", "foo"."c2" ]
+| | ) [ "foo"."c1" as "sq"."c1_alias1", "foo"."c1" as "sq"."c1_alias2",
"foo"."c2" as "sq"."c2" ]
+| ) [ "sq"."c1_alias1", "sq"."c2" ] [ "sq"."c1_alias1", "sq"."c1_alias1" as
"sq"."c1_alias2", "sq"."c2", "sys"."count" no nil ("sq"."c1_alias2") as
"%1"."%1" ]
+) [ "sq"."c1_alias1", "sq"."c1_alias2", "sq"."c2", "%1"."%1" ]
+
+query III rowsort gb-over-pr
+SELECT
+c1_alias_1,
+c1_alias_2,
+count(c1_alias_2)
+FROM (
+SELECT
+c1 AS c1_alias_1,
+c1 AS c1_alias_2,
+c2,
+c3
+FROM
+foo
+) AS sq
+GROUP BY
+c1_alias_1,
+c1_alias_2,
+c2
+
+1
+1
+1
+1
+1
+2
+2
+2
+1
query T nosort
PLAN
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
