Changeset: c71ea4121be8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c71ea4121be8
Modified Files:
cmake/monetdb-findpackages.cmake
tools/monetdbe/monetdbe.c
tools/monetdbe/monetdbe_mapi.h
Branch: default
Log Message:
fix compilation using clang
diffs (92 lines):
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -34,7 +34,7 @@ if(WITH_PCRE)
find_package(PCRE)
endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND ${CMAKE_SYSTEM_VERSION}
VERSION_LESS "19.0.0")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND ${CMAKE_HOST_SYSTEM_VERSION}
VERSION_LESS "19.0.0")
find_package(CommonCrypto)
else()
find_package(OpenSSL)
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -313,16 +313,8 @@ monetdbe_query_internal(monetdbe_databas
if (m->results) {
res_internal->res.ncols = (size_t) m->results->nr_cols;
res_internal->monetdbe_resultset = m->results;
- if (m->results->nr_cols > 0 && m->results->order) {
- BAT* bb = BATdescriptor(m->results->order);
- m->results = NULL;
- if (!bb) {
- mdbe->msg = createException(MAL,
"monetdbe.monetdbe_query_internal", RUNTIME_OBJECT_MISSING);
- goto cleanup;
- }
- res_internal->res.nrows = BATcount(bb);
- BBPunfix(bb->batCacheid);
- }
+ if (m->results->nr_cols > 0)
+ res_internal->res.nrows = m->results->nr_rows;
m->results = NULL;
res_internal->converted_columns =
GDKzalloc(sizeof(monetdbe_column*) * res_internal->res.ncols);
if (!res_internal->converted_columns) {
@@ -794,16 +786,8 @@ monetdbe_execute(monetdbe_statement *stm
if (m->results) {
res_internal->res.ncols = (size_t) m->results->nr_cols;
res_internal->monetdbe_resultset = m->results;
- if (m->results->nr_cols > 0 && m->results->order) {
- BAT* bb = BATdescriptor(m->results->order);
- m->results = NULL;
- if (!bb) {
- mdbe->msg = createException(MAL,
"monetdbe.monetdbe_query_internal", RUNTIME_OBJECT_MISSING);
- goto cleanup;
- }
- res_internal->res.nrows = BATcount(bb);
- BBPunfix(bb->batCacheid);
- }
+ if (m->results->nr_cols > 0)
+ res_internal->res.nrows = m->results->nr_rows;
m->results = NULL;
res_internal->converted_columns =
GDKzalloc(sizeof(monetdbe_column*) * res_internal->res.ncols);
if (!res_internal->converted_columns) {
@@ -1007,9 +991,9 @@ GENERATE_BASE_HEADERS(monetdbe_data_time
mdbe->msg = createException(MAL,
"monetdbe.monetdbe_result_fetch", MAL_MALLOC_FAIL); \
goto cleanup;
\
}
\
- bat_data->type = monetdbe_##tpe;
\
+ bat_data->type = monetdbe_##tpe;
\
bat_data->is_null = tpe##_is_null;
\
- bat_data->scale = pow(10, sqltpe->scale);
\
+ if (sqltpe->type->radix == 10) bat_data->scale = pow(10,
sqltpe->scale); \
column_result = (monetdbe_column*) bat_data;
#define GENERATE_BAT_INPUT(b, tpe, tpe_name, mtype)
\
diff --git a/tools/monetdbe/monetdbe_mapi.h b/tools/monetdbe/monetdbe_mapi.h
--- a/tools/monetdbe/monetdbe_mapi.h
+++ b/tools/monetdbe/monetdbe_mapi.h
@@ -9,12 +9,12 @@
#include <ctype.h>
#include <monetdbe.h>
-typedef struct MapiStruct {
+struct MapiStruct {
monetdbe_database mdbe;
char *msg;
-} *Mapi;
+};
-typedef struct MapiStatement {
+struct MapiStatement {
Mapi mid;
char *query;
monetdbe_result *result;
@@ -22,6 +22,6 @@ typedef struct MapiStatement {
monetdbe_cnt current_row;
monetdbe_cnt affected_rows;
char *msg;
-} *MapiHdl;
+};
#endif // MONETDBE_MAPI_H_
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
