Changeset: 468cc39e83b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/468cc39e83b3
Branch: default
Log Message:

Merge with Sep2022 branch.


diffs (91 lines):

diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,6 +1,11 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
+* Mon Jan 16 2023 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a race condition that could lead to a bat being added to the SQL
+  catalog but nog being made persistent, causing a subsequent restart
+  of the system to fail (and crash).
+
 * Wed Dec 14 2022 Sjoerd Mullender <sjo...@acm.org>
 - Fixed a race condition where a hash could have been created on a
   bat using the old bat count while in another thread the bat count
diff --git a/sql/test/merge-partitions/Tests/mergepart34.test 
b/sql/test/merge-partitions/Tests/mergepart34.test
--- a/sql/test/merge-partitions/Tests/mergepart34.test
+++ b/sql/test/merge-partitions/Tests/mergepart34.test
@@ -1,9 +1,8 @@
-
 statement ok
 CREATE MERGE TABLE table1 (a int) PARTITION BY RANGE ON (a)
 
 statement ok
-CREATE MERGE TABLE table2 (a int); 
+CREATE MERGE TABLE table2 (a int)
 
 statement ok
 CREATE TABLE another1 (a int)
@@ -18,7 +17,7 @@ statement ok
 ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM 10 TO 10
 
 statement ok
-ALTER TABLE table2 ADD TABLE another1 
+ALTER TABLE table2 ADD TABLE another1
 
 statement ok
 ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 11 TO 11
@@ -32,7 +31,7 @@ select count(*) from sys._tables where n
 1
 
 query I rowsort
-select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1');
+select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1')
 ------
 3
 
@@ -55,7 +54,7 @@ select count(*) from range_partitions wh
 2
 
 query I rowsort
-select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1');
+select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1')
 ------
 2
 
@@ -68,7 +67,7 @@ select count(*) from range_partitions wh
 1
 
 query I rowsort
-select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1');
+select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1')
 ------
 1
 
@@ -90,7 +89,7 @@ select count(*) from range_partitions wh
 1
 
 query I rowsort
-select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1');
+select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1')
 ------
 1
 
@@ -103,7 +102,7 @@ select count(*) from range_partitions wh
 0
 
 query I rowsort
-select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1');
+select count(*) from sys.objects where nr = ( select id from sys._tables where 
name = 'table1')
 ------
 0
 
@@ -122,5 +121,6 @@ select * from sys.range_partitions
 ------
 
 query ITII rowsort
-select * from sys.objects where id > 5967
+select * from sys.objects where sub is not null
 ------
+
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to