Changeset: 784b202296a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/784b202296a1
Modified Files:
sql/backends/monet5/vaults/parquet/CMakeLists.txt
sql/backends/monet5/vaults/parquet/parquet.c
sql/server/CMakeLists.txt
sql/server/rel_select.c
Branch: parquet
Log Message:
cmake
diffs (69 lines):
diff --git a/sql/backends/monet5/vaults/parquet/CMakeLists.txt
b/sql/backends/monet5/vaults/parquet/CMakeLists.txt
--- a/sql/backends/monet5/vaults/parquet/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/parquet/CMakeLists.txt
@@ -1,13 +1,13 @@
if(Parquet_FOUND)
- add_library(parquet_lib MODULE SHARED)
+ add_library(parquetlib MODULE)
- target_sources(parquet_lib
+ target_sources(parquetlib
PRIVATE
parquet.c
parquet.h
)
- target_link_libraries(parquet_lib
+ target_link_libraries(parquetlib
PRIVATE
monetdb_config_header
monetdb5
@@ -22,7 +22,7 @@ if(Parquet_FOUND)
)
install(TARGETS
- parquet_lib
+ parquetlib
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT server)
endif()
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -33,11 +33,6 @@ parquet_file *open_file(char* filename)
parquet_table_metadata get_table_metadata(parquet_file *file) {
- /* This shouldn't be possible, but check it for good measure */
- if(file->reader == NULL) {
- /* Throw error */
- }
-
GError *table_error;
GArrowTable *table = gparquet_arrow_file_reader_read_table(file->reader,
&table_error);
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -111,7 +111,7 @@ target_link_libraries(sqlserver
sqlcommon
sqlinclude
sqlstorage
- parquet_lib)
+ )
target_compile_definitions(sqlserver
PRIVATE
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -568,6 +568,9 @@ file_loader_add_table_column_types(sql_s
return types;
f->res = types;
*/
+
+ GDKfree(file);
+
return NULL;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
