Changeset: a7264a721d6f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a7264a721d6f
Modified Files:
gdk/gdk.h
sql/storage/bat/bat_logger.c
sql/storage/store.c
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (62 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -753,7 +753,7 @@ typedef struct {
#define GDKLIBRARY_HSIZE 061045U /* first in Jan2022: heap "size" values
*/
#define GDKLIBRARY_JSON 061046U /* first in Sep2022: json storage
changes*/
#define GDKLIBRARY_STATUS 061047U /* first in Dec2023: no status/filename
columns */
-#define GDKLIBRARY 061050U /* first after Dec2023 */
+#define GDKLIBRARY 061050U /* first in Aug2024 */
/* The batRestricted field indicates whether a BAT is readonly.
* we have modes: BAT_WRITE = all permitted
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -24,7 +24,6 @@
#define CATALOG_JUL2021 52300 /* first in Jul2021 */
#define CATALOG_JAN2022 52301 /* first in Jan2022 */
#define CATALOG_SEP2022 52302 /* first in Sep2022 */
-#define CATALOG_FIRST_AFTER_DEC2023 52303 /* first after Dec2023 */
/* Note, CATALOG version 52300 is the first one where the basic system
* tables (the ones created in store.c) have fixed and unchangeable
@@ -93,14 +92,6 @@ bl_preversion(sqlstore *store, int oldve
}
#endif
-#ifdef CATALOG_FIRST_AFTER_DEC2023
- if (oldversion == CATALOG_FIRST_AFTER_DEC2023) {
- /* upgrade to default releases */
- store->catalog_version = oldversion;
- return GDK_SUCCEED;
- }
-#endif
-
return GDK_FAIL;
}
@@ -3262,9 +3253,8 @@ bl_postversion(void *Store, void *Lg)
}
#endif
-
-#ifdef CATALOG_FIRST_AFTER_DEC2023
- if (store->catalog_version <= CATALOG_FIRST_AFTER_DEC2023) {
+#ifdef CATALOG_SEP2022
+ if (store->catalog_version <= CATALOG_SEP2022) {
/* new STRING column sys.keys.check */
BAT *b = log_temp_descriptor(log_find_bat(lg, 2088));
/* sys.keys.id */
if (b == NULL)
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -23,7 +23,7 @@
#include "bat/bat_logger.h"
/* version 05.23.03 of catalog */
-#define CATALOG_VERSION 52304 /* second after Dec2023 */
+#define CATALOG_VERSION 52303 /* first in Aug2024 */
ulng
store_function_counter(sqlstore *store)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
