Changeset: 523d3cb470b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/523d3cb470b3
Modified Files:
        gdk/ChangeLog.Sep2022
        monetdb5/ChangeLog.Sep2022
        monetdb5/modules/mal/tablet.c
        sql/ChangeLog.Sep2022
        sql/server/rel_select.c
        sql/test/miscellaneous/Tests/All
Branch: Sep2022
Log Message:

Merge with Jan2022 branch.


diffs (96 lines):

diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,6 +1,10 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
+* Fri Mar 24 2023 Sjoerd Mullender <sjo...@acm.org>
+- When processing the WAL, if a to-be-destroyed object cannot be found,
+  don't stop, but keep processing the rest of the WAL.
+
 * Mon Feb 20 2023 Sjoerd Mullender <sjo...@acm.org>
 - A race condition was fixed where certain write-ahead log messages
   could get intermingled, resulting in a corrupted WAL file.
diff --git a/monetdb5/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022
--- a/monetdb5/ChangeLog.Sep2022
+++ b/monetdb5/ChangeLog.Sep2022
@@ -1,3 +1,7 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Fri Mar 24 2023 Sjoerd Mullender <sjo...@acm.org>
+- Client connections are cleaned up better so that we get fewer instances
+  of clients that cannot connect.
+
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -974,7 +974,7 @@ SQLload_parse_row(READERtask *task, int 
 
                        /* eat away the column separator */
                        for (; *row; row++)
-                               if (*row == '\\') {
+                               if (*row == '\\' && task->escape) {
                                        if (row[1])
                                                row++;
                                } else if (*row == ch && (task->seplen == 1 || 
strncmp(row, task->csep, task->seplen) == 0)) {
@@ -1010,7 +1010,7 @@ SQLload_parse_row(READERtask *task, int 
 
                        /* eat away the column separator */
                        for (; *row; row++)
-                               if (*row == '\\') {
+                               if (*row == '\\' && task->escape) {
                                        if (row[1])
                                                row++;
                                } else if (*row == ch) {
diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022
--- a/sql/ChangeLog.Sep2022
+++ b/sql/ChangeLog.Sep2022
@@ -1,6 +1,12 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Fri Mar 24 2023 Sjoerd Mullender <sjo...@acm.org>
+- Increased the size of a variable counting the number of changes made
+  to the database (e.g. in case more than a 2 billion rows are added to
+  a table).
+- Improved cleanup after failures such as failed memory allocations.
+
 * Mon Feb 13 2023 Sjoerd Mullender <sjo...@acm.org>
 - An insert into a table from which a column was dropped in a parallel
   transaction was incorrectly not flagged as a transaction conflict.
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -968,6 +968,9 @@ table_ref(sql_query *query, symbol *tabl
                                                noninternexp_setname(sql->sa, 
e, tname, NULL);
                                                set_basecol(e);
                                        }
+                                       if 
(tableref->data.lval->h->next->data.sym && 
tableref->data.lval->h->next->data.sym->data.lval->h->next->data.lval) { /* AS 
with column aliases */
+                                               temp_table = 
rel_table_optname(sql, temp_table, tableref->data.lval->h->next->data.sym, 
refs);
+                                       }
                                        list_hash_clear(exps);
                                }
                        }
diff --git a/sql/test/miscellaneous/Tests/All b/sql/test/miscellaneous/Tests/All
--- a/sql/test/miscellaneous/Tests/All
+++ b/sql/test/miscellaneous/Tests/All
@@ -27,3 +27,4 @@ sequences
 analyze_test
 blobs
 temp_tables
+table_alias_on_cte
diff --git a/sql/test/miscellaneous/Tests/table_alias_on_cte.test 
b/sql/test/miscellaneous/Tests/table_alias_on_cte.test
new file mode 100644
--- /dev/null
+++ b/sql/test/miscellaneous/Tests/table_alias_on_cte.test
@@ -0,0 +1,8 @@
+
+query I rowsort
+WITH bar(i) AS (SELECT * FROM generate_series(0, 3))
+SELECT j from bar foo(j);
+----
+0
+1
+2
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to