MonetDB: default - Renames rel opt test
Changeset: 4de288822152 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4de288822152 Added Files: sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test Removed Files: sql/test/rel-optimizers/Tests/join-merge-remote-replica.test Modified Files: sql/test/rel-optimizers/Tests/All Branch: default Log Message: Renames rel opt test diffs (15 lines): diff --git a/sql/test/rel-optimizers/Tests/All b/sql/test/rel-optimizers/Tests/All --- a/sql/test/rel-optimizers/Tests/All +++ b/sql/test/rel-optimizers/Tests/All @@ -1,7 +1,7 @@ split-select groupby-cse groupjoin -join-merge-remote-replica +join-merge-remote-replica-plan replicas-base replicas-join local-replica diff --git a/sql/test/rel-optimizers/Tests/join-merge-remote-replica.test b/sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test rename from sql/test/rel-optimizers/Tests/join-merge-remote-replica.test rename to sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - The SSL library on Debian is called libssl.
Changeset: b0cf65910a2c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b0cf65910a2c Modified Files: debian/control Branch: Dec2023 Log Message: The SSL library on Debian is called libssl. This fixex bug #7411. diffs (12 lines): diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 12), cmake libxml2-dev, pkg-config, python3, python3-dev, python3-numpy, unixodbc-dev, zlib1g-dev, r-base-dev, - libcfitsio-dev, openssl-dev (>= 1.1.1) + libcfitsio-dev, libssl-dev (>= 1.1.1) Standards-Version: 3.8.0 X-Python-Version: >= 2.6 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Handle BETWEEN with void bats; fix property s...
Changeset: 4809dad0d66c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4809dad0d66c
Modified Files:
gdk/gdk_bat.c
gdk/gdk_calc.c
sql/test/BugTracker-2023/Tests/All
Branch: Dec2023
Log Message:
Handle BETWEEN with void bats; fix property setting in BUNappend in case of
oid_nil.
This fixes bug #7413.
diffs (296 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1292,12 +1292,12 @@ BUNappendmulti(BAT *b, const void *value
(count > 1 ||
b->tseqbase + b->batCount != ((oid *)
values)[0]))
b->tseqbase = oid_nil;
- if (b->tsorted && ((oid *)
b->theap->base)[b->batCount - 1] > ((oid *) values)[0]) {
+ if (b->tsorted && !is_oid_nil(((oid *)
b->theap->base)[b->batCount - 1]) && ((oid *) b->theap->base)[b->batCount - 1]
> ((oid *) values)[0]) {
b->tsorted = false;
if (b->tnosorted == 0)
b->tnosorted = b->batCount;
}
- if (b->trevsorted && ((oid *)
b->theap->base)[b->batCount - 1] < ((oid *) values)[0]) {
+ if (b->trevsorted && !is_oid_nil(((oid *)
values)[0]) && ((oid *) b->theap->base)[b->batCount - 1] < ((oid *) values)[0])
{
b->trevsorted = false;
if (b->tnorevsorted == 0)
b->tnorevsorted = b->batCount;
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -4028,6 +4028,13 @@ bailout:
return NULL;
}
+#define HANDLE_TIMEOUT \
+ do {\
+ GDKerror("%s\n", GDKexiting() ? EXITING_MSG : TIMEOUT_MSG); \
+ BBPreclaim(bn); \
+ bn = NULL; \
+ } while (0)
+
BAT *
BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, BAT *slo, BAT *shi,
bool symmetric, bool linc, bool hinc, bool nils_false, bool anti)
@@ -4064,20 +4071,50 @@ BATcalcbetween(BAT *b, BAT *lo, BAT *hi,
BATiter bi = bat_iterator(b);
BATiter loi = bat_iterator(lo);
BATiter hii = bat_iterator(hi);
- bn = BATcalcbetween_intern(bi.base, 1,
- bi.vh ? bi.vh->base : NULL,
- bi.width,
- loi.base, 1,
- loi.vh ? loi.vh->base : NULL,
- loi.width,
- hii.base, 1,
- hii.vh ? hii.vh->base : NULL,
- hii.width,
- bi.type,
- , , ,
- b->hseqbase, lo->hseqbase, hi->hseqbase,
- symmetric, anti, linc, hinc,
- nils_false, __func__);
+ if (b->ttype == TYPE_void || lo->ttype == TYPE_void || hi->ttype ==
TYPE_void) {
+ lng timeoffset = 0;
+ QryCtx *qry_ctx = MT_thread_get_qry_ctx();
+ if (qry_ctx != NULL) {
+ timeoffset = (qry_ctx->starttime &&
qry_ctx->querytimeout) ? (qry_ctx->starttime + qry_ctx->querytimeout) : 0;
+ }
+ bn = COLnew(ci.seq, TYPE_bit, ci.ncand, TRANSIENT);
+ if (bn) {
+ bit *restrict dst = (bit *) Tloc(bn, 0);
+ BUN i, j, k, l;
+ BUN nils = 0;
+ TIMEOUT_LOOP_IDX(l, ci.ncand, timeoffset) {
+ i = canditer_next() - b->hseqbase;
+ j = canditer_next() - lo->hseqbase;
+ k = canditer_next() - hi->hseqbase;
+ dst[l] = BETWEEN(BUNtoid(b, i),
+BUNtoid(lo, j),
+BUNtoid(hi, k), oid);
+ nils += is_bit_nil(dst[l]);
+ }
+ BATsetcount(bn, ci.ncand);
+ bn->tsorted = ci.ncand <= 1 || nils == ci.ncand;
+ bn->trevsorted = ci.ncand <= 1 || nils == ci.ncand;
+ bn->tkey = ci.ncand <= 1;
+ bn->tnil = nils != 0;
+ bn->tnonil = nils == 0;
+ TIMEOUT_CHECK(timeoffset, HANDLE_TIMEOUT);
+ }
+ } else {
+ bn =
MonetDB: windowfun_cleanup - Merge with default branch.
Changeset: 655b51512163 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/655b51512163
Branch: windowfun_cleanup
Log Message:
Merge with default branch.
diffs (truncated from 2741 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.48.0
+current_version = 11.50.0
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -815,3 +815,5 @@ 6f88424ebfd9d82c072cf21d89070e04321983da
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
+c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Oct 30 2023 Sjoerd Mullender
-- The ranges of merge partitions are now pushed down into the low
- level GDK operations, giving them a handle to sometimes execute more
- efficiently.
-
-* Thu Jul 27 2023 Niels Nes
-- Removed the PYTHON MAP external language option, as after a fork the
- synchronization primitives could be in any state, leading to deadlocks.
- During the upgrade function definitions will fallback to the normal
- PYTHON language option.
-
-* Mon Jul 17 2023 Panagiotis Koutsourakis
-- Implemented direct masking for strimp construction. The strimps
- datastructure now keeps an array of 65K 64-bit integers that is zero
- everywhere except at the indexes that correspond to header pairs. The
- entry for the nth pair in order has the nth bit of the bitstring
- on. These can be used to quickly construct bitstrings.
diff --git a/ChangeLog b/ChangeLog.Dec2023
copy from ChangeLog
copy to ChangeLog.Dec2023
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.48.0
+%global version 11.50.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -867,6 +867,14 @@ fi
%endif
%changelog
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Rebuilt.
+
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- gdk: Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
- Rebuilt.
- GH#7410: SIGSEGV cause database corruption
diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2023
copy from clients/ChangeLog
copy to clients/ChangeLog.Dec2023
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -3,7 +3,7 @@ int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMallocate(const char *nme);
void *ATOMdup(int id, const void *val);
uint8_t ATOMelmshift(int sz) __attribute__((__const__));
-char *ATOMformat(int id, const void *val);
+char *ATOMformat(int id, const void *val)
__attribute__((__warn_unused_result__));
gdk_return ATOMheap(int id, Heap *hp, size_t cap)
__attribute__((__warn_unused_result__));
int ATOMindex(const char *nme);
size_t ATOMlen(int id, const void *v);
@@ -310,6 +310,7 @@ gdk_return GDKmunmap(void *addr, int mod
int GDKnr_threads;
void GDKprepareExit(void);
void GDKprintinfo(void);
+void GDKprintinforegister(void (*func)(void));
void GDKqsort(void *restrict h, void *restrict t, const void *restrict base,
size_t n, int hs, int ts, int tpe, bool reverse, bool nilslast);
void *GDKrealloc(void *pold, size_t size) __attribute__((__alloc_size__(2)))
__attribute__((__warn_unused_result__));
gdk_return GDKrebuild_segment_tree(oid ncount, oid data_size, BAT *st, void
**segment_tree, oid **levels_offset, oid *nlevels);
@@ -423,7 +424,7 @@ int VALcmp(const ValRecord *p, const Val
void *VALconvert(int typ, ValPtr t);
ValPtr VALcopy(ValPtr dst, const ValRecord *src);
void VALempty(ValPtr v);
-char *VALformat(const ValRecord *res);
+char *VALformat(const ValRecord *res) __attribute__((__warn_unused_result__));
void *VALget(ValPtr v);
ValPtr VALinit(ValPtr d, int tpe, const void *s);
bool VALisnil(const ValRecord *v);
@@ -558,6 +559,7 @@ gdk_return log_delta(logger *lg, BAT *ui
void log_destroy(logger *lg);
log_bid log_find_bat(logger *lg, log_id id);
gdk_return log_flush(logger *lg, ulng saved_id);
+void log_printinfo(logger *lg);
int log_sequence(logger *lg, int seq, lng *id);
gdk_return log_tend(logger *lg);
gdk_return log_tflush(logger *lg, ulng log_file_id, ulng commit_ts);
@@ -872,8 +874,8 @@ char *concatErrors(char *err1, const cha
const char *connectRef;
const char *containsRef;
str convertConstant(malType ty
MonetDB: windowfun_cleanup - Fix cmakelist file for gdk_analytic...
Changeset: da7f2e5d35e8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/da7f2e5d35e8 Modified Files: gdk/CMakeLists.txt Branch: windowfun_cleanup Log Message: Fix cmakelist file for gdk_analytical_minmax.h diffs (12 lines): diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt --- a/gdk/CMakeLists.txt +++ b/gdk/CMakeLists.txt @@ -85,7 +85,7 @@ target_sources(bat gdk_subquery.c gdk_subquery.h gdk_analytic_bounds.c gdk_analytic_statistics.c - gdk_analytic_func.c gdk_analytic_func.h + gdk_analytic_func.c gdk_analytic_minmax.h gdk_analytic.h gdk_tracer.c gdk_tracer.h gdk_rtree.c ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: windowfun_cleanup - c template hack for GDKanalytical{m...
Changeset: 7eb91308bbc9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7eb91308bbc9
Added Files:
gdk/gdk_analytic_minmax.h
Modified Files:
gdk/CMakeLists.txt
gdk/gdk_analytic_func.c
Branch: windowfun_cleanup
Log Message:
c template hack for GDKanalytical{min,max} working
diffs (truncated from 908 to 300 lines):
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -85,7 +85,7 @@ target_sources(bat
gdk_subquery.c gdk_subquery.h
gdk_analytic_bounds.c
gdk_analytic_statistics.c
- gdk_analytic_func.c
+ gdk_analytic_func.c gdk_analytic_func.h
gdk_analytic.h
gdk_tracer.c gdk_tracer.h
gdk_rtree.c
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -893,430 +893,20 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
return GDK_SUCCEED;
}
-#define ANALYTICAL_MIN_MAX_CALC_FIXED_UNBOUNDED_TILL_CURRENT_ROW(TPE, MIN_MAX)
\
- do {\
- TPE curval = TPE##_nil; \
- for (; k < i;) {\
- j = k; \
- do {\
- if (!is_##TPE##_nil(bp[k])) { \
- if (is_##TPE##_nil(curval)) \
- curval = bp[k]; \
- else\
- curval = MIN_MAX(bp[k],
curval); \
- } \
- k++;\
- } while (k < i && !op[k]); \
- for (; j < k; j++) \
- rb[j] = curval; \
- has_nils |= is_##TPE##_nil(curval); \
- } \
- } while (0)
-
-#define ANALYTICAL_MIN_MAX_CALC_FIXED_CURRENT_ROW_TILL_UNBOUNDED(TPE, MIN_MAX)
\
- do {\
- TPE curval = TPE##_nil; \
- l = i - 1; \
- for (j = l; ; j--) {\
- if (!is_##TPE##_nil(bp[j])) { \
- if (is_##TPE##_nil(curval)) \
- curval = bp[j]; \
- else\
- curval = MIN_MAX(bp[j], curval); \
- } \
- if (op[j] || j == k) { \
- for (; ; l--) { \
- rb[l] = curval; \
- if (l == j) \
- break; \
- } \
- has_nils |= is_##TPE##_nil(curval); \
- if (j == k) \
- break; \
- l = j - 1; \
- } \
- } \
- k = i; \
- } while (0)
-
-#define ANALYTICAL_MIN_MAX_CALC_FIXED_ALL_ROWS(TPE, MIN_MAX) \
- do {\
- TPE curval = TPE##_nil; \
- for (j = k; j < i; j++) { \
- TPE v = bp[j]; \
- if (!is_##TPE##_nil(v)) { \
- if (is_##TPE##_nil(curval)) \
- curval = v; \
- else\
- curval = MIN_MAX(v, curval);\
- } \
- } \
-
MonetDB: windowfun_cleanup - Merge with default.
Changeset: 5f922d94dd48 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f922d94dd48
Branch: windowfun_cleanup
Log Message:
Merge with default.
diffs (truncated from 6766 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -814,3 +814,4 @@ 1efa83c6409769d13b2ee30e497d5f7ab42fa955
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
+5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -867,6 +867,17 @@ fi
%endif
%changelog
+* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
+- Rebuilt.
+- GH#7410: SIGSEGV cause database corruption
+
+* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109
+- gdk: When saving the SQL catalog during a low-level commit, we should
+ only save the part of the catalog that corresponds to the part of the
+ write-ahead log that has been processed. What we did was save more,
+ which resulted in the catalog containing references to tables and
+ columns whose disk presence is otherwise only in the write-ahead log.
+
* Fri Nov 03 2023 Sjoerd Mullender - 11.47.13-20231103
- Rebuilt.
- GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions
diff --git a/clients/examples/python/mclient-python3.py
b/clients/examples/python/mclient-python3.py
--- a/clients/examples/python/mclient-python3.py
+++ b/clients/examples/python/mclient-python3.py
@@ -65,7 +65,7 @@ def main() :
line = fi.readline()
if encoding != 'utf-8':
prompt = str(prompt, 'utf-8').encode(encoding, 'replace')
-while line and line != "\q\n":
+while line and line != "\\q\n":
if encoding != 'utf-8':
line = str(line, encoding).encode('utf-8')
res = s.cmd('s' + line)
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -212,7 +212,7 @@ The possible values are
.BR expanded ,
.BR x ,
.BR csv ,
-.BR csv-noquote ,
+.BR csv\-noquote ,
.BR tab ,
.BR raw ,
.BR xml ,
@@ -221,7 +221,7 @@ and
.BR rowcount .
.B csv
is comma-separated values;
-.B csv-noquote
+.B csv\-noquote
is comma-separated values without escaping any quotes;
.B tab
is tab-separated values;
@@ -248,7 +248,7 @@ is a variation on
where only the number of affected rows is printed.
Normal \fBcsv\fP and \fBtab\fP formatting will use double quotes
around any fields that contain double quotes, white space or the
-separator. The \fBcsv-noquote\fP format will prevent that and dump
+separator. The \fBcsv\-noquote\fP format will prevent that and dump
the contents of the field without any interpretation.
In addition to plain \fBcsv\fP, two other forms are possible.
\fBcsv=\fP\fIc\fP uses \fIc\fP as column separator; \fBcsv+\fP\fIc\fP
@@ -539,7 +539,7 @@ in the above query can also be a URL. I
.IR e . g .,
.IR https://www.example.org/dumpdata.csv .
.PP
-See
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/copy-from/
+See
https://www.monetdb.org/documentation/user\-guide/sql\-manual/data\-loading/copy\-from/
for more information about the COPY INTO query.
.SH SEE ALSO
.IR msqldump (1),
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 "5")
+set(GDK_VERSION_PATCH "6")
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,20 @@
+monetdb (11.47.15) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7410: SIGSEGV cause database corruption
+
+ -- Sjoerd Mullender Thu, 09 Nov 2023 17:03:15 +0100
+
+monetdb (11.47.15) unstable; urgency=low
+
+ * gdk: When saving the SQL catalog during a low-level commit, we should
+only save the part of the catalog that corresponds to the part of the
+write-ahead log that has been processed. What we did was save more,
+which resulted in the catalog containing references to tables and
+columns whose disk presence is otherwise only in the write-ahead log.
+
+ -- Sjoerd Mullender Tue, 7 Nov 2023 17:03:15 +0100
+
monetdb (11.47.13) unstable; urgency=low
* Rebuilt.
diff --git a/documentation/source/manual_pages/monetdb.rst
b/documentation/source/manual_pages/monetdb.rst
--- a/documentation/source/manual_pages/monetdb.rst
+++ b/documentation/source/manual_pages/monetdb.rst
@@ -71,7 +71,7 @@ allows to do wildcard matches. For detai
maintenance mode. This allows the database administrator to perform
initialization steps
MonetDB: default - Merge with Dec2023 branch.
Changeset: 8bca40cd2529 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8bca40cd2529
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (129 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -816,3 +816,4 @@ 6f88424ebfd9d82c072cf21d89070e04321983da
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -867,6 +867,14 @@ fi
%endif
%changelog
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Rebuilt.
+
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- gdk: Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
- Rebuilt.
- GH#7410: SIGSEGV cause database corruption
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 "6")
+set(GDK_VERSION_PATCH "7")
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,17 @@
+monetdb (11.47.17) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
+monetdb (11.47.17) unstable; urgency=low
+
+ * gdk: Fixed a regression where after a while the write-ahead log files
+weren't being rotated, meaning from some point onwards, the newest
+file just kept on growing.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
monetdb (11.47.15) 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,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109
- When saving the SQL catalog during a low-level commit, we should
only save the part of the catalog that corresponds to the part of the
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2471,6 +2471,7 @@ do_rotate(logger *lg)
if (!LOG_DISABLED(lg) && ATOMIC_GET(>refcount) == 1) {
close_stream(cur->output_log);
cur->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
}
}
@@ -3150,6 +3151,7 @@ log_tflush(logger *lg, ulng file_id, uln
if (frange != lg->current) {
close_stream(frange->output_log);
frange->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
rotation_unlock(lg);
}
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,17 @@
+monetdb (11.47.17) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
+monetdb (11.47.17) unstable; urgency=low
+
+ * gdk: Fixed a regression where after a while the write-ahead log files
+weren't being rotated, meaning from some point onwards, the newest
+file just kept on growing.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
monetdb (11.47.15) 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,11 @@
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Rebuilt.
+
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- gdk: Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Thu Nov 09 2023 Sjoerd M
MonetDB: Jun2023 - Post release build.
Changeset: 31889bd7e790 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/31889bd7e790
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Post release build.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.17
+current_version = 11.47.18
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.17
+%global version 11.47.18
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,17)
- PRODUCTVERSION version(11,47,17)
+ FILEVERSION version(11,47,18)
+ PRODUCTVERSION version(11,47,18)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,17)
+ VALUE "FileVersion", sversion(11,47,18)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,17)
+ VALUE "ProductVersion", sversion(11,47,18)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,17)
- PRODUCTVERSION version(11,47,17)
+ FILEVERSION version(11,47,18)
+ PRODUCTVERSION version(11,47,18)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,17)
+ VALUE "FileVersion", sversion(11,47,18)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,17)
+ VALUE "ProductVersion", sversion(11,47,18)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,17)
- PRODUCTVERSION version(11,47,17)
+ FILEVERSION version(11,47,18)
+ PRODUCTVERSION version(11,47,18)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,17)
+VALUE "FileVersion", sversion(11,47,18)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,17)
+VALUE "ProductVersion", sversion(11,47,18)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "17")
+set(MONETDB_VERSION_PATCH "18")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jun2023-SP3")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++
MonetDB: Dec2023 - Merge with Jun2023 branch, not changing any f...
Changeset: 63f28db4531d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/63f28db4531d Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: Dec2023 Log Message: Merge with Jun2023 branch, not changing any files.. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Merge with Jun2023 branch.
Changeset: 8824a86642e3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8824a86642e3
Modified Files:
.hgtags
MonetDB.spec
cmake/monetdb-versions.cmake
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
Branch: Dec2023
Log Message:
Merge with Jun2023 branch.
diffs (122 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -816,3 +816,4 @@ 6f88424ebfd9d82c072cf21d89070e04321983da
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -867,6 +867,14 @@ fi
%endif
%changelog
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Rebuilt.
+
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- gdk: Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
- Rebuilt.
- GH#7410: SIGSEGV cause database corruption
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 "6")
+set(GDK_VERSION_PATCH "7")
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,17 @@
+monetdb (11.47.17) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
+monetdb (11.47.17) unstable; urgency=low
+
+ * gdk: Fixed a regression where after a while the write-ahead log files
+weren't being rotated, meaning from some point onwards, the newest
+file just kept on growing.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
monetdb (11.47.15) 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,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109
- When saving the SQL catalog during a low-level commit, we should
only save the part of the catalog that corresponds to the part of the
diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023
--- a/gdk/ChangeLog.Jun2023
+++ b/gdk/ChangeLog.Jun2023
@@ -1,8 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Thu Nov 16 2023 Sjoerd Mullender
-- Fixed a regression where after a while the write-ahead log files
- weren't being rotated, meaning from some point onwards, the newest
- file just kept on growing.
-
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,17 @@
+monetdb (11.47.17) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
+monetdb (11.47.17) unstable; urgency=low
+
+ * gdk: Fixed a regression where after a while the write-ahead log files
+weren't being rotated, meaning from some point onwards, the newest
+file just kept on growing.
+
+ -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100
+
monetdb (11.47.15) 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,11 @@
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- Rebuilt.
+
+* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116
+- gdk: Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
- Rebuilt.
- GH#7410: SIGSEGV cause database corruption
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Setting tag Jun2023_17 for the release build.
Changeset: 61017838e68a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/61017838e68a Modified Files: .hgtags Branch: Jun2023 Log Message: Setting tag Jun2023_17 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -815,3 +815,4 @@ 6f88424ebfd9d82c072cf21d89070e04321983da 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13 5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15 +c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...
Changeset: c9e6096e7519 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c9e6096e7519 Modified Files: MonetDB.spec debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Jun2023 misc/packages/deb/changelog misc/packages/rpm/changelog Branch: Jun2023 Log Message: Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and ChangeLog-Archive. diffs (102 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,14 @@ fi %endif %changelog +* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116 +- Rebuilt. + +* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116 +- gdk: Fixed a regression where after a while the write-ahead log files + weren't being rotated, meaning from some point onwards, the newest + file just kept on growing. + * Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109 - Rebuilt. - GH#7410: SIGSEGV cause database corruption diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.47.17) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100 + +monetdb (11.47.17) unstable; urgency=low + + * gdk: Fixed a regression where after a while the write-ahead log files +weren't being rotated, meaning from some point onwards, the newest +file just kept on growing. + + -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100 + monetdb (11.47.15) 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,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116 +- Fixed a regression where after a while the write-ahead log files + weren't being rotated, meaning from some point onwards, the newest + file just kept on growing. + * Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109 - When saving the SQL catalog during a low-level commit, we should only save the part of the catalog that corresponds to the part of the diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023 --- a/gdk/ChangeLog.Jun2023 +++ b/gdk/ChangeLog.Jun2023 @@ -1,8 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Thu Nov 16 2023 Sjoerd Mullender -- Fixed a regression where after a while the write-ahead log files - weren't being rotated, meaning from some point onwards, the newest - file just kept on growing. - 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,17 @@ +monetdb (11.47.17) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100 + +monetdb (11.47.17) unstable; urgency=low + + * gdk: Fixed a regression where after a while the write-ahead log files +weren't being rotated, meaning from some point onwards, the newest +file just kept on growing. + + -- Sjoerd Mullender Thu, 16 Nov 2023 10:48:27 +0100 + monetdb (11.47.15) 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,11 @@ +* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116 +- Rebuilt. + +* Thu Nov 16 2023 Sjoerd Mullender - 11.47.17-20231116 +- gdk: Fixed a regression where after a while the write-ahead log files + weren't being rotated, meaning from some point onwards, the newest + file just kept on growing. + * Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109 - Rebuilt. - GH#7410: SIGSEGV cause database corruption ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Updated library versions.
Changeset: 9acd4df02245 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9acd4df02245
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:
Updated library versions.
diffs (12 lines):
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 "6")
+set(GDK_VERSION_PATCH "7")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Merge with Jun2023 branch, not changing any f...
Changeset: 61a8eafe6b8d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/61a8eafe6b8d Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: Dec2023 Log Message: Merge with Jun2023 branch, not changing any files. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Pre-release version number update.
Changeset: 3da5d45d727c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3da5d45d727c
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:
Pre-release version number update.
diffs (191 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.16
+current_version = 11.47.17
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.16
+%global version 11.47.17
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,16)
- PRODUCTVERSION version(11,47,16)
+ FILEVERSION version(11,47,17)
+ PRODUCTVERSION version(11,47,17)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,47,16)
+ VALUE "FileVersion", sversion(11,47,17)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,16)
+ VALUE "ProductVersion", sversion(11,47,17)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,47,16)
- PRODUCTVERSION version(11,47,16)
+ FILEVERSION version(11,47,17)
+ PRODUCTVERSION version(11,47,17)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,47,16)
+ VALUE "FileVersion", sversion(11,47,17)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,16)
+ VALUE "ProductVersion", sversion(11,47,17)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,16)
- PRODUCTVERSION version(11,47,16)
+ FILEVERSION version(11,47,17)
+ PRODUCTVERSION version(11,47,17)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,16)
+VALUE "FileVersion", sversion(11,47,17)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,16)
+VALUE "ProductVersion", sversion(11,47,17)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "16")
+set(MONETDB_VERSION_PATCH "17")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jun2023-SP3")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
---
MonetDB: Dec2023 - Merge with Jun2023 branch.
Changeset: 080d7a44c867 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/080d7a44c867
Modified Files:
gdk/gdk_logger.c
Branch: Dec2023
Log Message:
Merge with Jun2023 branch.
diffs (31 lines):
diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023
--- a/gdk/ChangeLog.Jun2023
+++ b/gdk/ChangeLog.Jun2023
@@ -1,3 +1,8 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Thu Nov 16 2023 Sjoerd Mullender
+- Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2471,6 +2471,7 @@ do_rotate(logger *lg)
if (!LOG_DISABLED(lg) && ATOMIC_GET(>refcount) == 1) {
close_stream(cur->output_log);
cur->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
}
}
@@ -3150,6 +3151,7 @@ log_tflush(logger *lg, ulng file_id, uln
if (frange != lg->current) {
close_stream(frange->output_log);
frange->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
rotation_unlock(lg);
}
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Show stopper fix: properly maintain count of ...
Changeset: 6649fbc25581 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6649fbc25581
Modified Files:
gdk/ChangeLog.Jun2023
gdk/gdk_logger.c
Branch: Jun2023
Log Message:
Show stopper fix: properly maintain count of open WAL output files.
diffs (31 lines):
diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023
--- a/gdk/ChangeLog.Jun2023
+++ b/gdk/ChangeLog.Jun2023
@@ -1,3 +1,8 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Thu Nov 16 2023 Sjoerd Mullender
+- Fixed a regression where after a while the write-ahead log files
+ weren't being rotated, meaning from some point onwards, the newest
+ file just kept on growing.
+
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2446,6 +2446,7 @@ do_rotate(logger *lg)
if (!LOG_DISABLED(lg) && ATOMIC_GET(>refcount) == 1) {
close_stream(cur->output_log);
cur->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
}
}
@@ -3127,6 +3128,7 @@ log_tflush(logger *lg, ulng file_id, uln
if (frange != lg->current) {
close_stream(frange->output_log);
frange->output_log = NULL;
+ ATOMIC_DEC(>nr_open_files);
}
rotation_unlock(lg);
}
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
