Changeset: 11fd8da893db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11fd8da893db
Modified Files:
gdk/gdk_heap.c
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
merged with Oct2020
diffs (truncated from 308 to 300 lines):
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/documentation/source/build.rst b/documentation/source/build.rst
--- a/documentation/source/build.rst
+++ b/documentation/source/build.rst
@@ -128,7 +128,7 @@ To compile MonetDB (as normal user)::
cd build
cmake -G "Visual Studio 15 2017"
-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake
-DCMAKE_INSTALL_PREFIX=%HOME%\install -A x64 ..
cmake --build . --target ALL_BUILD --config Release
- cmake --build . --target INSTALL
+ cmake --build . --target INSTALL --config Release
set
PATH=%HOME%\install\bin;%HOME%\install\lib;%HOME%\install\lib\monetdb5;\vcpkg\installed\x64-windows\bin;\vcpkg\installed\x64-windows\debug\bin;%PATH%
cmake --build . --target RUN_TESTS
cmake --build . --target mtest
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -94,7 +94,6 @@
#cmakedefine HAVE_SYS_TIMES_H 1
#cmakedefine HAVE_SYS_UIO_H 1
#cmakedefine HAVE_SYS_UN_H 1
-#cmakedefine HAVE_SYS_UTIME_H 1
#cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine HAVE_TERMIOS_H 1
#cmakedefine HAVE_UNISTD_H 1
diff --git a/sql/backends/monet5/UDF/pyapi3/undef.h
b/sql/backends/monet5/UDF/pyapi3/undef.h
--- a/sql/backends/monet5/UDF/pyapi3/undef.h
+++ b/sql/backends/monet5/UDF/pyapi3/undef.h
@@ -17,7 +17,6 @@
#ifdef WIN32
#undef HAVE_IO_H
-#undef HAVE_SYS_UTIME_H
#undef PREFIX
#undef EXEC_PREFIX
#undef SIZEOF_VOID_P
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -79,10 +79,6 @@ embedded_type(int t) {
}
}
-typedef struct monetdbe_table_t {
- sql_table t;
-} monetdbe_table_t;
-
typedef struct {
Client c;
char *msg;
@@ -925,46 +921,6 @@ monetdbe_cleanup_result(monetdbe_databas
}
char*
-monetdbe_get_table(monetdbe_database dbhdl, monetdbe_table** table, const
char* schema_name, const char* table_name)
-{
- monetdbe_database_internal *mdbe = (monetdbe_database_internal*)dbhdl;
- mvc *m;
- sql_schema *s;
-
-
- if ((mdbe->msg = validate_database_handle(mdbe,
"monetdbe.monetdbe_get_table")) != MAL_SUCCEED) {
-
- return mdbe->msg;
- }
-
- if ((mdbe->msg = getSQLContext(mdbe->c, NULL, &m, NULL)) != NULL)
- goto cleanup;
- if ((mdbe->msg = SQLtrans(m)) != MAL_SUCCEED)
- goto cleanup;
- if (!table) {
- mdbe->msg = createException(MAL, "monetdbe.monetdbe_get_table",
"Parameter table is NULL");
- goto cleanup;
- }
- if (schema_name) {
- if (!(s = mvc_bind_schema(m, schema_name))) {
- mdbe->msg = createException(MAL,
"monetdbe.monetdbe_get_table", "Could not find schema %s", schema_name);
- goto cleanup;
- }
- } else {
- s = cur_schema(m);
- }
- if (!(*(sql_table**)table = mvc_bind_table(m, s, table_name))) {
- mdbe->msg = createException(MAL, "monetdbe.monetdbe_get_table",
"Could not find table %s", table_name);
- goto cleanup;
- }
-
-cleanup:
- mdbe->msg = commit_action(m, mdbe, NULL, NULL);
-
- return mdbe->msg;
-}
-
-char*
monetdbe_get_columns(monetdbe_database dbhdl, const char* schema_name, const
char *table_name, size_t *column_count,
char ***column_names, int
**column_types)
{
diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h
--- a/tools/monetdbe/monetdbe.h
+++ b/tools/monetdbe/monetdbe.h
@@ -72,9 +72,6 @@ typedef struct {
char* name;
} monetdbe_column;
-struct monetdbe_table_t;
-typedef struct monetdbe_table_t monetdbe_table;
-
typedef struct {
size_t nparam;
monetdbe_types *type;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
