Changeset: c9d199961b67 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c9d199961b67
Modified Files:
gdk/gdk_string.c
gdk/gdk_subquery.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/sql.c
sql/server/rel_optimizer.c
sql/test/SQLancer/Tests/sqlancer17.test
sql/test/SQLancer/Tests/sqlancer18.test
Branch: pushcands
Log Message:
Merged with default
diffs (truncated from 3659 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ monetdb_configure_misc()
# Some custom target will need these setting.
include(monetdb-custom-targets)
-if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" AND NOT
${CPACK_PACKAGING_INSTALL_PREFIX} STREQUAL "/")
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -20,7 +20,8 @@ if(DEVELOPMENT AND NOT WIN32)
install(FILES
Maddlog
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT buildtools)
endif()
# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake
--- a/cmake/monetdb-rpm-packages.cmake
+++ b/cmake/monetdb-rpm-packages.cmake
@@ -24,13 +24,12 @@ set(CPACK_RPM_PACKAGE_RELOCATABLE OFF)
set(CPACK_RPM_monetdb_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set(CPACK_RPM_monetdb_FILE_NAME
"${CPACK_RPM_monetdb_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_monetdb_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
+#set(CPACK_RPM_monetdb_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_monetdbdev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-devel")
set(CPACK_RPM_monetdbdev_FILE_NAME
"${CPACK_RPM_monetdbdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_monetdbdev_PACKAGE_SUMMARY "MonetDB development files")
-set(CPACK_RPM_monetdbdev_PACKAGE_REQUIRES
- "%{name}%{?_isa} = %{version}-%{release}, %{name}-stream-devel%{?_isa} =
%{version}-%{release}")
+set(CPACK_RPM_monetdbdev_PACKAGE_REQUIRES "%{name}%{?_isa} =
%{version}-%{release}, %{name}-stream-devel%{?_isa} = %{version}-%{release}")
set(CPACK_RPM_stream_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-stream")
set(CPACK_RPM_stream_FILE_NAME
"${CPACK_RPM_stream_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
@@ -58,7 +57,7 @@ set(CPACK_RPM_odbc_PACKAGE_REQUIRES "%{n
set(CPACK_RPM_odbc_PACKAGE_REQUIRES_POST "unixODBC")
set(CPACK_RPM_odbc_PACKAGE_REQUIRES_POSTUN "unixODBC")
-set(CPACK_RPM_clienttest_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client-test")
+set(CPACK_RPM_clienttest_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client-tests")
set(CPACK_RPM_clienttest_FILE_NAME
"${CPACK_RPM_clienttest_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_clienttest_PACKAGE_SUMMARY "MonetDB Client tests package")
set(CPACK_RPM_clienttest_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} =
%{version}-%{release}, %{name}-client%{?_isa} = %{version}-%{release},
%{name}-client-odbc%{?_isa} = %{version}-%{release},
%{name}-SQL-server5%{?_isa} = %{version}-%{release}, python3-pymonetdb >=
1.0.6")
@@ -72,44 +71,59 @@ set(CPACK_RPM_geom_PACKAGE_REQUIRES "Mon
set(CPACK_RPM_rapi_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-R")
set(CPACK_RPM_rapi_FILE_NAME
"${CPACK_RPM_rapi_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_rapi_PACKAGE_SUMMARY "Integration of MonetDB and R, allowing use
of R from within SQL")
-set(CPACK_RPM_rapi_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} =
%{version}-%{release}")
+set(CPACK_RPM_rapi_PACKAGE_REQUIRES "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_pyapi3_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-python3")
set(CPACK_RPM_pyapi3_FILE_NAME
"${CPACK_RPM_pyapi3_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_pyapi3_PACKAGE_SUMMARY "Integration of MonetDB and Python,
allowing use of Python from within SQL")
-set(CPACK_RPM_pyapi3_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} =
%{version}-%{release}")
+set(CPACK_RPM_pyapi3_PACKAGE_REQUIRES "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_fits_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-cfitsio")
set(CPACK_RPM_fits_FILE_NAME
"${CPACK_RPM_fits_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_fits_PACKAGE_SUMMARY "MonetDB: Add on module that provides
support for FITS files")
-set(CPACK_RPM_fits_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} =
%{version}-%{release}")
+set(CPACK_RPM_fits_PACKAGE_REQUIRES "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
-set(CPACK_RPM_server_PACKAGE_NAME "MonetDB5-server")
+set(CPACK_RPM_server_PACKAGE_NAME "${CMAKE_PROJECT_NAME}5-server")
set(CPACK_RPM_server_FILE_NAME
"${CPACK_RPM_server_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_server_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
set(CPACK_RPM_server_PACKAGE_REQUIRES "%{name}-client%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_server_PACKAGE_RECOMMENDS "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
-set(CPACK_RPM_server_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
+#set(CPACK_RPM_server_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_server_PACKAGE_CONFLICTS "python-pymonetdb < 1.0.6")
# TODO: check for rhel
set(CPACK_RPM_server_PACKAGE_REQUIRES_PRE "shadow-utils, systemd")
-set(CPACK_RPM_serverdev_PACKAGE_NAME "MonetDB5-server-devel")
+set(CPACK_RPM_serverdev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}5-server-devel")
set(CPACK_RPM_serverdev_FILE_NAME
"${CPACK_RPM_serverdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_serverdev_PACKAGE_SUMMARY "MonetDB development files")
set(CPACK_RPM_serverdev_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} =
%{version}-%{release}, %{name}-devel%{?_isa} = %{version}-%{release}")
+set(CPACK_RPM_embedded_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-embedded")
+set(CPACK_RPM_embedded_FILE_NAME
"${CPACK_RPM_embedded_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
+set(CPACK_RPM_embedded_PACKAGE_SUMMARY "MonetDBe - Monet Embedded Database
Management System")
+set(CPACK_RPM_embedded_PACKAGE_REQUIRES "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
+
+set(CPACK_RPM_embeddeddev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-embedded-devel")
+set(CPACK_RPM_embeddeddev_FILE_NAME
"${CPACK_RPM_embeddeddev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
+set(CPACK_RPM_embeddeddev_PACKAGE_SUMMARY "MonetDBe development files")
+set(CPACK_RPM_embeddeddev_PACKAGE_REQUIRES "MonetDB-embedded%{?_isa} =
%{version}-%{release}, %{name}-devel%{?_isa} = %{version}-%{release}")
+
+set(CPACK_RPM_mbeddedtest_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-embedded-tests")
+set(CPACK_RPM_mbeddedtest_FILE_NAME
"${CPACK_RPM_mbeddedtest_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
+set(CPACK_RPM_mbeddedtest_PACKAGE_SUMMARY "MonetDBe test files")
+set(CPACK_RPM_mbeddedtest_PACKAGE_REQUIRES "%{name}-embedded%{?_isa} =
%{version}-%{release}")
+
set(CPACK_RPM_sql_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-SQL-server5")
set(CPACK_RPM_sql_FILE_NAME
"${CPACK_RPM_sql_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_sql_PACKAGE_SUMMARY "MonetDB5 SQL server modules")
set(CPACK_RPM_sql_PACKAGE_REQUIRES_PRE "MonetDB5-server%{?_isa} =
%{version}-%{release}")
-set(CPACK_RPM_sql_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
+#set(CPACK_RPM_sql_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
# TODO: systemd_requires?
set(CPACK_RPM_testing_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-testing")
set(CPACK_RPM_testing_FILE_NAME
"${CPACK_RPM_testing_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_TESTING_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
+set(CPACK_RPM_testing_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
set(CPACK_RPM_pytesting_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-testing-python")
set(CPACK_RPM_pytesting_FILE_NAME
"${CPACK_RPM_pytesting_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
diff --git a/ctest/tools/monetdbe/CMakeLists.txt
b/ctest/tools/monetdbe/CMakeLists.txt
--- a/ctest/tools/monetdbe/CMakeLists.txt
+++ b/ctest/tools/monetdbe/CMakeLists.txt
@@ -101,5 +101,6 @@ endif()
if (TESTING)
install(TARGETS
example_proxy
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT mbeddedtest)
endif()
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -129,7 +129,7 @@ GDKanalyticaldiff(BAT *r, BAT *b, BAT *p
}
} break;
default:{
- ptr v = BUNtail(bi, 0), next;
+ const void *v = BUNtail(bi, 0), *next;
int (*atomcmp) (const void *, const void *) = ATOMcompare(tpe);
if (np) {
for (i = 0; i < cnt; i++) {
@@ -764,7 +764,7 @@ GDKanalyticalpeers(BAT *r, BAT *b, BAT *
}
} break;
default: {
- ptr prev, next;
+ const void *prev, *next;
int (*atomcmp) (const void *, const void *) =
ATOMcompare(b->ttype);
if (preceding) {
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1001,7 +1001,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtvar(bi, k); \
+ const void *next = BUNtvar(bi, k);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1019,7 +1019,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtloc(bi, k); \
+ const void *next = BUNtloc(bi, k);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1043,7 +1043,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
l = i - 1; \
if (ATOMvarsized(tpe)) { \
for (j = l; ; j--) { \
- void *next = BUNtvar(bi, j); \
+ const void *next = BUNtvar(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1065,7 +1065,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
} \
} else { \
for (j = l; ; j--) { \
- void *next = BUNtloc(bi, j); \
+ const void *next = BUNtloc(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1092,10 +1092,10 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
#define ANALYTICAL_MIN_MAX_CALC_OTHERS_ALL_ROWS(GT_LT) \
do { \
- void *curval = (void*) nil; \
+ const void *curval = (void*) nil;
\
if (ATOMvarsized(tpe)) { \
for (j = k; j < i; j++) { \
- void *next = BUNtvar(bi, j); \
+ const void *next = BUNtvar(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1108,7 +1108,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
goto cleanup; \
} else { \
for (j = k; j < i; j++) { \
- void *next = BUNtloc(bi, j); \
+ const void *next = BUNtloc(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1128,14 +1128,14 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
do { \
if (ATOMvarsized(tpe)) { \
for (; k < i; k++) { \
- void *next = BUNtvar(bi, k); \
+ const void *next = BUNtvar(bi, k);
\
if ((res = tfastins_nocheckVAR(r, k, next)) !=
GDK_SUCCEED) \
goto cleanup; \
has_nils |= atomcmp(next, nil) == 0; \
} \
} else { \
for (; k < i; k++) { \
- void *next = BUNtloc(bi, k); \
+ const void *next = BUNtloc(bi, k);
\
memcpy(rcast, next, width); \
rcast += width; \
has_nils |= atomcmp(next, nil) == 0; \
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2422,7 +2422,7 @@ string_writer(logger *lg, BAT *b, lng of
}
char *dst = buf;
for(; p < end && sz < bufsz; p++) {
- char *s = BUNtvar(bi, p);
+ const char *s = BUNtvar(bi, p);
size_t len = strlen(s)+1;
if ((sz+len) > bufsz) {
if (len > bufsz)
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -287,7 +287,6 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
{
lng t0 = 0;
BATiter bi;
- str cs;
BUN i, ncand;
size_t hidx;
oid x;
@@ -323,7 +322,7 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
cpp = &cp;
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci) - b->hseqbase;
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs)) {
pi.s = cs;
pi.pos = 0;
@@ -731,7 +730,6 @@ STRMPcreate(BAT *b, BAT *s)
BUN i, ncand;
oid x;
struct canditer ci;
- str cs;
uint64_t *dh;
if ((r = STRMPcreateStrimpHeap(pb, s)) == NULL) {
@@ -745,7 +743,7 @@ STRMPcreate(BAT *b, BAT *s)
bi = bat_iterator(pb);
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci);
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs))
*dh++ = STRMPmakebitstring(cs, r);
else
@@ -973,7 +971,6 @@ STRMPcreate(BAT *b, BAT *s)
lng t0 = 0;
BATiter bi;
BUN i, ncand;
- str cs;
Strimps *h;
uint64_t *dh;
BAT *pb;
@@ -1007,7 +1004,7 @@ STRMPcreate(BAT *b, BAT *s)
bi = bat_iterator(b);
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci) - b->hseqbase;
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs))
*dh++ = STRMPmakebitstring(cs, h);
else
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
