Changeset: 573474d3a4db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/573474d3a4db
Branch: qcancel
Log Message:
Merge with default branch.
diffs (truncated from 1293 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.40.0
+current_version = 11.42.0
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -800,3 +800,4 @@ 17d27ad30941c81e4bc700300912e84e9b9a8c37
17d27ad30941c81e4bc700300912e84e9b9a8c37 Oct2020_SP3_release
6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_15
6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_SP4_release
+02fd591b7d3311d566007e1bfb0c59682b17f12c Jul2021_root
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Thu Apr 15 2021 svetlin <svetlin.stali...@monetdbsolutions.com>
-- preserve in query comments
-
diff --git a/ChangeLog b/ChangeLog.Jul2021
copy from ChangeLog
copy to ChangeLog.Jul2021
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.40.0
+%global version 11.42.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jul2021
copy from clients/ChangeLog
copy to clients/ChangeLog.Jul2021
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jul2021
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Jul2021
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,40,0)
- PRODUCTVERSION version(11,40,0)
+ FILEVERSION version(11,42,0)
+ PRODUCTVERSION version(11,42,0)
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,40,0)
+ VALUE "FileVersion", sversion(11,42,0)
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,40,0)
+ VALUE "ProductVersion", sversion(11,42,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Jul2021
copy from clients/odbc/ChangeLog
copy to clients/odbc/ChangeLog.Jul2021
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,40,0)
- PRODUCTVERSION version(11,40,0)
+ FILEVERSION version(11,42,0)
+ PRODUCTVERSION version(11,42,0)
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,40,0)
+ VALUE "FileVersion", sversion(11,42,0)
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,40,0)
+ VALUE "ProductVersion", sversion(11,42,0)
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,40,0)
- PRODUCTVERSION version(11,40,0)
+ FILEVERSION version(11,42,0)
+ PRODUCTVERSION version(11,42,0)
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,40,0)
+ VALUE "FileVersion", sversion(11,42,0)
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,40,0)
+ VALUE "ProductVersion", sversion(11,42,0)
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
@@ -7,7 +7,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "40")
+set(MONETDB_VERSION_MINOR "42")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jul2021
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Jul2021
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,33 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Mon Mar 29 2021 Sjoerd Mullender <sjo...@acm.org>
-- Implemented function BUNreplacemultiincr to replace multiple values
- in a BAT in one go, starting at a given position.
-- Implemented new function BUNreplacemulti to replace multiple values
- in a BAT in one go, at the given positions.
-- Removed function BUNinplace, just use BUNreplace, and check whether
- the BAT argument is of type TYPE_void before calling if you don't
- want to materialize.
-
-* Mon Mar 15 2021 Sjoerd Mullender <sjo...@acm.org>
-- Implemented a function BUNappendmulti which appends an array of values
- to a BAT. It is a generalization of the function BUNappend.
-
-* Thu Feb 25 2021 Sjoerd Mullender <sjo...@acm.org>
-- Changed the interface of the atom read function. It now requires an
- extra pointer to a size_t value that gives the current size of the
- destination buffer, and when that buffer is too small, it receives the
- size of the reallocated buffer that is large enough. In any case,
- and as before, the return value is a pointer to the destination buffer.
-
-* Fri Jan 29 2021 Sjoerd Mullender <sjo...@acm.org>
-- Environment variables (sys.env()) must be UTF-8, but since they can
- contain file names which may not be UTF-8, there is now a mechanism
- to store the original values outside of sys.env() and store
- %-escaped (similar to URL escaping) values in the environment. The
- key must still be UTF-8.
-
-* Tue Dec 1 2020 Sjoerd Mullender <sjo...@acm.org>
-- We now save the location of the min and max values when known.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Jul2021
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Jul2021
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1023,7 +1023,7 @@ canditer_search(const struct canditer *c
if (p == ci->nvals - 1 && o >= ci->lastbit)
return next ? ci->ncand : BUN_NONE;
if (next || ci->mask[p] & (1U << o))
- return count_mask_bits(ci, 0, p) + (o == 0 ? 0 :
candmask_pop(ci->mask[p] << (32 - o))) + !(ci->mask[p] & (1U << o));
+ return count_mask_bits(ci, 0, p * 32 + o) +
!(ci->mask[p] & (1U << o));
break;
}
return BUN_NONE;
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
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,40,0)
- PRODUCTVERSION version(11,40,0)
+ FILEVERSION version(11,42,0)
+ PRODUCTVERSION version(11,42,0)
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 Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,40,0)
+ VALUE "FileVersion", sversion(11,42,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,40,0)
+ VALUE "ProductVersion", sversion(11,42,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog.Jul2021
copy from geom/ChangeLog
copy to geom/ChangeLog.Jul2021
diff --git a/geom/sql/conformance/Tests/All b/geom/sql/conformance/Tests/All
--- a/geom/sql/conformance/Tests/All
+++ b/geom/sql/conformance/Tests/All
@@ -47,7 +47,7 @@ HAVE_GEOM?T45
HAVE_GEOM?T46
HAVE_GEOM?T47
HAVE_GEOM?T48
-HAVE_GEOM?T49
+#HAVE_GEOM?T49 # disabled because depends on geos library version
HAVE_GEOM?T50
HAVE_GEOM?T51
HAVE_GEOM?T52
diff --git a/misc/ChangeLog b/misc/ChangeLog.Jul2021
copy from misc/ChangeLog
copy to misc/ChangeLog.Jul2021
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Sep 9 2020 Sjoerd Mullender <sjo...@acm.org>
-- By using the option "--dbextra=:memory:", mserver5 can be instructed
- to keep transient BATs completely in memory.
-
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Jul2021
copy from monetdb5/ChangeLog
copy to monetdb5/ChangeLog.Jul2021
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -13,7 +13,7 @@
#include "mal_stack.h"
#include "mal_namespace.h"
-#define isaSignature(P) ((P)->token >=COMMANDsymbol)
+#define isaSignature(P) ((P)->token >=COMMANDsymbol || (P)->token ==
PATTERNsymbol)
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -888,7 +888,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb,
InstrPtr r;
mat_t *mat = ml->v;
int *mats = (int*)GDKzalloc(sizeof(int) * args);
- int nr_mats = 0, first = 0, res = 0;
+ int nr_mats = 0, first = -1, res = 0;
if (!mats) {
return -1;
@@ -898,7 +898,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb,
mats[j] = is_a_mat(getArg(p,p->retc+j), ml);
if (mats[j] != -1) {
nr_mats++;
- if (!first)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
