MonetDB: parquet - small improvements to get the parquet module ...

[Niels Nes]

Changeset: b129715f4fcd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b129715f4fcd
Modified Files:
        sql/backends/monet5/vaults/parquet/CMakeLists.txt
        sql/backends/monet5/vaults/parquet/parquet.c
        sql/backends/monet5/vaults/parquet/parquet.h
        tools/mserver/mserver5.c
Branch: parquet
Log Message:

small improvements to get the parquet module loaded


diffs (129 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
@@ -7,22 +7,6 @@ if(Parquet_FOUND)
     parquet.h
   )
 
-
-
-  target_link_libraries(parquet
-    PRIVATE
-    monetdb_config_header
-    monetdb5
-    bat
-    sqlinclude
-    arrow_shared 
-    arrow-glib 
-    gobject-2.0 
-    glib-2.0 
-    parquet_shared 
-    parquet-glib
-  )
-
   target_include_directories(parquet
     PRIVATE
     $<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
@@ -35,6 +19,29 @@ if(Parquet_FOUND)
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
 
+  target_link_libraries(parquet
+    PRIVATE
+    monetdb_config_header
+    monetdb5
+    bat
+    sqlinclude
+    arrow_shared
+    arrow-glib
+    gobject-2.0
+    glib-2.0
+    parquet_shared
+    parquet-glib
+  )
+
+  set_target_properties(parquet
+    PROPERTIES
+    OUTPUT_NAME
+    _parquet)
+
+  target_compile_definitions(parquet
+    PRIVATE
+    LIBPARQUET)
+
   install(TARGETS
     parquet
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
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
@@ -17,7 +17,10 @@
 #include "mal_linker.h"
 #include "mal_utils.h"
 
-parquet_file *parquet_open_file(char* filename) {
+/*
+static parquet_file *
+parquet_open_file(char* filename)
+{
     GParquetArrowFileReader *reader;
     GError *g_error;
     char* error = NULL;
@@ -38,8 +41,9 @@ parquet_file *parquet_open_file(char* fi
     return file;
 }
 
-
-parquet_table_metadata parquet_get_table_metadata(parquet_file *file) {
+static parquet_table_metadata
+parquet_get_table_metadata(parquet_file *file)
+{
     GError *table_error;
     GArrowTable *table = gparquet_arrow_file_reader_read_table(file->reader, 
&table_error);
 
@@ -53,6 +57,7 @@ parquet_table_metadata parquet_get_table
 
     return metadata;
 }
+*/
 
 static int
 parquet_add_types(sql_subfunc *f, char *filename)
@@ -97,7 +102,6 @@ static mel_func parquet_init_funcs[] = {
 { .imp=NULL }
 };
 
-
 #include "mal_import.h"
 #ifdef _MSC_VER
 #undef read
diff --git a/sql/backends/monet5/vaults/parquet/parquet.h 
b/sql/backends/monet5/vaults/parquet/parquet.h
--- a/sql/backends/monet5/vaults/parquet/parquet.h
+++ b/sql/backends/monet5/vaults/parquet/parquet.h
@@ -15,10 +15,10 @@ typedef struct parquet_table_metadata {
 } parquet_table_metadata;
 
 /* Opens the file, and returns a struct containing the reader. */
-parquet_file *parquet_open_file(char* filename);
+//parquet_file *parquet_open_file(char* filename);
 
-parquet_table_metadata parquet_get_table_metadata(parquet_file *file);
+//parquet_table_metadata parquet_get_table_metadata(parquet_file *file);
 
-void parquet_init(void);
+//void parquet_init(void);
 
 #endif
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -362,6 +362,9 @@ main(int argc, char **av)
 #ifdef HAVE_NETCDF
        modules[mods++] = "netcdf";
 #endif
+#ifdef HAVE_PARQUET
+       modules[mods++] = "parquet";
+#endif
 #ifdef HAVE_SHP
        modules[mods++] = "shp";
 #endif
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org