Changeset: 047ac6e72a0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/047ac6e72a0d
Modified Files:
gdk/gdk_logger.c
sql/storage/store.c
Branch: insertonly
Log Message:
Merge with default branch.
diffs (truncated from 1458 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -811,3 +811,4 @@ 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release
ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7
1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9
+6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
* Wed Aug 30 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.7-20230925
- Do a lot more error checking, mostly for allocation failures. More is
still needed, though.
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,13 @@ fi
%endif
%changelog
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- Rebuilt.
+
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
* Wed Sep 27 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.9-20230927
- Rebuilt.
- GH#7402: Privileges on merge table not propagated to partition tables
diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c
--- a/clients/odbc/tests/ODBCtester.c
+++ b/clients/odbc/tests/ODBCtester.c
@@ -88,11 +88,7 @@ retrieveDiagMsg(SQLHANDLE stmt, char * o
/* The message layout is: "[MonetDB][ODBC Driver
11.46.0][MonetDB-Test]error/warning text".
The ODBC driver version numbers changes in time. Overwrite
it to get a stable output */
if (strncmp(msg, "[MonetDB][ODBC Driver 11.", 25) == 0) {
- for (int i = 25; msg[i] != ']'; i++) {
- if (isdigit(msg[i])) {
- msg[i] = '#';
- }
- }
+ return snprintf(outp, outp_len, "SQLstate %s, Errnr %d,
Message [MonetDB][ODBC Driver 11.##.#]%s\n", (char*)state, (int)errnr,
strchr(msg + 25, ']') + 1);
}
return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message
%s\n", (char*)state, (int)errnr, (char*)msg);
}
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "27")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "3")
+set(GDK_VERSION_PATCH "4")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.47.11) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
+monetdb (11.47.11) unstable; urgency=low
+
+ * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
monetdb (11.47.9) unstable; urgency=low
* Rebuilt.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -57,3 +57,6 @@ override_dh_auto_install:
rm debian/tmp/usr/lib/*/monetdb5/lib_opt_sql_append.so
rm debian/tmp/usr/lib/*/monetdb5/lib_microbenchmark*.so
rm debian/tmp/usr/lib/*/monetdb5/lib_udf*.so
+
+override_dh_installsystemd:
+ dh_installsystemd --no-enable --no-start
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1038,17 +1038,8 @@ log_create_types_file(logger *lg, const
return GDK_SUCCEED;
}
-static inline void
-rotation_lock(logger *lg)
-{
- MT_lock_set(&lg->rotation_lock);
-}
-
-static inline void
-rotation_unlock(logger *lg)
-{
- MT_lock_unset(&lg->rotation_lock);
-}
+#define rotation_lock(lg) MT_lock_set(&(lg)->rotation_lock)
+#define rotation_unlock(lg) MT_lock_unset(&(lg)->rotation_lock)
static gdk_return
log_open_output(logger *lg)
@@ -2285,7 +2276,6 @@ do_flush_range_cleanup(logger *lg)
logged_range *flast = frange;
lg->flush_ranges = flast;
- rotation_unlock(lg);
for (frange = first; frange && frange != flast; frange = frange->next) {
ATOMIC_DEC(&frange->refcount);
@@ -2296,6 +2286,7 @@ do_flush_range_cleanup(logger *lg)
ATOMIC_DEC(&lg->nr_open_files);
}
}
+ rotation_unlock(lg);
return flast;
}
@@ -2416,6 +2407,7 @@ log_next_logfile(logger *lg, ulng ts)
static void
log_cleanup_range(logger *lg, ulng id)
{
+ rotation_lock(lg);
while (lg->pending && lg->pending->id <= id) {
logged_range *p;
p = lg->pending;
@@ -2423,6 +2415,7 @@ log_cleanup_range(logger *lg, ulng id)
lg->pending = p->next;
GDKfree(p);
}
+ rotation_unlock(lg);
}
static void
@@ -2536,9 +2529,9 @@ log_flush(logger *lg, ulng ts)
log_unlock(lg);
return GDK_FAIL;
}
+ updated = p;
memset(updated + allocated / 4, 0, a -
allocated);
allocated = a;
- updated = p;
}
nupdated = n;
}
@@ -3037,17 +3030,8 @@ log_tend(logger *lg)
return result;
}
-static inline void
-flush_lock(logger *lg)
-{
- MT_lock_set(&lg->flush_lock);
-}
-
-static inline void
-flush_unlock(logger *lg)
-{
- MT_lock_unset(&lg->flush_lock);
-}
+#define flush_lock(lg) MT_lock_set(&(lg)->flush_lock)
+#define flush_unlock(lg) MT_lock_unset(&(lg)->flush_lock)
static inline gdk_return
do_flush(logged_range *range)
@@ -3077,6 +3061,7 @@ gdk_return
log_tflush(logger *lg, ulng file_id, ulng commit_ts)
{
if (lg->flushnow) {
+ rotation_lock(lg);
assert(lg->flush_ranges == lg->current);
assert(ATOMIC_GET(&lg->current->flushed_ts) ==
ATOMIC_GET(&lg->current->last_ts));
log_tdone(lg, lg->current, commit_ts);
@@ -3086,6 +3071,7 @@ log_tflush(logger *lg, ulng file_id, uln
if (log_open_output(lg) != GDK_SUCCEED)
GDKfatal("Could not create new log file\n"); /*
TODO: does not have to be fatal (yet) */
do_rotate(lg);
+ rotation_unlock(lg);
(void) do_flush_range_cleanup(lg);
assert(lg->flush_ranges == lg->current);
return log_commit(lg, NULL, 0);
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,16 @@
+monetdb (11.47.11) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
+monetdb (11.47.11) unstable; urgency=low
+
+ * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
monetdb (11.47.9) 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,10 @@
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- Rebuilt.
+
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
* Wed Sep 27 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.9-20230927
- Rebuilt.
- GH#7402: Privileges on merge table not propagated to partition tables
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -378,7 +378,6 @@ MCcloseClient(Client c)
c->promptlength = -1;
if (c->errbuf) {
/* no client threads in embedded mode */
- //if (!GDKembedded())
GDKsetbuf(NULL);
if (c->father == NULL)
GDKfree(c->errbuf);
diff --git a/monetdb5/modules/atoms/Tests/json01.maltest
b/monetdb5/modules/atoms/Tests/json01.maltest
--- a/monetdb5/modules/atoms/Tests/json01.maltest
+++ b/monetdb5/modules/atoms/Tests/json01.maltest
@@ -18,7 +18,7 @@ f:= json.filter(b,"f1")
query T rowsort
io.print(f)
----
-"[1]"
+"1"
statement ok
b:= json.new("{\"f1\":1,\"f2\":2}")
@@ -29,7 +29,7 @@ f:= json.filter(b,"f2")
query T rowsort
io.print(f)
----
-"[2]"
+"2"
statement ok
f:= json.filter(b,"f1,f2")
@@ -48,7 +48,7 @@ f:= json.filter(b,"f1[0]")
query T rowsort
io.print(f)
----
-"[1]"
+"3"
statement ok
f:= json.filter(b,"f1[1]")
@@ -56,7 +56,7 @@ f:= json.filter(b,"f1[1]")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
f:= json.filter(b,"f1[2]")
@@ -91,7 +91,7 @@ f:= json.filter(b,"f1")
query T rowsort
io.print(f)
----
-"[{\"f12\":3}]"
+"{\"f12\":3}"
statement ok
f:= json.filter(b,"f1.f12")
@@ -99,7 +99,7 @@ f:= json.filter(b,"f1.f12")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
