Changeset: 8ed6141e4936 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ed6141e4936
Branch: ascii-flag
Log Message:

Merge with default branch.


diffs (truncated from 834 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -821,3 +821,4 @@ c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe
 1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
 1230526af30f40eeea30fb87c47c3e414920561f Dec2023_release
 95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
+dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -917,6 +917,26 @@ fi
 %endif
 
 %changelog
+* Tue Mar 12 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- Rebuilt.
+- GH#7390: Some MonetDB Server crashes found
+- GH#7465: Unexpected result when using `NULL` in `BETWEEN`
+
+* Fri Mar  8 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- gdk: The internal hash function for floating point types has been changed.
+  It is now no longer based on the bit representation, but on the value,
+  meaning that +0 and -0 (yes, they both exist in floating point) now
+  hash to the same value.
+
+* Thu Mar  7 2024 Lucas Pereira <lucas.pere...@monetdbsolutions.com> - 
11.49.5-20240312
+- sql: performance improvement of 'startswith' and 'endswith' filter functions
+  for join operators
+
+* Wed Mar  6 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- clients: Fixed an issue where mclient wouldn't exit if the server it had
+  connected to exited for whatever reason while the client was waiting
+  for a query result.
+
 * Mon Mar 04 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.3-20240304
 - Rebuilt.
 - GH#6800: Please add information_schema (ANSI SQL norm)
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Mar  6 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- Fixed an issue where mclient wouldn't exit if the server it had
+  connected to exited for whatever reason while the client was waiting
+  for a query result.
+
 * Tue Jun 20 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.3-20230622
 - The COPY INTO from file ON CLIENT was extended to also look for a
   relative path name relative to the file from which the query was read.
diff --git a/clients/ChangeLog.Dec2023 b/clients/ChangeLog.Dec2023
--- a/clients/ChangeLog.Dec2023
+++ b/clients/ChangeLog.Dec2023
@@ -1,8 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Wed Mar  6 2024 Sjoerd Mullender <sjo...@acm.org>
-- Fixed an issue where mclient wouldn't exit if the server it had
-  connected to exited for whatever reason while the client was waiting
-  for a query result.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -44,19 +44,19 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "28")
 set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 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 "2")
-set(MAPI_VERSION_PATCH "0")
+set(MAPI_VERSION_PATCH "1")
 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 "35")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "1")
+set(MONETDB5_VERSION_PATCH "2")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
@@ -74,5 +74,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "14")
 set(SQL_VERSION_MINOR "1")
-set(SQL_VERSION_PATCH "1")
+set(SQL_VERSION_PATCH "2")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+monetdb (11.49.5) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7390: Some MonetDB Server crashes found
+  * GH#7465: Unexpected result when using `NULL` in `BETWEEN`
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 12 Mar 2024 10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * gdk: The internal hash function for floating point types has been changed.
+    It is now no longer based on the bit representation, but on the value,
+    meaning that +0 and -0 (yes, they both exist in floating point) now
+    hash to the same value.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 8 Mar 2024 10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * sql: performance improvement of 'startswith' and 'endswith' filter 
functions
+    for join operators
+
+ -- Lucas Pereira <lucas.pere...@monetdbsolutions.com>  Thu, 7 Mar 2024 
10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * clients: Fixed an issue where mclient wouldn't exit if the server it had
+    connected to exited for whatever reason while the client was waiting
+    for a query result.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 6 Mar 2024 10:20:32 +0100
+
 monetdb (11.49.3) 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,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Mar  8 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- The internal hash function for floating point types has been changed.
+  It is now no longer based on the bit representation, but on the value,
+  meaning that +0 and -0 (yes, they both exist in floating point) now
+  hash to the same value.
+
 * Fri Mar  1 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.3-20240304
 - Fixed a regression where bats weren't always cleaned up when they
   weren't needed anymore.  In particular, after a DELETE FROM table query
diff --git a/gdk/ChangeLog.Dec2023 b/gdk/ChangeLog.Dec2023
--- a/gdk/ChangeLog.Dec2023
+++ b/gdk/ChangeLog.Dec2023
@@ -1,9 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Fri Mar  8 2024 Sjoerd Mullender <sjo...@acm.org>
-- The internal hash function for floating point types has been changed.
-  It is now no longer based on the bit representation, but on the value,
-  meaning that +0 and -0 (yes, they both exist in floating point) now
-  hash to the same value.
-
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,35 @@
+monetdb (11.49.5) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7390: Some MonetDB Server crashes found
+  * GH#7465: Unexpected result when using `NULL` in `BETWEEN`
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 12 Mar 2024 10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * gdk: The internal hash function for floating point types has been changed.
+    It is now no longer based on the bit representation, but on the value,
+    meaning that +0 and -0 (yes, they both exist in floating point) now
+    hash to the same value.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 8 Mar 2024 10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * sql: performance improvement of 'startswith' and 'endswith' filter 
functions
+    for join operators
+
+ -- Lucas Pereira <lucas.pere...@monetdbsolutions.com>  Thu, 7 Mar 2024 
10:20:32 +0100
+
+monetdb (11.49.5) unstable; urgency=low
+
+  * clients: Fixed an issue where mclient wouldn't exit if the server it had
+    connected to exited for whatever reason while the client was waiting
+    for a query result.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 6 Mar 2024 10:20:32 +0100
+
 monetdb (11.49.3) unstable; urgency=low
 
   * Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,23 @@
