MonetDB: parquet - change pointer stuff

[Mitchell Weggemans]

Changeset: 8621cfc78a76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8621cfc78a76
Modified Files:
        sql/backends/monet5/vaults/parquet/parquet.c
        sql/backends/monet5/vaults/parquet/parquet.h
        sql/server/rel_select.c
Branch: parquet
Log Message:

change pointer stuff


diffs (98 lines):

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
@@ -7,7 +7,7 @@
 #include <arrow-glib/arrow-glib.h>
 #include <parquet-glib/metadata.h>
 
-struct parquet_file open_file(char* filename) {
+parquet_file open_file(char* filename) {
     GParquetArrowFileReader *reader;
     GError *error;
   
@@ -19,20 +19,20 @@ struct parquet_file open_file(char* file
         reader = NULL;
     }
 
-    struct parquet_file file = { filename, reader };
+    parquet_file file = { filename, reader };
 
     return file;
 }
 
 
-struct parquet_table_metadata get_table_metadata(struct parquet_file file) {
+parquet_table_metadata get_table_metadata(parquet_file *file) {
     /* This shouldn't be possible, but check it for good measure */
-    if(file.reader == NULL) {
+    if(file->reader == NULL) {
         /* Throw error */
     }
 
     GError *table_error;
-    GArrowTable *table = gparquet_arrow_file_reader_read_table(file.reader, 
&table_error);
+    GArrowTable *table = gparquet_arrow_file_reader_read_table(file->reader, 
&table_error);
 
     if(table_error) {
         printf("%s", table_error->message);
@@ -40,7 +40,7 @@ struct parquet_table_metadata get_table_
 
     guint64 n_rows = garrow_table_get_n_rows(table);
 
-    struct parquet_table_metadata metadata = {"foo", n_rows};
+    parquet_table_metadata metadata = {"foo", n_rows};
 
     return metadata;
 }
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
@@ -3,19 +3,19 @@
 
 #include <parquet-glib/arrow-file-reader.h>
 
-struct parquet_file {
+typedef struct parquet_file {
     char* filename;
     GParquetArrowFileReader *reader;
-};
+} parquet_file;
 
-struct parquet_table_metadata {
+typedef struct parquet_table_metadata {
     char* table_name;
     int n_row;
-};
+} parquet_table_metadata;
 
 /* Opens the file, and returns a struct containing the reader. */
-struct parquet_file open_file(char* filename);
+parquet_file open_file(char* filename);
 
-struct parquet_table_metadata get_table_metadata(struct parquet_file file);
+parquet_table_metadata get_table_metadata(parquet_file *file);
 
 #endif
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
@@ -24,6 +24,8 @@
 #include "rel_unnest.h"
 #include "rel_sequence.h"
 
+#include "../backends/monet5/vaults/parquet/parquet.h"
+
 #define VALUE_FUNC(f) (f->func->type == F_FUNC || f->func->type == F_FILT)
 #define check_card(card,f) ((card == card_none && !f->res) || 
(CARD_VALUE(card) && f->res && VALUE_FUNC(f)) || card == card_loader || (card 
== card_relation && f->func->type == F_UNION))
 
@@ -544,6 +546,10 @@ file_loader_add_table_column_types(sql_s
        (void)f;
        (void)sa;
        (void)e;
+
+       parquet_file file = open_file(filename);
+       get_table_metadata(&file);
+
        /* ext -> call back */
        /*
        node *n;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org