Changeset: 6bbafa688596 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6bbafa688596
Modified Files:
.bumpversion.cfg
MonetDB.spec
buildtools/conf/CMakeLists.txt
clients/Tests/exports.stable.out
clients/examples/C/CMakeLists.txt
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
debian/control
gdk/gdk_align.c
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_private.h
gdk/libbat.rc
monetdb5/extras/rapi/rapi.c
monetdb5/tools/CMakeLists.txt
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/storage/bat/bat_logger.c
sql/storage/store.c
testing/CMakeLists.txt
testing/Mconvert.py.in
testing/Mtest.py.in
testing/Mz.py.in
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/CMakeLists.txt
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (truncated from 619 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -765,3 +765,4 @@ 025239a5a6f122042798c0f1132a2c6298514e06
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,6 +183,3 @@ add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
-
-
-# vim: set ts=2:sw=2:et
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -23,5 +23,3 @@ if(DEVELOPMENT AND NOT WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT buildtools)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -107,5 +107,3 @@ if(TESTING)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/perl/CMakeLists.txt
b/clients/examples/perl/CMakeLists.txt
--- a/clients/examples/perl/CMakeLists.txt
+++ b/clients/examples/perl/CMakeLists.txt
@@ -8,7 +8,7 @@
if(TESTING)
install(FILES
- sqlsample.pl
+ sqlsample.pl
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
@@ -19,5 +19,3 @@ if(TESTING)
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/php/CMakeLists.txt
b/clients/examples/php/CMakeLists.txt
--- a/clients/examples/php/CMakeLists.txt
+++ b/clients/examples/php/CMakeLists.txt
@@ -8,10 +8,8 @@
if(TESTING)
install(FILES
- sqlsample.php
+ sqlsample.php
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -102,5 +102,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -87,5 +87,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -151,5 +151,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -56,5 +56,3 @@ if(TESTING)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -52,5 +52,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -82,5 +82,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -337,5 +337,3 @@ macro(monetdb_configure_misc)
set(inline "__inline")
endif()
endmacro()
-
-# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -126,5 +126,3 @@ find_package(Reprepro)
find_package(Semodule)
find_package(Awk)
find_package(Candle)
-
-# vim: set ts=2:sw=2:et
diff --git a/common/utils/muuid.h b/common/utils/muuid.h
--- a/common/utils/muuid.h
+++ b/common/utils/muuid.h
@@ -24,5 +24,3 @@ extern
char *generateUUID(void);
#endif
-
-/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -277,7 +277,7 @@ BATmaterialize(BAT *b, BUN cap)
* The @#VIEWunlink@ routine cuts a reference to the parent. Part of the view
* destroy sequence.
*/
-static void
+void
VIEWunlink(BAT *b)
{
if (b) {
@@ -290,8 +290,6 @@ VIEWunlink(BAT *b)
if (tp)
tpb = BBP_cache(tp);
- if (tp && !vtp)
- vtp = tp;
if (vtp)
vtpb = BBP_cache(vtp);
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3272,9 +3272,11 @@ BBPdestroy(BAT *b)
bat tp = VIEWtparent(b);
bat vtp = VIEWvtparent(b);
- if (isVIEW(b)) { /* a physical view */
- VIEWdestroy(b);
- } else {
+ HASHdestroy(b);
+ IMPSdestroy(b);
+ OIDXdestroy(b);
+ PROPdestroy(b);
+ if (tp == 0) {
/* bats that get destroyed must unfix their atoms */
gdk_return (*tunfix) (const void *) =
BATatoms[b->ttype].atomUnfix;
assert(b->batSharecnt == 0);
@@ -3287,8 +3289,16 @@ BBPdestroy(BAT *b)
(void) (*tunfix)(BUNtail(bi, p));
}
}
- BATdelete(b); /* handles persistent case also (file deletes)
*/
}
+ if (tp || vtp)
+ VIEWunlink(b);
+ if (b->theap) {
+ HEAPfree(b->theap, true);
+ }
+ if (b->tvheap)
+ HEAPfree(b->tvheap, true);
+ b->batCopiedtodisk = false;
+
BBPclear(b->batCacheid, true); /* if destroyed; de-register from BBP */
/* parent released when completely done with child */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -277,6 +277,8 @@ gdk_return unshare_varsized_heap(BAT *b)
__attribute__((__visibility__("hidden")));
void VIEWdestroy(BAT *b)
__attribute__((__visibility__("hidden")));
+void VIEWunlink(BAT *b)
+ __attribute__((__visibility__("hidden")));
BAT *virtualize(BAT *bn)
__attribute__((__visibility__("hidden")));
@@ -412,7 +414,7 @@ ilog2(BUN x)
b ?
b->ttype==TYPE_str?b->twidth==1?"1":b->twidth==2?"2":b->twidth==4?"4":"8":"" :
"", \
b ? "]" : "", \
b ? !b->batTransient ? "P" : b->theap && b->theap->parentid !=
b->batCacheid ? "V" : b->tvheap && b->tvheap->parentid != b->batCacheid ? "v" :
"T" : "", \
- b ? BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :
ATOMstorage(b->ttype) == TYPE_str && GDK_ELIMDOUBLES(b->tvheap) ? "E" : "" :
"", \
+ b ? BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :
ATOMstorage(b->ttype) == TYPE_str && b->tvheap && GDK_ELIMDOUBLES(b->tvheap) ?
"E" : "" : "", \
b ? b->tsorted ? "S" : b->tnosorted ? "!s" : "" : "", \
b ? b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "" : "", \
b ? b->tkey ? "K" : b->tnokey[1] ? "!k" : "" : "", \
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -79,5 +79,3 @@ if(GEOS_FOUND)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/geom/sql/CMakeLists.txt b/geom/sql/CMakeLists.txt
--- a/geom/sql/CMakeLists.txt
+++ b/geom/sql/CMakeLists.txt
@@ -12,4 +12,3 @@
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5/createdb
# COMPONENT server)
#endif()
-# vim: set ts=2:sw=2:et
diff --git a/monetdb5/NT/CMakeLists.txt b/monetdb5/NT/CMakeLists.txt
--- a/monetdb5/NT/CMakeLists.txt
+++ b/monetdb5/NT/CMakeLists.txt
@@ -12,5 +12,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -473,10 +473,12 @@ static char *RAPIinitialize(void) {
if ((e = RAPIinstalladdons()) != 0) {
return e;
}
+#if R_VERSION < R_Version(4,2,0)
// patch R internals to disallow quit and system. Setting them to NULL
produces an error.
SET_INTERNAL(install("quit"), R_NilValue);
// install.packages() uses system2 to call gcc etc., so we cannot
disable it (perhaps store the pointer somewhere just for that?)
//SET_INTERNAL(install("system"), R_NilValue);
+#endif
rapiInitialized = true;
return NULL;
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -75,5 +75,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/sql/NT/CMakeLists.txt b/sql/NT/CMakeLists.txt
--- a/sql/NT/CMakeLists.txt
+++ b/sql/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/sql/backends/monet5/UDF/capi/CMakeLists.txt
b/sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
