Changeset: 3b7d267ff923 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b7d267ff923
Modified Files:
        sql/backends/monet5/sql.mal
        sql/backends/monet5/sql_upgrades.c
Branch: userstats
Log Message:

merged with default


diffs (truncated from 132505 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -775,3 +775,5 @@ 28480e096722b7f76ab021c0d16c68c6949f41b4
 80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_7
 28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_release
 80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_release
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_9
+1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -94,7 +94,7 @@ Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
 BugURL: https://bugs.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Jun2020/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jun2020-SP1/%{name}-%{version}.tar.bz2
 
 # The Fedora packaging document says we need systemd-rpm-macros for
 # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -937,6 +937,70 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jul 20 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.9-20200720
+- Rebuilt.
+- BZ#6844: sys.getUser('https://me:p...@www.monetdb.org/Doc') does not
+  return the user: me
+- BZ#6845: the url sys.get...(url) functions do not allow null as
+  a parameter
+- BZ#6858: json.keyarray(json '{ "":0 }') fails with error: Could not
+  allocate space
+- BZ#6859: only first character of the separator string in json.text(js
+  json, sep string) is used
+- BZ#6873: sys.hot_snapshot() creates incomplete snapshots if the
+  write-ahead log is very large
+- BZ#6876: tar files created by sys.hot_snapshot() produce warnings on
+  some implementations of tar
+- BZ#6877: MonetDB produces malformed LZ4 files
+- BZ#6878: SQL Connection Error when running SELECT queries containing
+  AND command
+- BZ#6880: Left fuzzy queries are much slower than other fuzzy queries.
+- BZ#6882: cgroups limits no longer respected?
+- BZ#6883: SQLancer crash on delete query
+- BZ#6884: SQLancer generates query with unclear error message
+- BZ#6885: SQLancer causes assertion error on UTF8_strlen
+- BZ#6886: SQLancer alter table add unique gives strange error message
+- BZ#6887: SQLancer crash on complex query
+- BZ#6888: SQLancer crash on cross join on view
+- BZ#6889: SQLancer crash on long query
+- BZ#6892: SQLancer crash on query with HAVING
+- BZ#6893: SQLancer inner join reporting GDK error
+- BZ#6894: SQLancer crash on rtrim function
+- BZ#6895: SQLancer causing 'algebra.select' undefined error
+- BZ#6896: SQLancer algebra.select' undefined 2
+- BZ#6897: SQLancer distinct aggregate with error on group by constant
+- BZ#6898: SQLancer crash on join query
+- BZ#6899: SQLancer TLP query with wrong results
+- BZ#6900: SQLancer generated SIGFPE
+- BZ#6901: SQLancer TLP query with wrong results 2
+- BZ#6902: SQLancer query: batcalc.between undefined
+- BZ#6903: SQLancer calc.abs undefined
+- BZ#6904: SQLancer aggr.subavg undefined
+- BZ#6905: SQLancer TLP query with wrong results 3
+- BZ#6906: SQLancer crash on complex join
+- BZ#6907: SQLancer algebra.select undefined
+- BZ#6908: SQLancer inputs not the same size
+- BZ#6909: SQLancer query with wrong results
+- BZ#6911: SQLancer query: 'calc.bit' undefined
+- BZ#6918: SQLancer query compilation error
+- BZ#6919: SQLancer insert function doesn't handle utf-8 strings
+- BZ#6920: SQLancer project_bte: does not match always
+- BZ#6922: Timestamp columns not migrated to new format
+- BZ#6923: Imprints data files for timestamp BAT not migrated to the
+  new format
+- BZ#6924: SQLancer query copy on unique pair of columns fails and
+  complex query with GDK error
+- BZ#6925: Count string rows in union of string tables leaks (RSS) memory
+- BZ#6926: SQLancer query with wrong results
+- BZ#6927: SQLancer inputs not the same size
+- BZ#6928: SQLancer crash on coalesce
+- BZ#6929: SQLancer calc.date undefined
+
+* Tue Jun  9 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.9-20200720
+- gdk: Hash buckets come in variable widths.  But if a BAT grows long enough so
+  that the BAT indexes that are stored in the buckets don't fit anymore,
+  the buckets need to be widened.  This is now fixed.
+
 * Fri May 29 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.7-20200529
 - Rebuilt.
 
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -58,7 +58,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
 set(GDK_VERSION_CURRENT "20")
