Changeset: e3f270a21cb2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3f270a21cb2
Branch: octbugs
Log Message:
merged with oct2020
diffs (truncated from 25429 to 300 lines):
diff --git a/Config.cmake.in b/Config.cmake.in
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -12,6 +12,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/monet
include("${CMAKE_CURRENT_LIST_DIR}/streamTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/mapiTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/matomicTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/mstringTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/gdkTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/monetdb5Targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/sqlTargets.cmake")
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -9443,9 +9443,9 @@ stdout of test 'MAL-signatures` in direc
[ "status", "vm_maxsize", "command status.vm_maxsize():lng ",
"SYSgetvm_maxsize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize(X_1:lng):void ",
"SYSsetvm_maxsize;", "" ]
[ "str", "+", "command str.+(X_1:str, X_2:str):str ", "STRConcat;",
"" ]
-[ "str", "STRepilogue", "command str.STRepilogue():void ",
"strEpilogue;", "" ]
[ "str", "ascii", "command str.ascii(X_1:str):int ",
"STRascii;", "" ]
[ "str", "endsWith", "command str.endsWith(X_1:str, X_2:str):bit ",
"STRSuffix;", "" ]
+[ "str", "epilogue", "command str.epilogue():void ", "STRepilogue;",
"" ]
[ "str", "insert", "command str.insert(X_1:str, X_2:int, X_3:int,
X_4:str):str ", "STRinsert;", "" ]
[ "str", "length", "command str.length(X_1:str):int ",
"STRLength;", "" ]
[ "str", "like", "command str.like(X_1:str, X_2:str):bit ",
"STRlikewrap2;", "" ]
@@ -9458,7 +9458,7 @@ stdout of test 'MAL-signatures` in direc
[ "str", "ltrim", "command str.ltrim(X_1:str):str ",
"STRLtrim;", "" ]
[ "str", "nbytes", "command str.nbytes(X_1:str):int ",
"STRBytes;", "" ]
[ "str", "prefix", "command str.prefix(X_1:str, X_2:int):str ",
"STRprefix;", "" ]
-[ "str", "prelude", "command str.prelude():void ", "strPrelude;",
"" ]
+[ "str", "prelude", "command str.prelude():void ", "STRprelude;",
"" ]
[ "str", "r_search", "command str.r_search(X_1:str, X_2:str):int ",
"STRReverseStrSearch;", "" ]
[ "str", "repeat", "command str.repeat(X_1:str, X_2:int):str ",
"STRrepeat;", "" ]
[ "str", "replace", "command str.replace(X_1:str, X_2:str, X_3:str,
X_4:str):str ", "PCREreplace_wrap;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -12807,9 +12807,9 @@ stdout of test 'MAL-signatures` in direc
[ "status", "vm_maxsize", "command status.vm_maxsize():lng ",
"SYSgetvm_maxsize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize(X_1:lng):void ",
"SYSsetvm_maxsize;", "" ]
[ "str", "+", "command str.+(X_1:str, X_2:str):str ", "STRConcat;",
"" ]
-[ "str", "STRepilogue", "command str.STRepilogue():void ",
"strEpilogue;", "" ]
[ "str", "ascii", "command str.ascii(X_1:str):int ",
"STRascii;", "" ]
[ "str", "endsWith", "command str.endsWith(X_1:str, X_2:str):bit ",
"STRSuffix;", "" ]
+[ "str", "epilogue", "command str.epilogue():void ", "STRepilogue;",
"" ]
[ "str", "insert", "command str.insert(X_1:str, X_2:int, X_3:int,
X_4:str):str ", "STRinsert;", "" ]
[ "str", "length", "command str.length(X_1:str):int ",
"STRLength;", "" ]
[ "str", "like", "command str.like(X_1:str, X_2:str):bit ",
"STRlikewrap2;", "" ]
@@ -12822,7 +12822,7 @@ stdout of test 'MAL-signatures` in direc
[ "str", "ltrim", "command str.ltrim(X_1:str):str ",
"STRLtrim;", "" ]
[ "str", "nbytes", "command str.nbytes(X_1:str):int ",
"STRBytes;", "" ]
[ "str", "prefix", "command str.prefix(X_1:str, X_2:int):str ",
"STRprefix;", "" ]
-[ "str", "prelude", "command str.prelude():void ", "strPrelude;",
"" ]
+[ "str", "prelude", "command str.prelude():void ", "STRprelude;",
"" ]
[ "str", "r_search", "command str.r_search(X_1:str, X_2:str):int ",
"STRReverseStrSearch;", "" ]
[ "str", "repeat", "command str.repeat(X_1:str, X_2:int):str ",
"STRrepeat;", "" ]
[ "str", "replace", "command str.replace(X_1:str, X_2:str, X_3:str,
X_4:str):str ", "PCREreplace_wrap;", "" ]
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
@@ -120,7 +120,8 @@ target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
mutils
- mapi)
+ mapi
+ ODBC::ODBC)
install(TARGETS
MonetODBC
diff --git a/cmake/Modules/FindUUID.cmake b/cmake/Modules/FindUUID.cmake
--- a/cmake/Modules/FindUUID.cmake
+++ b/cmake/Modules/FindUUID.cmake
@@ -19,6 +19,8 @@ if(NOT UUID_LIBRARIES)
set(UUID_LIBRARIES "" CACHE INTERNAL "uuid libraries path")
endif()
# Find uuid_generate symbol, which we require and some platforms don't have it
+set(CMAKE_REQUIRED_LIBRARIES ${UUID_LIBRARIES})
+set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIR})
check_symbol_exists("uuid_generate" "uuid/uuid.h" HAVE_UUID_GENERATE)
cmake_pop_check_state()
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -43,7 +43,6 @@ function(monetdb_configure_defines)
check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
check_include_file("sys/un.h" HAVE_SYS_UN_H)
- check_include_file("sys/utime.h" HAVE_SYS_UTIME_H)
check_include_file("sys/wait.h" HAVE_SYS_WAIT_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("uuid/uuid.h" HAVE_UUID_UUID_H)
@@ -116,8 +115,11 @@ function(monetdb_configure_defines)
check_function_exists("uname" HAVE_UNAME)
# Some libc versions on Linux distributions don't have it
check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h"
HAVE_SEMTIMEDOP)
- check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
- check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_LINK_OPTIONS "-lpthread")
+ check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
+ check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK)
+ cmake_pop_check_state()
check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
endfunction()
diff --git a/ctest/cmake/detect-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -41,7 +41,7 @@ elseif(${LINUX_DISTRO} STREQUAL "fedora"
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
endif()
diff --git a/ctest/cmake/detect-iconv.cmake b/ctest/cmake/detect-iconv.cmake
--- a/ctest/cmake/detect-iconv.cmake
+++ b/ctest/cmake/detect-iconv.cmake
@@ -20,18 +20,12 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename Iconv_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect TRUE
legacyvariable HAVE_ICONV
variablename Iconv_FOUND)
endif()
- if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
if(${LINUX_DISTRO_VERSION} STREQUAL "30")
assert_package_detected(
diff --git a/ctest/cmake/detect-libz.cmake b/ctest/cmake/detect-libz.cmake
--- a/ctest/cmake/detect-libz.cmake
+++ b/ctest/cmake/detect-libz.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_LIBZ
variablename ZLIB_FOUND)
endif()
diff --git a/ctest/cmake/detect-openssl.cmake b/ctest/cmake/detect-openssl.cmake
--- a/ctest/cmake/detect-openssl.cmake
+++ b/ctest/cmake/detect-openssl.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_OPENSSL
variablename OPENSSL_FOUND)
endif()
diff --git a/ctest/cmake/detect-pcre.cmake b/ctest/cmake/detect-pcre.cmake
--- a/ctest/cmake/detect-pcre.cmake
+++ b/ctest/cmake/detect-pcre.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_LIBPCRE
variablename PCRE_FOUND)
endif()
diff --git a/ctest/cmake/detect-pthreadkill.cmake
b/ctest/cmake/detect-pthreadkill.cmake
--- a/ctest/cmake/detect-pthreadkill.cmake
+++ b/ctest/cmake/detect-pthreadkill.cmake
@@ -25,17 +25,9 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
set(UNDETECT "1")
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "1")
- set(UNDETECT "0")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "1")
- set(UNDETECT "0")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- set(DETECT "1")
- set(UNDETECT "0")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
+ set(DETECT "0")
+ set(UNDETECT "1")
endif()
else()
message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
diff --git a/ctest/cmake/detect-pthreadsig.cmake
b/ctest/cmake/detect-pthreadsig.cmake
--- a/ctest/cmake/detect-pthreadsig.cmake
+++ b/ctest/cmake/detect-pthreadsig.cmake
@@ -25,17 +25,9 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
set(UNDETECT "1")
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "1")
- set(UNDETECT "0")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "1")
- set(UNDETECT "0")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- set(DETECT "1")
- set(UNDETECT "0")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
+ set(DETECT "0")
+ set(UNDETECT "1")
endif()
else()
message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
diff --git a/ctest/cmake/detect-snappy.cmake b/ctest/cmake/detect-snappy.cmake
--- a/ctest/cmake/detect-snappy.cmake
+++ b/ctest/cmake/detect-snappy.cmake
@@ -45,7 +45,7 @@ elseif(${LINUX_DISTRO} STREQUAL "fedora"
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SNAPPY
variablename SNAPPY_FOUND)
endif()
diff --git a/ctest/cmake/detect-uuid.cmake b/ctest/cmake/detect-uuid.cmake
--- a/ctest/cmake/detect-uuid.cmake
+++ b/ctest/cmake/detect-uuid.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_UUID
variablename HAVE_UUID_GENERATE)
endif()
diff --git a/ctest/cmake/detect-xml.cmake b/ctest/cmake/detect-xml.cmake
--- a/ctest/cmake/detect-xml.cmake
+++ b/ctest/cmake/detect-xml.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_LIBXML
variablename LibXml2_FOUND)
endif()
diff --git a/ctest/tools/monetdbe/example1.c b/ctest/tools/monetdbe/example1.c
--- a/ctest/tools/monetdbe/example1.c
+++ b/ctest/tools/monetdbe/example1.c
@@ -48,7 +48,7 @@ main(void)
}
case monetdbe_str: {
monetdbe_column_str * col =
(monetdbe_column_str *) rcol;
- if (col->is_null(col->data[r])) {
+ if (col->is_null(col->data+r)) {
printf("NULL");
} else {
printf("%s", (char*)
col->data[r]);
diff --git a/ctest/tools/monetdbe/example2.c b/ctest/tools/monetdbe/example2.c
--- a/ctest/tools/monetdbe/example2.c
+++ b/ctest/tools/monetdbe/example2.c
@@ -120,7 +120,7 @@ main(void)
}
case monetdbe_str: {
monetdbe_column_str * col =
(monetdbe_column_str *) rcol;
- if (col->is_null(col->data[r])) {
+ if (col->is_null(col->data+r)) {
printf("NULL");
} else {
printf("%s", (char*)
col->data[r]);
diff --git a/ctest/tools/monetdbe/example_append.c
b/ctest/tools/monetdbe/example_append.c
--- a/ctest/tools/monetdbe/example_append.c
+++ b/ctest/tools/monetdbe/example_append.c
@@ -56,7 +56,7 @@ main(void)
}
case monetdbe_str: {
monetdbe_column_str * col =
(monetdbe_column_str *) rcol[c];
- if (col->is_null(col->data[r])) {
+ if (col->is_null(col->data+r)) {
printf("NULL");
} else {
printf("%s", (char*)
col->data[r]);
@@ -141,7 +141,7 @@ main(void)
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
