Changeset: 11377d55b8b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/11377d55b8b4
Modified Files:
gdk/gdk.h
Branch: strheapvacuum
Log Message:
merged
diffs (truncated from 4799 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -811,3 +811,8 @@ 404cb13ad1bc3469bfaf5b7696a4d2cfe5ce71f4
9ab0adea978c184d895ca445792a79f26cb9d075 Jul2021_5
404cb13ad1bc3469bfaf5b7696a4d2cfe5ce71f4 Jul2021_release
9ab0adea978c184d895ca445792a79f26cb9d075 Jul2021_release
+ceade625915329a9697b5009470ce0251a5e2244 Jul2021_7
+ceade625915329a9697b5009470ce0251a5e2244 Jul2021_SP1_release
+4b353b1f914e3c9c7493117284f9cc06677e4c71 Jul2021_9
+ceade625915329a9697b5009470ce0251a5e2244 Jul2021_SP1_release
+4b353b1f914e3c9c7493117284f9cc06677e4c71 Jul2021_SP1_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,10 +92,14 @@ monetdb_configure_misc()
# Some custom target will need these setting.
include(monetdb-custom-targets)
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-SET(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_FULL_LIBDIR};${CMAKE_INSTALL_FULL_LIBDIR}/monetdb5")
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+#else()
+# SET(CMAKE_SKIP_RPATH TRUE)
+endif()
# required for some instalation files
set(PROGRAM_PERMISSIONS_DEFAULT
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -84,7 +84,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2021/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2021-SP1/%{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
@@ -843,6 +843,64 @@ else
fi
%changelog
+* Tue Sep 28 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.9-20210928
+- Rebuilt.
+
+* Mon Sep 27 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.7-20210927
+- Rebuilt.
+- GH#7140: SQL Query Plan Non Optimal with View
+- GH#7162: Extend sys.var_values table
+- GH#7165: `JOINIDX: missing '.'` when running distributed join query on
+ merged remote tables
+- GH#7172: Unexpected query result with merge tables
+- GH#7173: If truncate is in transaction then after restart of MonetDB the
+ table is empty
+- GH#7178: Remote Table Throws Error - createExceptionInternal: !ERROR:
+ SQLException:RAstatement2:42000!The number of projections don't match
+ between the generated plan and the expected one: 1 != 1200
+
+* Wed Sep 22 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.7-20210927
+- gdk: Some deadlock and race condition issues were fixed.
+- gdk: Handling of the list of free bats has been improved, leading to less
+ thread contention.
+- gdk: A problem was fixed where the server wouldn't start with a message from
+ BBPcheckbats about files being too small. The issue was not that the
+ file was too small, but that BBPcheckbats was looking at the wrong file.
+- gdk: An issue was fixed where a "short read" error was produced when memory
+ was getting tight.
+
+* Wed Sep 22 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.7-20210927
+- sql: If the server has been idle for a while with no active clients, the
+ write-ahead log is now rotated.
+- sql: A problem was fixed where files belonging to bats that had been deleted
+ internally were not cleaned up, leading to a growing database (dbfarm)
+ directory.
+- sql: A leak was fixed where extra bats were created but never cleaned up,
+ each taking up several kilobytes of memory.
+
+* Tue Aug 17 2021 Ying Zhang <y.zh...@cwi.nl> - 11.41.7-20210927
+- sql: [This feature was already released in Jul2021 (11.41.5), but the
ChangeLog was missing]
+ Grant indirect privileges. With "GRANT SELECT ON <my_view> TO
+ <another_user>" and "GRANT EXECUTE ON FUNCTION <my_func> TO
+ <another_user>", one can grant access to "my_view" and "my_func"
+ to another user who does not have access to the underlying database
+ objects (e.g. tables, views) used in "my_view" and "my_func". The
+ grantee will only be able to access data revealed by "my_view" or
+ conduct operations provided by "my_func".
+
+* Mon Aug 16 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.7-20210927
+- sql: Improved error reporting in COPY INTO by giving the line number
+ (starting with one) for the row in which an error was found. In
+ particular, the sys.rejects() table now lists the line number of the
+ CSV file on which the record started in which an error was found.
+
+* Wed Aug 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.7-20210927
+- gdk: When appending to a string bat, we made an optimization where the string
+ heap was sometimes copied completely to avoid having to insert strings
+ individually. This copying was still done too eagerly, so now the
+ string heap is copied less frequently. In particular, when appending
+ to an empty bat, the string heap is now not always copied whole.
+
* Tue Aug 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
- Rebuilt.
- GH#7161: fix priority
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -9,40 +9,50 @@
function(monetdb_hg_revision)
# Get the current version control revision
if(EXISTS "${CMAKE_SOURCE_DIR}/.hg_archival.txt")
- execute_process(COMMAND "sed" "-n" "s/^node:
\\([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]\\).*/\\1/p"
".hg_archival.txt" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE
HG_RETURN_CODE
- OUTPUT_VARIABLE HG_OUPUT_RES OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(HG_RETURN_CODE EQUAL 0 AND HG_OUPUT_RES)
- set(MERCURIAL_ID "${HG_OUPUT_RES}" PARENT_SCOPE)
+ file(READ "${CMAKE_SOURCE_DIR}/.hg_archival.txt" HG_ARCHIVAL)
+ if(HG_ARCHIVAL MATCHES ".*node:.*")
+ string(REGEX REPLACE ".*node:
([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]).*"
"\\1" HG_NODE "${HG_ARCHIVAL}")
+ if(HG_ARCHIVAL MATCHES ".*local:.*")
+ string(REGEX REPLACE ".*local: ([0-9][0-9]*).*" "\\1" HG_LOCAL
"${HG_ARCHIVAL}")
+ set(MERCURIAL_ID "${HG_NODE} ${HG_LOCAL}" PARENT_SCOPE)
+ else()
+ set(MERCURIAL_ID "${HG_NODE}" PARENT_SCOPE)
+ endif()
else()
- message(FATAL_ERROR "Failed to find mercurial ID")
+ message(WARNING "Failed to find mercurial ID")
+ set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
endif()
elseif(EXISTS "${CMAKE_SOURCE_DIR}/.hg")
find_package(Hg)
if(HG_FOUND)
message("hg found: ${HG_EXECUTABLE}")
else()
- message(FATAL_ERROR "Failed to find mercurial")
+ message(WARNING "Failed to find mercurial")
+ set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
endif()
execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-i" WORKING_DIRECTORY
"${CMAKE_SOURCE_DIR}" RESULT_VARIABLE HG_RETURN_CODE
OUTPUT_VARIABLE HG_OUPUT_RES OUTPUT_STRIP_TRAILING_WHITESPACE)
if(HG_RETURN_CODE EQUAL 0 AND HG_OUPUT_RES)
set(MERCURIAL_ID "${HG_OUPUT_RES}" PARENT_SCOPE)
else()
- message(FATAL_ERROR "Failed to find mercurial ID")
+ message(WARNING "Failed to find mercurial ID")
+ set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
endif()
elseif(EXISTS "${CMAKE_SOURCE_DIR}/.git")
find_package(Git)
if(GIT_FOUND)
message("git found: ${GIT_EXECUTABLE}")
else()
- message(FATAL_ERROR "Failed to find git")
+ message(WARNING "Failed to find git")
+ set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
endif()
execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short" "HEAD"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE GIT_RETURN_CODE OUTPUT_VARIABLE GIT_OUPUT_RES
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(GIT_RETURN_CODE EQUAL 0 AND GIT_OUPUT_RES)
set(MERCURIAL_ID "${GIT_OUPUT_RES}" PARENT_SCOPE)
else()
- message(FATAL_ERROR "Failed to find git ID")
+ message(WARNING "Failed to find git ID")
+ set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
endif()
else()
set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake
--- a/cmake/monetdb-toolchain.cmake
+++ b/cmake/monetdb-toolchain.cmake
@@ -20,7 +20,11 @@ function(monetdb_default_compiler_option
add_compile_options("-fsanitize=address")
add_compile_options("-fno-omit-frame-pointer")
add_compile_definitions(SANITIZER)
- add_link_options("-fsanitize=address")
+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
+ add_link_options("-fsanitize=address")
+ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address" PARENT_SCOPE)
+ endif()
else()
message(FATAL_ERROR "Sanitizer only supported with GCC")
endif()
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -53,34 +53,34 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_CURRENT "23")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "2")
+set(GDK_VERSION_PATCH "3")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
set(MAPI_VERSION_CURRENT "13")
set(MAPI_VERSION_MINOR "0")
-set(MAPI_VERSION_PATCH "0")
+set(MAPI_VERSION_PATCH "1")
math(EXPR MAPI_VERSION_MAJOR "${MAPI_VERSION_CURRENT} - ${MAPI_VERSION_MINOR}")
set(MAPI_VERSION
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "31")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "2")
+set(MONETDB5_VERSION_PATCH "3")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_MINOR}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
# version of the MONETDBE library (subdirectory tools/monetdbe)
set(MONETDBE_VERSION_CURRENT "2")
set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "0")
+set(MONETDBE_VERSION_PATCH "1")
math(EXPR MONETDBE_VERSION_MAJOR "${MONETDBE_VERSION_CURRENT} -
${MONETDBE_VERSION_MINOR}")
set(MONETDBE_VERSION
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "15")
set(STREAM_VERSION_MINOR "0")
-set(STREAM_VERSION_PATCH "0")
+set(STREAM_VERSION_PATCH "1")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_MINOR}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,82 @@
+monetdb (11.41.9) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 28 Sep 2021 09:29:10 +0200
+
+monetdb (11.41.7) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7140: SQL Query Plan Non Optimal with View
+ * GH#7162: Extend sys.var_values table
+ * GH#7165: `JOINIDX: missing '.'` when running distributed join query on
+ merged remote tables
+ * GH#7172: Unexpected query result with merge tables
+ * GH#7173: If truncate is in transaction then after restart of MonetDB the
+ table is empty
+ * GH#7178: Remote Table Throws Error - createExceptionInternal: !ERROR:
+ SQLException:RAstatement2:42000!The number of projections don't match
+ between the generated plan and the expected one: 1 != 1200
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 27 Sep 2021 11:24:40 +0200
+
+monetdb (11.41.7) unstable; urgency=low
+
+ * gdk: Some deadlock and race condition issues were fixed.
+ * gdk: Handling of the list of free bats has been improved, leading to less
+ thread contention.
+ * gdk: A problem was fixed where the server wouldn't start with a message
from
+ BBPcheckbats about files being too small. The issue was not that the
+ file was too small, but that BBPcheckbats was looking at the wrong file.
+ * gdk: An issue was fixed where a "short read" error was produced when memory
+ was getting tight.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Wed, 22 Sep 2021 11:24:40 +0200
+
+monetdb (11.41.7) unstable; urgency=low
+
+ * sql: If the server has been idle for a while with no active clients, the
+ write-ahead log is now rotated.
+ * sql: A problem was fixed where files belonging to bats that had been
deleted
+ internally were not cleaned up, leading to a growing database (dbfarm)
+ directory.
+ * sql: A leak was fixed where extra bats were created but never cleaned up,
+ each taking up several kilobytes of memory.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Wed, 22 Sep 2021 11:24:40 +0200
+
+monetdb (11.41.7) unstable; urgency=low
+
+ * sql: [This feature was already released in Jul2021 (11.41.5), but the
ChangeLog was missing]
+ Grant indirect privileges. With "GRANT SELECT ON <my_view> TO
+ <another_user>" and "GRANT EXECUTE ON FUNCTION <my_func> TO
+ <another_user>", one can grant access to "my_view" and "my_func"
+ to another user who does not have access to the underlying database
+ objects (e.g. tables, views) used in "my_view" and "my_func". The
+ grantee will only be able to access data revealed by "my_view" or
+ conduct operations provided by "my_func".
+
+ -- Ying Zhang <y.zh...@cwi.nl> Tue, 17 Aug 2021 11:24:40 +0200
+
+monetdb (11.41.7) unstable; urgency=low
+
+ * sql: Improved error reporting in COPY INTO by giving the line number
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
