MonetDB: balanced_union - Leftovers from merge with default
Changeset: 587a1e6b3e4d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/587a1e6b3e4d
Modified Files:
sql/server/rel_dump.c
sql/server/rel_optimize_proj.c
sql/server/rel_select.c
sql/server/rel_statistics.c
Branch: balanced_union
Log Message:
Leftovers from merge with default
diffs (66 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -532,7 +532,7 @@ rel_print_rel(mvc *sql, stream *fout, s
}
print_indent(sql, fout, depth, decorate);
mnstr_printf(fout, ")");
- exps_print(sql, fout, rel->exps, depth, refs, 1, 0);
+ exps_print(sql, fout, rel->exps, depth, refs, 1, 0, decorate);
break;
case op_project:
case op_select:
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -2149,7 +2149,7 @@ rel_push_aggr_down_n_arry(visitor *v, sq
if (oa->type == e_aggr) {
sql_subfunc *f = oa->f;
int cnt = exp_aggr_is_count(oa);
- sql_subfunc *a = sql_bind_func(v->sql, "sys",
(cnt)?"sum":f->func->base.name, exp_subtype(e), NULL, F_AGGR, true);
+ sql_subfunc *a = sql_bind_func(v->sql, "sys",
(cnt)?"sum":f->func->base.name, exp_subtype(e), NULL, F_AGGR, true, true);
assert(a);
/* munion of aggr result may have nils
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
@@ -5764,7 +5764,7 @@ rel_setquery_(sql_query *query, sql_rel
/* Generate n-ary set operator */
static sql_rel *
-rel_setquery_n_ary_(sql_query *query, sql_rel *l, sql_rel *r, dlist *cols, int
op)
+rel_setquery_n_ary_(sql_query *query, sql_rel *l, sql_rel *r, dlist *cols, int
op, int outer)
{
/* even though this is for a general n-ary operators in this phase of
the query
* processing we gonna have only two operands (so technically it's
binary). In
@@ -5776,6 +5776,8 @@ rel_setquery_n_ary_(sql_query *query, sq
mvc *sql = query->sql;
sql_rel *rel;
+ if (outer && !cols)
+ return sql_error(sql, 02, SQLSTATE(42000) "UNION: OUTER
needs to be combined with CORRESPONDING [ BY ( column list ) ]");
if (!cols) {
// TODO: make rel_setop_n_ary_check_types to accept a list of
rels
// and a list of lists of exps
@@ -5846,7 +5848,7 @@ rel_setquery(sql_query *query, symbol *q
t2 = rel_distinct(t2);
// TODO: this has to be fixed
/*res = rel_setquery_(query, t1, t2, corresponding, op_union,
outer);*/
- res = rel_setquery_n_ary_(query, t1, t2, corresponding,
op_munion);
+ res = rel_setquery_n_ary_(query, t1, t2, corresponding,
op_munion, outer);
} else if ( q->token == SQL_EXCEPT)
res = rel_setquery_(query, t1, t2, corresponding, op_except, 0);
else if ( q->token == SQL_INTERSECT)
diff --git a/sql/server/rel_statistics.c b/sql/server/rel_statistics.c
--- a/sql/server/rel_statistics.c
+++ b/sql/server/rel_statistics.c
@@ -922,7 +922,7 @@ rel_get_statistics_(visitor *v, sql_rel
} else if (list_empty(nl)) {
/* empty select (project [ nils ] ) */
for (node *n = rel->exps->h ; n ; n = n->next) {
- sql_exp *e = n->data, *a =
exp_atom(v->sql->sa, atom_general(v->sql->sa, exp_subtype(e), NULL));
+ sql_exp *e = n->data, *a =
exp_atom(v->sql->sa, atom_general(v->sql->sa, exp_subtype(e), NULL, 0));
exp_prop_alias(v->sql->sa, a, e);
n->data = a;
}
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Improve test for whether all free bats are in...
Changeset: 1ff793275a63 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1ff793275a63
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_utils.c
testing/Mtest.py.in
Branch: Dec2023
Log Message:
Improve test for whether all free bats are in a free list.
diffs (114 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4915,7 +4915,8 @@ BBPprintinfo(void)
int nh = 0;
BBPtmlock();
- for (bat i = 1, sz = (bat) ATOMIC_GET(&BBPsize); i < sz; i++) {
+ bat sz = (bat) ATOMIC_GET(&BBPsize);
+ for (bat i = 1; i < sz; i++) {
MT_lock_set(&GDKswapLock(i));
if (BBP_refs(i) > 0 || BBP_lrefs(i) > 0) {
BAT *b = BBP_desc(i);
@@ -4947,9 +4948,13 @@ BBPprintinfo(void)
}
MT_lock_unset(&GDKswapLock(i));
}
+ uint32_t nfree = BBP_nfree;
BBPtmunlock();
- printf("%d persistent bats using %zu virtual memory (%zu malloced)\n",
pn, pvm, pmem);
- printf("%d transient bats using %zu virtual memory (%zu malloced)\n",
tn, tvm, tmem);
+ printf("%d persistent bats using %zu virtual memory (%zu malloced)\n",
+ pn, pvm, pmem);
+ printf("%d transient bats using %zu virtual memory (%zu malloced)\n",
+ tn, tvm, tmem);
printf("%d bats are \"hot\" (i.e. currently or recently used)\n", nh);
- printf("%"PRIu32" bats are in global free list\n", BBP_nfree);
+ printf("%d bats total, %"PRIu32" free bats in common shared list\n",
+ sz - 1, nfree);
}
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2060,6 +2060,7 @@ GDKprintinfo(void)
size_t allocated = (size_t) ATOMIC_GET(&GDK_mallocedbytes_estimate);
size_t vmallocated = (size_t) ATOMIC_GET(&GDK_vm_cursize);
+ printf("SIGUSR1 info start\n");
printf("Virtual memory allocated: %zu, of which %zu with malloc\n",
vmallocated + allocated, allocated);
printf("gdk_vm_maxsize: %zu, gdk_mem_maxsize: %zu\n",
@@ -2093,4 +2094,5 @@ GDKprintinfo(void)
dump_threads();
for (struct prinfocb *p = prinfocb; p; p = p->next)
(*p->func)();
+ printf("SIGUSR1 info end\n");
}
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -64,6 +64,11 @@ mapiportre = re.compile(r'mapi:monetdb:/
geos_version = '@GEOS_VERSION@'.split('.')
+# free bats, used bats, total bats
+fbre = re.compile(r' (?P\d+) free bats')
+ubre = re.compile(r'^(?P\d+) (persistent|transient) bats')
+tbre = re.compile(r'^(?P\d+) bats total')
+
# default is no color (these three functions may get redefined)
def prred(str):
print(str, end='')
@@ -1468,9 +1473,7 @@ def PerformDir(env, testdir, testlist, t
nbats, maxid = crs.fetchall()[0]
crs.close()
dbh.close()
-if maxid > nbats and maxid - nbats > 1:
-pSrvr.outfile.write(f'Too many free bats. Max ID =
{maxid}, # used = {nbats}, diff = {maxid - nbats}.\n')
-pSrvr.sendusr1()
+pSrvr.sendusr1()
pSrvr.terminate()
pSrvr = None
if produce_html:
@@ -1480,10 +1483,31 @@ def PerformDir(env, testdir, testlist, t
o.write('{} standard
{}\n'.format(TSTDIR, 'output' if ext == 'out' else 'error'))
o.write('\n')
empty = True
+sigusr1 = False
+nfree = 0
+nused = 0
+ntotal = 0
for line in openutf8(os.path.join(TSTTRGDIR,
f'SingleServer.{ext}')):
if empty:
o.write('\n')
empty = False
+if 'SIGUSR1 info start' in line:
+sigusr1 = True
+line = '#' + line
+elif 'SIGUSR1 info end' in line:
+sigusr1 = False
+line = '#' + line
+elif sigusr1:
+res = fbre.search(line)
+if res is not None:
+nfree += int(res.group('bats'))
+res = ubre.search(line)
+if res is not None:
+nused += int(res.group('bats'))
+res = tbre.search(line)
+if res is not None:
+ntotal = int(res.group('bats'))
+line = '#' + line
span1 = sp
MonetDB: default - Merge with Dec2023 branch.
Changeset: 80c7640f97da for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/80c7640f97da
Modified Files:
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_utils.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (130 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -905,8 +905,8 @@ COLcopy(BAT *b, int tt, bool writable, r
memcpy(bn->tvheap->base, bi.vh->base,
bi.vhfree);
bn->tvheap->free = bi.vhfree;
bn->tvheap->dirty = true;
- if (ATOMstorage(b->ttype) == TYPE_str &&
b->tvheap->free >= GDK_STRHASHSIZE)
- memcpy(b->tvheap->base, strhash,
GDK_STRHASHSIZE);
+ if (ATOMstorage(b->ttype) == TYPE_str &&
bi.vhfree >= GDK_STRHASHSIZE)
+ memcpy(bn->tvheap->base, strhash,
GDK_STRHASHSIZE);
}
/* make sure we use the correct capacity */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4866,7 +4866,8 @@ BBPprintinfo(void)
int nh = 0;
BBPtmlock();
- for (bat i = 1, sz = (bat) ATOMIC_GET(&BBPsize); i < sz; i++) {
+ bat sz = (bat) ATOMIC_GET(&BBPsize);
+ for (bat i = 1; i < sz; i++) {
MT_lock_set(&GDKswapLock(i));
if (BBP_refs(i) > 0 || BBP_lrefs(i) > 0) {
BAT *b = BBP_desc(i);
@@ -4896,9 +4897,13 @@ BBPprintinfo(void)
}
MT_lock_unset(&GDKswapLock(i));
}
+ uint32_t nfree = BBP_nfree;
BBPtmunlock();
- printf("%d persistent bats using %zu virtual memory (%zu malloced)\n",
pn, pvm, pmem);
- printf("%d transient bats using %zu virtual memory (%zu malloced)\n",
tn, tvm, tmem);
+ printf("%d persistent bats using %zu virtual memory (%zu malloced)\n",
+ pn, pvm, pmem);
+ printf("%d transient bats using %zu virtual memory (%zu malloced)\n",
+ tn, tvm, tmem);
printf("%d bats are \"hot\" (i.e. currently or recently used)\n", nh);
- printf("%"PRIu32" bats are in global free list\n", BBP_nfree);
+ printf("%d bats total, %"PRIu32" free bats in common shared list\n",
+ sz - 1, nfree);
}
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2060,6 +2060,7 @@ GDKprintinfo(void)
size_t allocated = (size_t) ATOMIC_GET(&GDK_mallocedbytes_estimate);
size_t vmallocated = (size_t) ATOMIC_GET(&GDK_vm_cursize);
+ printf("SIGUSR1 info start\n");
printf("Virtual memory allocated: %zu, of which %zu with malloc\n",
vmallocated + allocated, allocated);
printf("gdk_vm_maxsize: %zu, gdk_mem_maxsize: %zu\n",
@@ -2093,6 +2094,7 @@ GDKprintinfo(void)
dump_threads();
for (struct prinfocb *p = prinfocb; p; p = p->next)
(*p->func)();
+ printf("SIGUSR1 info end\n");
}
exception_buffer *
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -64,6 +64,11 @@ mapiportre = re.compile(r'mapi:monetdb:/
geos_version = '@GEOS_VERSION@'.split('.')
+# free bats, used bats, total bats
+fbre = re.compile(r' (?P\d+) free bats')
+ubre = re.compile(r'^(?P\d+) (persistent|transient) bats')
+tbre = re.compile(r'^(?P\d+) bats total')
+
# default is no color (these three functions may get redefined)
def prred(str):
print(str, end='')
@@ -1468,9 +1473,7 @@ def PerformDir(env, testdir, testlist, t
nbats, maxid = crs.fetchall()[0]
crs.close()
dbh.close()
-if maxid > nbats and maxid - nbats > 1:
-pSrvr.outfile.write(f'Too many free bats. Max ID =
{maxid}, # used = {nbats}, diff = {maxid - nbats}.\n')
-pSrvr.sendusr1()
+pSrvr.sendusr1()
pSrvr.terminate()
pSrvr = None
if produce_html:
@@ -1480,10 +1483,31 @@ def PerformDir(env, testdir, testlist, t
o.write('{} standard
{}\n'.format(TSTDIR, 'output' if ext == 'out' else 'error'))
o.write('\n')
empty = True
+sigusr1 = False
+nfree = 0
+nused = 0
+ntotal = 0
for line in openutf8(os.path.join(TSTTRGDIR,
f'SingleServer.{ext}')):
if empty:
o.write('\n')
empty = False
+if 'SIGUSR1 info start' in line:
+sigusr1 = True
+line = '#' + line
+
MonetDB: Dec2023 - Pre-release version number update.
Changeset: 794b11fba39d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/794b11fba39d
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:
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.49.6
+current_version = 11.49.7
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
# Copyright 1997 - July 2008 CWI.
%global name MonetDB
-%global version 11.49.6
+%global version 11.49.7
%{!?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,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,7)
+ PRODUCTVERSION version(11,49,7)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,49,6)
+ VALUE "FileVersion", sversion(11,49,7)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,49,6)
+ VALUE "ProductVersion", sversion(11,49,7)
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,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,7)
+ PRODUCTVERSION version(11,49,7)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,49,6)
+ VALUE "FileVersion", sversion(11,49,7)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,49,6)
+ VALUE "ProductVersion", sversion(11,49,7)
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,49,6)
- PRODUCTVERSION version(11,49,6)
+ FILEVERSION version(11,49,7)
+ PRODUCTVERSION version(11,49,7)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,49,6)
+VALUE "FileVersion", sversion(11,49,7)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,49,6)
+VALUE "ProductVersion", sversion(11,49,7)
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
@@ -12,10 +12,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "49")
-set(MONETDB_VERSION_PATCH "6")
+set(MONETDB_VERSION_PATCH "7")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Dec2023-SP2")
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
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@
MonetDB: default - Merge with Dec2023 branch, not changing any f...
Changeset: 4756b4c1ab1c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4756b4c1ab1c 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, 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 - Updated library versions.
Changeset: 8aaf026ee524 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8aaf026ee524
Modified Files:
cmake/monetdb-versions.cmake
Branch: Dec2023
Log Message:
Updated library versions.
diffs (35 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -44,7 +44,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "28")
set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
@@ -56,13 +56,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_MAJOR "35")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "2")
+set(MONETDB5_VERSION_PATCH "3")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "5")
+set(MONETDBE_VERSION_PATCH "6")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
@@ -74,5 +74,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
# version of the SQL library (subdirectory sql)
set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "1")
-set(SQL_VERSION_PATCH "2")
+set(SQL_VERSION_PATCH "3")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Moved contents of ChangeLog.Dec2023 to MonetD...
Changeset: d656785f49ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d656785f49ee
Modified Files:
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Dec2023
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2023
sql/ChangeLog-Archive
sql/ChangeLog.Dec2023
Branch: Dec2023
Log Message:
Moved contents of ChangeLog.Dec2023 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (257 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -922,6 +922,31 @@ fi
%endif
%changelog
+* Tue Apr 09 2024 Sjoerd Mullender - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Tue Mar 12 2024 Sjoerd Mullender - 11.49.5-20240312
- Rebuilt.
- GH#7390: Some MonetDB Server crashes found
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+monetdb (11.49.7) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7469: Crash when using `CONTAINS`
+ * GH#7479: MonetDB server crashes in `exp_ref`
+ * GH#7490: commonTerms optimizer no longer works
+ * GH#7495: Crash when simultaneously querying and updating a string column.
+
+ -- Sjoerd Mullender Tue, 09 Apr 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * gdk: Threads have their own list of free bats. The list was not returned
+to the system when a thread exited, meaning that the free bats that
+were in the list would not be reused by any thread. This has been
+fixed.
+
+ -- Sjoerd Mullender Thu, 28 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+of the two has 128 bit integer support.
+
+ -- Sjoerd Mullender Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * sql: Fixed issue where equal column aliases were created. When those
+aliases were parsed on the remote side it could give crashes.
+
+ -- Sjoerd Mullender Tue, 19 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * gdk: Fixed a couple of deadlock situations, one actually observed, one
+never observed.
+
+ -- Sjoerd Mullender Mon, 18 Mar 2024 10:43:09 +0200
+
monetdb (11.49.5) 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,16 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Mar 28 2024 Sjoerd Mullender - 11.49.7-20240409
+- Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Mon Mar 18 2024 Sjoerd Mullender - 11.49.7-20240409
+- Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Fri Mar 8 2024 Sjoerd Mullender - 11.49.5-20240312
- The internal hash function for floating point types has been changed.
It is now no longer based on the bit representation, but on the value,
diff --git a/gdk/ChangeLog.Dec2023 b/gdk/ChangeLog.Dec2023
--- a/gdk/ChangeLog.Dec2023
+++ b/gdk/ChangeLog.Dec2023
@@ -1,13 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Thu Mar 28 2024 Sjoerd Mullender
MonetDB: Dec2023 - Setting tag Dec2023_7 for the release build.
Changeset: 7b666c266f85 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7b666c266f85 Modified Files: .hgtags Branch: Dec2023 Log Message: Setting tag Dec2023_7 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f 95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3 dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5 dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release +d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Merge with Dec2023 branch.
Changeset: 4603f1681efc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4603f1681efc
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f
95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release
+d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -921,6 +921,31 @@ fi
%endif
%changelog
+* Tue Apr 09 2024 Sjoerd Mullender - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Tue Mar 12 2024 Sjoerd Mullender - 11.49.5-20240312
- Rebuilt.
- GH#7390: Some MonetDB Server crashes found
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -44,7 +44,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "28")
set(GDK_VERSION_MINOR "1")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
@@ -56,13 +56,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_MAJOR "35")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "2")
+set(MONETDB5_VERSION_PATCH "3")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_MAJOR "26")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "5")
+set(MONETDBE_VERSION_PATCH "6")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
@@ -74,5 +74,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
# version of the SQL library (subdirectory sql)
set(SQL_VERSION_MAJOR "14")
set(SQL_VERSION_MINOR "1")
-set(SQL_VERSION_PATCH "2")
+set(SQL_VERSION_PATCH "3")
set(SQL_VERSION
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+monetdb (11.49.7) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7469: Crash when using `CONTAINS`
+ * GH#7479: MonetDB server crashes in `exp_ref`
+ * GH#7490: commonTerms optimizer no longer works
+ * GH#7495: Crash when simultaneously querying and updating a string column.
+
+ -- Sjoerd Mullender Tue, 09 Apr 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgency=low
+
+ * gdk: Threads have their own list of free bats. The list was not returned
+to the system when a thread exited, meaning that the free bats that
+were in the list would not be reused by any thread. This has been
+fixed.
+
+ -- Sjoerd Mullender Thu, 28 Mar 2024 10:43:09 +0200
+
+monetdb (11.49.7) unstable; urgenc
MonetDB: Dec2023 - Post release build.
Changeset: 7fda4d5841a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7fda4d5841a2
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:
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.49.7
+current_version = 11.49.8
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
# Copyright 1997 - July 2008 CWI.
%global name MonetDB
-%global version 11.49.7
+%global version 11.49.8
%{!?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,49,7)
- PRODUCTVERSION version(11,49,7)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,49,7)
+ VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,49,7)
+ VALUE "ProductVersion", sversion(11,49,8)
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,49,7)
- PRODUCTVERSION version(11,49,7)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,49,7)
+ VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,49,7)
+ VALUE "ProductVersion", sversion(11,49,8)
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,49,7)
- PRODUCTVERSION version(11,49,7)
+ FILEVERSION version(11,49,8)
+ PRODUCTVERSION version(11,49,8)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,49,7)
+VALUE "FileVersion", sversion(11,49,8)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,49,7)
+VALUE "ProductVersion", sversion(11,49,8)
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
@@ -12,10 +12,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "49")
-set(MONETDB_VERSION_PATCH "7")
+set(MONETDB_VERSION_PATCH "8")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Dec2023-SP2")
+ 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
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_E
MonetDB: default - Merge with Dec2023 branch, not changing any f...
Changeset: 2e7629191708 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2e7629191708 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, not changing any files.. ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a ChangeLog entry for DECIMAL AS
Changeset: bf540a202321 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/bf540a202321 Modified Files: sql/ChangeLog Branch: default Log Message: Add a ChangeLog entry for DECIMAL AS diffs (14 lines): diff --git a/sql/ChangeLog b/sql/ChangeLog --- a/sql/ChangeLog +++ b/sql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Tue Apr 8 2024 Joeri van Ruth +- Add a DECIMAL AS clause to COPY INTO that configures the decimal separator + and thousands separator for decimals, temporal types and floats. + * Thu Mar 21 2024 Yunus Koning - Introduce IS [NOT] DISTINCT FROM syntax. The syntax allows two values to be compared. The comparison always returns boolean FALSE or TRUE ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: sch_rename_more_permissive - Merge with default branch
Changeset: 931ffcbe54bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/931ffcbe54bf
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/include/sql_catalog.h
sql/server/rel_schema.c
sql/server/sql_mvc.c
sql/storage/bat/bat_table.c
sql/storage/objectset.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: sch_rename_more_permissive
Log Message:
Merge with default branch
diffs (truncated from 168767 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -823,3 +823,4 @@ 1230526af30f40eeea30fb87c47c3e414920561f
95d8feaa1167b5ba87bd99253c3f4e62ebf528a1 Dec2023_3
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_5
dcc8c702e685a4faf21ccf663028d1bc3d1165d1 Dec2023_SP1_release
+d656785f49ee62c19705722aa6b7c171904c64d5 Dec2023_7
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -91,7 +91,7 @@ Group: Applications/Databases
License: MPL-2.0
URL: https://www.monetdb.org/
BugURL: https://github.com/MonetDB/MonetDB/issues
-Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Dec2023-SP2/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -679,7 +679,6 @@ This package contains files needed to de
%files SQL-server5-devel
%defattr(-,root,root)
-%{_includedir}/monetdb/exception_buffer.h
%{_includedir}/monetdb/opt_backend.h
%{_includedir}/monetdb/rel_*.h
%{_includedir}/monetdb/sql*.h
@@ -922,6 +921,31 @@ fi
%endif
%changelog
+* Tue Apr 09 2024 Sjoerd Mullender - 11.49.7-20240409
+- Rebuilt.
+- GH#7469: Crash when using `CONTAINS`
+- GH#7479: MonetDB server crashes in `exp_ref`
+- GH#7490: commonTerms optimizer no longer works
+- GH#7495: Crash when simultaneously querying and updating a string column.
+
+* Thu Mar 28 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Threads have their own list of free bats. The list was not returned
+ to the system when a thread exited, meaning that the free bats that
+ were in the list would not be reused by any thread. This has been
+ fixed.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- monetdb5: Fixed interaction between mserver5 and remote mserver5 when only
one
+ of the two has 128 bit integer support.
+
+* Tue Mar 19 2024 Sjoerd Mullender - 11.49.7-20240409
+- sql: Fixed issue where equal column aliases were created. When those
+ aliases were parsed on the remote side it could give crashes.
+
+* Mon Mar 18 2024 Sjoerd Mullender - 11.49.7-20240409
+- gdk: Fixed a couple of deadlock situations, one actually observed, one
+ never observed.
+
* Tue Mar 12 2024 Sjoerd Mullender - 11.49.5-20240312
- Rebuilt.
- GH#7390: Some MonetDB Server crashes found
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -187,7 +187,7 @@ def main():
print(r'')
print(r' ')
id = comp(extend, id, 16,
- sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or
x.startswith('sql') or x.startswith('rel') or x.startswith('store') or
x.startswith('exception') or x.startswith('opt_backend')) and x.endswith('.h'),
os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] +
+ sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or
x.startswith('sql') or x.startswith('rel') or x.startswith('store') or
x.startswith('opt_backend')) and x.endswith('.h'),
os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] +
[r'include\monetdb\copybinary.h',
r'include\monetdb\mapi.h',
r'include\monetdb\mapi_querytype.h',
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -5,51302 +5,50917 @@ select * from sys.malfunctions() order b
aggr
Collect
-command aggr.Collect(X_0:bat[:wkb]):wkb
+command aggr.Collect(X_0:bat[:wkb]):wkb
wkbCollectAggr;
TODO
aggr
MakeLine
-command aggr.MakeLine(X_0:bat[:wkb]):wkb
+command aggr.MakeLine(X_0:bat[:wkb]):wkb
wkbMakeLineAggr;
Gets a BAT with point or linestring geometries and returns a single linestring
geometry
aggr
all
-command aggr.all(X_0:bat[:any_1]):any_1
+command aggr.all(X_0:bat
MonetDB: default - Add some more possible error messages.
Changeset: da2e83b1a44d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/da2e83b1a44d
Modified Files:
sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
Branch: default
Log Message:
Add some more possible error messages.
diffs (62 lines):
diff --git
a/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
b/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
--- a/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
+++ b/sql/test/BugTracker-2022/Tests/incomplete-sql-script.Bug-7298.SQL.py
@@ -10,50 +10,44 @@ with SQLTestCase() as tc:
tf.seek(0)
tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file in: "select foo"', '!syntax error in: "select foo"',
'!syntax error, unexpected $end in: "select foo"'])
-tf.seek(0)
-tf.truncate(0)
+with tempfile.TemporaryFile('w+') as tf:
s1 = "select E'foo"
tf.write(s1)
tf.flush()
tf.seek(0)
tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message='!Unexpected end of input')
-tf.seek(0)
-tf.truncate(0)
+with tempfile.TemporaryFile('w+') as tf:
s1 = "select foo."
tf.write(s1)
tf.flush()
tf.seek(0)
-tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file, expecting SCOLON or \':\' in: "select foo."', '!syntax
error in: "select foo."', '!syntax error, unexpected $end, expecting SCOLON or
\':\' in: "select foo."', '!syntax error, unexpected $end in: "select foo."'])
-tf.seek(0)
-tf.truncate(0)
+tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file, expecting SCOLON or \':\' in: "select foo."', '!syntax
error in: "select foo."', '!syntax error, unexpected $end, expecting SCOLON or
\':\' in: "select foo."', '!syntax error, unexpected $end in: "select foo."',
'!syntax error, unexpected end of file in: "select foo."'
+])
+with tempfile.TemporaryFile('w+') as tf:
s1 = "select foo-"
tf.write(s1)
tf.flush()
tf.seek(0)
-tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file, expecting SCOLON or \':\' in: "select foo-"', '!syntax
error in: "select foo-"', '!syntax error, unexpected $end, expecting SCOLON or
\':\' in: "select foo-"', '!syntax error, unexpected $end in: "select foo-"'])
-tf.seek(0)
-tf.truncate(0)
+tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file, expecting SCOLON or \':\' in: "select foo-"', '!syntax
error in: "select foo-"', '!syntax error, unexpected $end, expecting SCOLON or
\':\' in: "select foo-"', '!syntax error, unexpected $end in: "select foo-"',
'!syntax error, unexpected end of file in: "select foo-"'])
+with tempfile.TemporaryFile('w+') as tf:
s1 = "select f001234"
tf.write(s1)
tf.flush()
tf.seek(0)
tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message=['!syntax error,
unexpected end of file in: "select f001234"', '!syntax error in: "select
f001234"', '!syntax error, unexpected $end in: "select f001234"'])
-tf.seek(0)
-tf.truncate(0)
+with tempfile.TemporaryFile('w+') as tf:
s1 = "select \"foo"
tf.write(s1)
tf.flush()
tf.seek(0)
tc.execute(None, '-fraw', client='mclient',
stdin=tf).assertFailed(err_code="42000", err_message='!Unexpected end of input')
-tf.seek(0)
-tf.truncate(0)
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Combine BBPsync phase 1 and phase 2 into a si...
Changeset: eb913b2f70ed for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/eb913b2f70ed
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
Branch: default
Log Message:
Combine BBPsync phase 1 and phase 2 into a single phase.
Also introduce function bat_iterator_incref.
diffs (170 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1132,6 +1132,17 @@ bat_iterator_nolock(BAT *b)
return (BATiter) {0};
}
+static inline void
+bat_iterator_incref(BATiter *bi)
+{
+#ifndef NDEBUG
+ bi->locked = true;
+#endif
+ HEAPincref(bi->h);
+ if (bi->vh)
+ HEAPincref(bi->vh);
+}
+
static inline BATiter
bat_iterator(BAT *b)
{
@@ -1158,12 +1169,7 @@ bat_iterator(BAT *b)
MT_lock_set(&pvb->theaplock);
}
bi = bat_iterator_nolock(b);
-#ifndef NDEBUG
- bi.locked = true;
-#endif
- HEAPincref(bi.h);
- if (bi.vh)
- HEAPincref(bi.vh);
+ bat_iterator_incref(&bi);
if (pvb)
MT_lock_unset(&pvb->theaplock);
if (pb)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -822,12 +822,7 @@ COLcopy(BAT *b, int tt, bool writable, r
if (ATOMstorage(b->ttype) == TYPE_str && b->tvheap->free >=
GDK_STRHASHSIZE)
memcpy(strhash, b->tvheap->base, GDK_STRHASHSIZE);
-#ifndef NDEBUG
- bi.locked = true;
-#endif
- HEAPincref(bi.h);
- if (bi.vh)
- HEAPincref(bi.vh);
+ bat_iterator_incref(&bi);
MT_lock_unset(&b->theaplock);
/* first try case (1); create a view, possibly with different
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2464,7 +2464,8 @@ BBPdir_step(bat bid, BUN size, int n, ch
}
}
}
- if (BBP_status(bid) & BBPPERSISTENT) {
+ if (bi) {
+ assert(BBP_status(bid) & BBPPERSISTENT);
if (new_bbpentry(nbbpf, bid, size, bi) != GDK_SUCCEED)
goto bailout;
}
@@ -3871,12 +3872,7 @@ BBPbackup(BAT *b, bool subcommit)
bi.h = b->oldtail;
bi.hdirty = b->oldtail->dirty;
}
-#ifndef NDEBUG
- bi.locked = true;
-#endif
- HEAPincref(bi.h);
- if (bi.vh)
- HEAPincref(bi.vh);
+ bat_iterator_incref(&bi);
MT_lock_unset(&b->theaplock);
/* determine location dir and physical suffix */
@@ -4038,9 +4034,15 @@ BBPsync(int cnt, bat *restrict subcommit
ret = BBPprepare(subcommit != NULL);
- /* PHASE 1: safeguard everything in a backup-dir */
+ if (ret == GDK_SUCCEED) {
+ ret = BBPdir_first(subcommit != NULL, logno, &obbpf, &nbbpf);
+ }
+
for (int idx = 1; ret == GDK_SUCCEED && idx < cnt; idx++) {
bat i = subcommit ? subcommit[idx] : idx;
+ BUN size = sizes ? sizes[idx] : BUN_NONE;
+ BATiter bi, *bip;
+
const bat bid = i;
if (lock)
MT_lock_set(&GDKswapLock(bid));
@@ -4059,40 +4061,27 @@ BBPsync(int cnt, bat *restrict subcommit
MT_lock_set(&GDKswapLock(bid));
}
BAT *b = dirty_bat(&i, subcommit != NULL);
- if (i <= 0 ||
- (BBP_status(bid) & BBPEXISTING &&
-b != NULL &&
-b->batInserted > 0 &&
-BBPbackup(b, subcommit != NULL) != GDK_SUCCEED)) {
+ if (i <= 0)
ret = GDK_FAIL;
- }
+ else if (BBP_status(bid) & BBPEXISTING &&
+b != NULL &&
+b->batInserted > 0)
+ ret = BBPbackup(b, subcommit != NULL);
+
if (lock)
MT_lock_unset(&GDKswapLock(bid));
- }
- TRC_DEBUG(PERF, "move time "LLFMT" usec, %d files\n", (t1 = GDKusec())
- t0, backup_files);
-
- /* PHASE 2: save the repository and write new BBP.dir file */
- if (ret == GDK_SUCCEED) {
- ret = BBPdir_first(subcommit != NULL, logno, &obbpf, &nbbpf);
- }
-
- for (int idx = 1; ret == GDK_SUCCEED && idx < cnt; idx++) {
- bat i = subcommit ? subcommit[idx] : idx;
- BUN size = sizes ? sizes[idx] : BUN_NONE;
- BATiter bi;
+
+ if (ret != GDK_SUCCEED)
+ break;
if (BBP_status(i) & BBPPERSISTENT) {
- BAT *b = dirty_bat(&i, subcommit != NULL);
- if (i <= 0) {
- ret = GDK_FAIL;
- break;
- }
- bi = bat_iterator(BBP_desc(i));
+
MonetDB: sch_rename_more_permissive - Use the same pointer if co...
Changeset: 39db23df280a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/39db23df280a
Modified Files:
sql/storage/store_dependency.c
Branch: sch_rename_more_permissive
Log Message:
Use the same pointer if content is the same
diffs (24 lines):
diff --git a/sql/storage/store_dependency.c b/sql/storage/store_dependency.c
--- a/sql/storage/store_dependency.c
+++ b/sql/storage/store_dependency.c
@@ -138,6 +138,10 @@ sql_trans_get_dependents(sql_trans* tr,
bool first = true;
for (sql_base *b = oi_next(&oi); b; b = oi_next(&oi)) {
sqlid* local_id = MNEW(sqlid);
+ if (local_id == NULL) {
+ list_destroy(dep_list);
+ return NULL;
+ }
*local_id = b->id;
if (list_append(schema_tables, local_id) == NULL) {
list_destroy(dep_list);
@@ -153,7 +157,8 @@ sql_trans_get_dependents(sql_trans* tr,
}
rs = table_api.rids_select(tr, dep_id, &low_id,
- high_id == -1 ?
&low_id : &high_id,
+ high_id == -1 ?
&low_id :
+ low_id == high_id ?
&low_id : &high_id,
NULL);
if (rs == NULL) {
list_destroy(dep_list);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: sch_rename_more_permissive - Add test for not allowed s...
Changeset: d417c30afccf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d417c30afccf
Modified Files:
sql/test/rename/Tests/rename01.test
Branch: sch_rename_more_permissive
Log Message:
Add test for not allowed schema rename situation
diffs (27 lines):
diff --git a/sql/test/rename/Tests/rename01.test
b/sql/test/rename/Tests/rename01.test
--- a/sql/test/rename/Tests/rename01.test
+++ b/sql/test/rename/Tests/rename01.test
@@ -65,3 +65,23 @@ query TI rowsort
select "name", "system" from sys.schemas where "name" in ('changeme',
'changed', 'another')
+statement ok
+create schema foo
+
+statement ok
+create table foo.a as select * from generate_series(0,10)
+
+statement ok
+create schema bar
+
+statement ok
+create view av as select * from foo.a
+
+statement error 2BM37!ALTER SCHEMA: unable to rename schema 'foo', there are
database objects which depend on it
+alter schema foo rename to foofoo
+
+statement ok
+drop schema foo cascade
+
+statement ok
+drop schema bar cascade
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Dec2023 - Cleanup: remove some unused functions, turned...
Changeset: 5c000e77468b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5c000e77468b
Modified Files:
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_utils.c
Branch: Dec2023
Log Message:
Cleanup: remove some unused functions, turned some others into static.
diffs (200 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -893,9 +893,6 @@ mskGetVal(BAT *b, BUN p)
* @item int
* @tab
* HEAPcopy (Heap *dst,*src);
- * @item int
- * @tab
- * HEAPwarm (Heap *h);
* @end multitable
*
*
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -665,7 +665,7 @@ append_msk_bat(BAT *b, BATiter *ni, stru
/* Append the contents of BAT n (subject to the optional candidate
* list s) to BAT b. If b is empty, b will get the seqbase of s if it
* was passed in, and else the seqbase of n. */
-gdk_return
+static gdk_return
BATappend2(BAT *b, BAT *n, BAT *s, bool force, bool mayshare)
{
struct canditer ci;
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -1407,32 +1407,3 @@ HASHfree(BAT *b)
MT_rwlock_wrunlock(&b->thashlock);
}
}
-
-bool
-HASHgonebad(BAT *b, const void *v)
-{
- Hash *h = b->thash;
- BUN cnt, hit;
-
- if (h == NULL)
- return true;/* no hash is bad hash? */
-
- BATiter bi = bat_iterator(b);
- if (h->nbucket * 2 < BATcount(b)) {
- int (*cmp) (const void *, const void *) = ATOMcompare(bi.type);
- BUN i = HASHget(h, (BUN) HASHprobe(h, v));
- for (cnt = hit = 1; i != BUN_NONE; i = HASHgetlink(h, i), cnt++)
- hit += ((*cmp) (v, BUNtail(bi, (BUN) i)) == 0);
-
- if (cnt / hit > 4) {
- bat_iterator_end(&bi);
- return true;/* linked list too long */
- }
-
- /* in this case, linked lists are long but contain the
-* desired values such hash tables may be useful for
-* locating all duplicates */
- }
- bat_iterator_end(&bi);
- return false; /* a-ok */
-}
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -439,57 +439,6 @@ HEAPextend(Heap *h, size_t size, bool ma
return GDK_FAIL;
}
-gdk_return
-HEAPshrink(Heap *h, size_t size)
-{
- char *p = NULL;
-
- assert(size >= h->free);
- assert(size <= h->size);
- if (h->storage == STORE_MEM) {
- p = GDKrealloc(h->base, size);
- TRC_DEBUG(HEAP, "Shrinking malloced heap %s %zu %zu %p %p\n",
- h->filename, h->size, size, h->base, p);
- } else {
- char *path;
-
- assert(h->hasfile);
- /* shrink memory mapped file */
- /* round up to multiple of GDK_mmap_pagesize with
-* minimum of one */
- size = (size + GDK_mmap_pagesize - 1) & ~(GDK_mmap_pagesize -
1);
- if (size == 0)
- size = GDK_mmap_pagesize;
- if (size >= h->size) {
- /* don't grow */
- return GDK_SUCCEED;
- }
- if ((path = GDKfilepath(h->farmid, BATDIR, h->filename, NULL))
== NULL)
- return GDK_FAIL;
- p = GDKmremap(path,
- h->storage == STORE_PRIV ?
- MMAP_COPY | MMAP_READ | MMAP_WRITE :
- MMAP_READ | MMAP_WRITE,
- h->base, h->size, &size);
- GDKfree(path);
- TRC_DEBUG(HEAP, "Shrinking %s mmapped "
- "heap (%s) %zu %zu %p %p\n",
- h->storage == STORE_MMAP ? "shared" : "privately",
- h->filename, h->size, size, h->base, p);
- }
- if (p) {
- if (h->farmid == 1) {
- QryCtx *qc = MT_thread_get_qry_ctx();
- if (qc)
- ATOMIC_SUB(&qc->datasize, h->size - size);
- }
- h->size = size;
- h->base = p;
- return GDK_SUCCEED;
- }
- return GDK_FAIL;
-}
-
/* grow the string offset heap so that the value v fits (i.e. wide
* enough to fit the value), and it has space for at least cap elements;
* copy ncopy BUNs, or up to the heap size, whichever is smaller */
@@ -972,22 +921,6 @@ HEAPsave(Heap *h, const char *nme, const
return HEAPsave_intern(h, nme, ext, ".new", dosync, free, lock);
}
-int
-HEAPwarm(Heap *h)
-{
- int bogus_result = 0;
-
- if (h->storage != STORE_MEM) {
- /* touch the heap sequentially */
- int *cur = (int *) h->base;
-
