Changeset: fe1ec107fdef for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe1ec107fdef
Added Files:
.bumpversion.cfg
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.sql
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.err
sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.out
Removed Files:
vertoo.config
vertoo.data
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/conf/Maddlog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cross.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_storage.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_tracer.c
gdk/gdk_utils.c
gdk/libbat.rc
geom/monetdb5/geom.c
libversions
monetdb5/mal/mal_client.c
monetdb5/modules/mal/pcre.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_rank.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_outer_join_optimizer.h
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_semantic.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err
sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.out
sql/test/BugTracker-2020/Tests/All
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/mergetables/Tests/sqlsmith-exists2.sql
sql/test/mergetables/Tests/sqlsmith-exists2.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/miscellaneous/Tests/simple_plans.stable.out
sql/test/subquery/Tests/subquery6.sql
sql/test/subquery/Tests/subquery6.stable.err
sql/test/subquery/Tests/subquery6.stable.out
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr35.py
testing/Mfilter.py
testing/Mtest.py.in
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 4786 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,32 @@
+[bumpversion]
+current_version = 11.38.0
+commit = False
+tag = False
+
+[bumpversion:file:configure.ag]
+
+[bumpversion:file:MonetDB.spec]
+
+[bumpversion:file:NT/rules.msc]
+
+[bumpversion:file:NT/monetdb_config.h.in]
+
+[bumpversion:file:gdk/libbat.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/winsetup/setup.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/driver/driver.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/mapilib/mapi.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -766,3 +766,6 @@ 179977ed07cd8095f99a6a07968b8e9d1affa753
6b76e1fa9b32421197acf26f63948c858e487d6a Jun2020_root
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_1
03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_3
+03ea637c10b5217782acf5db261b4cd71a9afb25 Jun2020_release
+0d51d6758f2b1f3f1804415545f8551a38da1848 Jun2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -984,6 +984,10 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Mon May 18 2020 Sjoerd Mullender <[email protected]> - 11.37.3-20200518
+- Rebuilt.
+- BZ#6863: thash files not released upon drop table
+
* Mon May 11 2020 Sjoerd Mullender <[email protected]> - 11.37.1-20200511
- Rebuilt.
- BZ#6298: unexpectedly slow execution of SELECT length(fieldname)
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -7,9 +7,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
VERSION=11.38.0
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [email protected] for details and/or
assistance.
!IFDEF MAKE_INCLUDEFILE
!INCLUDE $(MAKE_INCLUDEFILE)
diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -123,7 +123,7 @@ fi
case "$CL" in
'')
d=.
- while [ ! -f $d/vertoo.data -a ! -f $d/ChangeLog -a ! -f $d/ChangeLog.$tag
]; do
+ while [ ! -f $d/.bumpversion.cfg -a ! -f $d/ChangeLog -a ! -f
$d/ChangeLog.$tag ]; do
if [ $d -ef / ]; then
echo "$0: cannot find top directory of package" >&2
exit 1
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact [email protected] for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "Mapi\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\0"
+ VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact [email protected] for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,0)
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
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact [email protected] for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libMonetODBC\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\0"
+ VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact [email protected] for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,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
@@ -2,6 +2,9 @@
//
#include "resource.h"
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
@@ -62,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.38.0"
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libMonetODBCs.dll"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020"
+ VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.38.0"
+ VALUE "ProductVersion", sversion(11,38,0)
END
END
BLOCK "VarFileInfo"
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -131,7 +131,7 @@ AS_CASE([$CC],
# __GNUC_MINOR__, and __GNUC_PATCHLEVEL__ macros.
CC="$CC -no-gcc"])
-AS_IF([test -f "$srcdir"/vertoo.data],
+AS_IF([test -f "$srcdir"/.bumpversion.cfg],
[
# Developers compiling from Mercurial:
# default is --enable-strict --enable-assert --enable-debug
--disable-optimize --enable-developer --enable-profiler=auto
@@ -1989,15 +1989,15 @@ AM_CONDITIONAL([HAVE_LIDAR], [test "x$ha
dnl check for profiler library
AS_CASE([$enable_profiler],
- [no], [have_profiler=no],
+ [no], [],
[
PKG_CHECK_MODULES([PROFILER], [libprofiler],
- [have_profiler=yes],
- [have_profiler=no; why_not_profiler="(profiler library
not found)"])
- AS_VAR_IF([have_profiler], [yes], [
+ [enable_profiler=yes],
+ [enable_profiler=no; why_not_profiler="(profiler
library not found)"])
+ AS_VAR_IF([enable_profiler], [yes], [
AC_DEFINE([HAVE_LIBPROFILER], 1, [Define if you have
the profiler library])
AC_SUBST([PKG_PROFILER], [libprofiler])])])
-AM_CONDITIONAL([HAVE_LIBPROFILER], [test x$have_profiler != xno])
+AM_CONDITIONAL([HAVE_LIBPROFILER], [test enable_profiler != xno])
# checks for header files
@@ -2605,6 +2605,7 @@ for comp in \
'optimize ' \
'developer ' \
'sanitizer ' \
+ 'profiler ' \
; do
AS_VAR_COPY([dft], [dft_$comp])
AS_VAR_COPY([enable], [enable_$comp])
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.37.3) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6863: thash files not released upon drop table
+
+ -- Sjoerd Mullender <[email protected]> Mon, 18 May 2020 11:29:29 +0200
+
monetdb (11.37.1) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -865,6 +865,15 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool
return GDK_FAIL;
}
+ BATiter bi = bat_iterator(b);
+ BATiter ni = bat_iterator(n);
+ if (BATcount(b) == 0 ||
+ (b->tsorted && b->trevsorted &&
+ n->tsorted && n->trevsorted &&
+ ATOMcmp(b->ttype, BUNtail(bi, 0), BUNtail(ni, 0)) == 0)) {
+ return GDK_SUCCEED;
+ }
+
HASHdestroy(b);
OIDXdestroy(b);
IMPSdestroy(b);
@@ -881,8 +890,6 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool
int (*atomcmp)(const void *, const void *) = ATOMcompare(b->ttype);
const void *nil = ATOMnilptr(b->ttype);
oid hseqend = b->hseqbase + BATcount(b);
- BATiter bi = bat_iterator(b);
- BATiter ni = bat_iterator(n);
bool anynil = false;
b->theap.dirty = true;
@@ -2127,8 +2134,29 @@ BATconstant(oid hseq, int tailtype, cons
((hge *) p)[i] = *(hge *) v;
break;
#endif
+ case TYPE_str:
+ /* insert the first value, then just copy the
+ * offset lots of times */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