-set(GDK_VERSION_REVISION "3")
+set(GDK_VERSION_REVISION "4")
 set(GDK_VERSION_AGE "0")
 math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}")
@@ -72,14 +72,14 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_CURRENT "29")
-set(MONETDB5_VERSION_REVISION "3")
+set(MONETDB5_VERSION_REVISION "4")
 set(MONETDB5_VERSION_AGE "0")
 math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} - 
${MONETDB5_VERSION_AGE}")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}")
 
 # version of the STREAM library (subdirectory common/stream)
 set(STREAM_VERSION_CURRENT "13")
-set(STREAM_VERSION_REVISION "5")
+set(STREAM_VERSION_REVISION "6")
 set(STREAM_VERSION_AGE "0")
 math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} - 
${STREAM_VERSION_AGE}")
 set(STREAM_VERSION 
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,73 @@
+monetdb (11.37.9) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6844: sys.getUser('https://me:p...@www.monetdb.org/Doc') does not
+    return the user: me
+  * BZ#6845: the url sys.get...(url) functions do not allow null as
+    a parameter
+  * BZ#6858: json.keyarray(json '{ "":0 }') fails with error: Could not
+    allocate space
+  * BZ#6859: only first character of the separator string in json.text(js
+    json, sep string) is used
+  * BZ#6873: sys.hot_snapshot() creates incomplete snapshots if the
+    write-ahead log is very large
+  * BZ#6876: tar files created by sys.hot_snapshot() produce warnings on
+    some implementations of tar
+  * BZ#6877: MonetDB produces malformed LZ4 files
+  * BZ#6878: SQL Connection Error when running SELECT queries containing
+    AND command
+  * BZ#6880: Left fuzzy queries are much slower than other fuzzy queries.
+  * BZ#6882: cgroups limits no longer respected?
+  * BZ#6883: SQLancer crash on delete query
+  * BZ#6884: SQLancer generates query with unclear error message
+  * BZ#6885: SQLancer causes assertion error on UTF8_strlen
+  * BZ#6886: SQLancer alter table add unique gives strange error message
+  * BZ#6887: SQLancer crash on complex query
+  * BZ#6888: SQLancer crash on cross join on view
+  * BZ#6889: SQLancer crash on long query
+  * BZ#6892: SQLancer crash on query with HAVING
+  * BZ#6893: SQLancer inner join reporting GDK error
+  * BZ#6894: SQLancer crash on rtrim function
+  * BZ#6895: SQLancer causing 'algebra.select' undefined error
+  * BZ#6896: SQLancer algebra.select' undefined 2
+  * BZ#6897: SQLancer distinct aggregate with error on group by constant
+  * BZ#6898: SQLancer crash on join query
+  * BZ#6899: SQLancer TLP query with wrong results
+  * BZ#6900: SQLancer generated SIGFPE
+  * BZ#6901: SQLancer TLP query with wrong results 2
+  * BZ#6902: SQLancer query: batcalc.between undefined
+  * BZ#6903: SQLancer calc.abs undefined
+  * BZ#6904: SQLancer aggr.subavg undefined
+  * BZ#6905: SQLancer TLP query with wrong results 3
+  * BZ#6906: SQLancer crash on complex join
+  * BZ#6907: SQLancer algebra.select undefined
+  * BZ#6908: SQLancer inputs not the same size
+  * BZ#6909: SQLancer query with wrong results
+  * BZ#6911: SQLancer query: 'calc.bit' undefined
+  * BZ#6918: SQLancer query compilation error
+  * BZ#6919: SQLancer insert function doesn't handle utf-8 strings
+  * BZ#6920: SQLancer project_bte: does not match always
+  * BZ#6922: Timestamp columns not migrated to new format
+  * BZ#6923: Imprints data files for timestamp BAT not migrated to the
+    new format
+  * BZ#6924: SQLancer query copy on unique pair of columns fails and
+    complex query with GDK error
+  * BZ#6925: Count string rows in union of string tables leaks (RSS) memory
+  * BZ#6926: SQLancer query with wrong results
+  * BZ#6927: SQLancer inputs not the same size
+  * BZ#6928: SQLancer crash on coalesce
+  * BZ#6929: SQLancer calc.date undefined
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 20 Jul 2020 09:33:05 +0200
+
+monetdb (11.37.9) unstable; urgency=low
+
+  * gdk: Hash buckets come in variable widths.  But if a BAT grows long enough 
so
+    that the BAT indexes that are stored in the buckets don't fit anymore,
+    the buckets need to be widened.  This is now fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 9 Jun 2020 09:33:05 +0200
+
 monetdb (11.37.7) 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,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Jun  9 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.9-20200720