+* Tue Mar 12 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- Rebuilt.
+- GH#7390: Some MonetDB Server crashes found
+- GH#7465: Unexpected result when using `NULL` in `BETWEEN`
+
+* Fri Mar  8 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- gdk: The internal hash function for floating point types has been changed.
+  It is now no longer based on the bit representation, but on the value,
+  meaning that +0 and -0 (yes, they both exist in floating point) now
+  hash to the same value.
+
+* Thu Mar  7 2024 Lucas Pereira <lucas.pere...@monetdbsolutions.com> - 
11.49.5-20240312
+- sql: performance improvement of 'startswith' and 'endswith' filter functions
+  for join operators
+
+* Wed Mar  6 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.5-20240312
+- clients: Fixed an issue where mclient wouldn't exit if the server it had
+  connected to exited for whatever reason while the client was waiting
+  for a query result.
+
 * Mon Mar 04 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.3-20240304
 - Rebuilt.
 - GH#6800: Please add information_schema (ANSI SQL norm)
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Mar  7 2024 Lucas Pereira <lucas.pere...@monetdbsolutions.com> - 
11.49.5-20240312
+- performance improvement of 'startswith' and 'endswith' filter functions
+  for join operators
+
 * Mon Jan 15 2024 Sjoerd Mullender <sjo...@acm.org> - 11.49.3-20240304
 - The function json.isvalid(json) incorrectly returned true if the
   argument was null.  It should return null.
diff --git a/sql/ChangeLog.Dec2023 b/sql/ChangeLog.Dec2023
--- a/sql/ChangeLog.Dec2023
+++ b/sql/ChangeLog.Dec2023
@@ -1,7 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Thu Mar  7 2024 Lucas Pereira <lucas.pere...@monetdbsolutions.com>
-- performance improvement of 'startswith' and 'endswith' filter functions
-  for join operators
-
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1706,7 +1706,7 @@ void
 
 void
 _exp_print(mvc *sql, sql_exp *e) {
-       exp_print(sql, GDKstdout, e, 0, NULL, 1, 0);
+       exp_print(sql, GDKstdout, e, 0, NULL, 1, 0, 1);
        mnstr_printf(GDKstdout, "\n");
 }
 
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -110,12 +110,12 @@ dump_sql_subtype(sql_allocator *sa, sql_
        return sa_strdup(sa, buf);
 }
 
-static void exps_print(mvc *sql, stream *fout, list *exps, int depth, list 
*refs, int alias, int brackets);
+static void exps_print(mvc *sql, stream *fout, list *exps, int depth, list 
*refs, int alias, int brackets, int decorate);
 
 static void rel_print_rel(mvc *sql, stream  *fout, sql_rel *rel, int depth, 
list *refs, int decorate);
 
 void
-exp_print(mvc *sql, stream *fout, sql_exp *e, int depth, list *refs, int 
comma, int alias)
+exp_print(mvc *sql, stream *fout, sql_exp *e, int depth, list *refs, int 
comma, int alias, int decorate)
 {
        (void)sql;
        if (!e)
@@ -129,7 +129,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
                        if (rname)
                                mnstr_printf(fout, "\"%s\".", 
dump_escape_ident(sql->ta, rname));
                        mnstr_printf(fout, "\"%s\" = ",  
dump_escape_ident(sql->ta, exp_name(e)));
-                       exp_print(sql, fout, e->l, depth, refs, 0, 0);
+                       exp_print(sql, fout, e->l, depth, refs, 0, 0, decorate);
                        mnstr_printf(fout, " FRAME %d ", level);
                        alias = 0;
                } else if (e->flag & PSM_VAR) {
@@ -145,26 +145,26 @@ exp_print(mvc *sql, stream *fout, sql_ex
                } else if (e->flag & PSM_RETURN) {
                        int level = GET_PSM_LEVEL(e->flag);
                        mnstr_printf(fout, "return ");
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to