+- Hash buckets come in variable widths.  But if a BAT grows long enough so
+  that the BAT indexes that are stored in the buckets don't fit anymore,
+  the buckets need to be widened.  This is now fixed.
+
 * Tue Apr 28 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.1-20200511
 - The functions BATintersect, BATsemijoin, and BATsubcross have an
   extra argument, bool max_one, which indicates that there must be no
diff --git a/gdk/ChangeLog.Jun2020 b/gdk/ChangeLog.Jun2020
--- a/gdk/ChangeLog.Jun2020
+++ b/gdk/ChangeLog.Jun2020
@@ -1,8 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Tue Jun  9 2020 Sjoerd Mullender <sjo...@acm.org>
-- Hash buckets come in variable widths.  But if a BAT grows long enough so
-  that the BAT indexes that are stored in the buckets don't fit anymore,
-  the buckets need to be widened.  This is now fixed.
-
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -710,9 +710,9 @@ typedef struct {
 /* assert that atom width is power of 2, i.e., width == 1<<shift */
 #define assert_shift_width(shift,width) assert(((shift) == 0 && (width) == 0) 
|| ((unsigned)1<<(shift)) == (unsigned)(width))
 
-#define GDKLIBRARY_BLOB_SORT   061040U /* blob compare changed */
-#define GDKLIBRARY_OLDDATE     061041U /* the representation of times changed 
*/
-#define GDKLIBRARY             061042U
+#define GDKLIBRARY_BLOB_SORT   061040U /* first in Mar2018: blob compare 
changed */
+#define GDKLIBRARY_OLDDATE     061041U /* first in Apr2019: time/date in old 
format */
+#define GDKLIBRARY             061042U /* first in Nov2019 */
 
 typedef struct BAT {
        /* static bat properties */
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -246,7 +246,7 @@ const char *
 MT_thread_getname(void)
 {
        struct winthread *w = TlsGetValue(threadslot);
-       return w ? w->threadname : "unknown thread";
+       return w ? w->threadname : UNKNOWN_THREAD;
 }
 
 void
@@ -579,7 +579,7 @@ MT_thread_getname(void)
        struct posthread *p;
 
        p = pthread_getspecific(threadkey);
-       return p ? p->threadname : "unknown thread";
+       return p ? p->threadname : UNKNOWN_THREAD;
 }
 
 void
@@ -694,9 +694,9 @@ join_threads(void)
                                p->waiting = true;
                                pthread_mutex_unlock(&posthread_lock);
                                TRC_DEBUG(THRD, "Join thread \"%s\"\n", 
p->threadname);
-                               self->joinwait = p;
+                               if (self) self->joinwait = p;
                                pthread_join(p->tid, NULL);
-                               self->joinwait = NULL;
+                               if (self) self->joinwait = NULL;
                                rm_posthread(p);
                                waited = true;
                                pthread_mutex_lock(&posthread_lock);
@@ -721,9 +721,9 @@ join_detached_threads(void)
                                p->waiting = true;
                                pthread_mutex_unlock(&posthread_lock);
                                TRC_DEBUG(THRD, "Join thread \"%s\"\n", 
p->threadname);
-                               self->joinwait = p;
+                               if (self) self->joinwait = p;
                                pthread_join(p->tid, NULL);
-                               self->joinwait = NULL;
+                               if (self) self->joinwait = NULL;
                                rm_posthread(p);
                                waited = true;
                                pthread_mutex_lock(&posthread_lock);
@@ -836,9 +836,9 @@ MT_join_thread(MT_Id t)
                return -1;
        TRC_DEBUG(THRD, "Join thread \"%s\"\n", p->threadname);
        struct posthread *self = pthread_getspecific(threadkey);
-       self->joinwait = p;
+       if (self) self->joinwait = p;
        ret = pthread_join(p->tid, NULL);
-       self->joinwait = NULL;
+       if (self) self->joinwait = NULL;
        if (ret != 0) {
                GDKsyserr(ret, "Joining thread failed");
                return -1;
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to