MonetDB: parquet - for now use void * as types (stmt and backend...

[Niels Nes]

Changeset: 28b07bbee1c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/28b07bbee1c8
Modified Files:
        sql/backends/monet5/vaults/csv/csv.c
        sql/backends/monet5/vaults/parquet/parquet.c
        sql/server/rel_file_loader.h
Branch: parquet
Log Message:

for now use void * as types (stmt and backend) are only known at the backend 
level.


diffs (56 lines):

diff --git a/sql/backends/monet5/vaults/csv/csv.c 
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -313,10 +313,10 @@ csv_relation(mvc *sql, sql_subfunc *f, c
        return MAL_SUCCEED;
 }
 
-static list *
-csv_load(mvc *ugh, sql_subfunc *f, char *filename)
+static void *
+csv_load(void *BE, sql_subfunc *f, char *filename)
 {
-       backend *be = (backend*)ugh;
+       backend *be = (backend*)BE;
        mvc *sql = be->mvc;
        sql_table *t = NULL;
        if (mvc_create_table( &t, be->mvc, be->mvc->session->tr->tmp/* misuse 
tmp schema */, "csv" /*gettable name*/, tt_table, false, SQL_DECLARED_TABLE, 0, 
0, false) != LOG_OK)
@@ -395,7 +395,7 @@ csv_load(mvc *ugh, sql_subfunc *f, char 
                             exp_atom_int(sql->sa, 0)),
                         exp_atom_int(sql->sa, 0)), cf);
 
-       return (list*)exp_bin(be, import, NULL, NULL, NULL, NULL, NULL, NULL, 
0, 0, 0);
+       return exp_bin(be, import, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0);
 }
 
 static str
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
@@ -177,10 +177,10 @@ parquet_add_types(mvc *sql, sql_subfunc 
        return MAL_SUCCEED;
 }
 
-static list *
-parquet_load(mvc *sql, sql_subfunc *f, char *filename)
+static void *
+parquet_load(void *BE, sql_subfunc *f, char *filename)
 {
-       (void)sql;
+       (void)BE;
        (void)f;
        (void)filename;
        return NULL;
diff --git a/sql/server/rel_file_loader.h b/sql/server/rel_file_loader.h
--- a/sql/server/rel_file_loader.h
+++ b/sql/server/rel_file_loader.h
@@ -13,7 +13,8 @@
 #include "sql_mvc.h"
 
 typedef str (*fl_add_types_fptr)(mvc *sql, sql_subfunc *f, char *filename, 
list *res_exps, char *name);
-typedef list *(*fl_load_fptr)(mvc *sql, sql_subfunc *f, char *filename);
+typedef void *(*fl_load_fptr)(void *be, sql_subfunc *f, char *filename); /* 
use void * as both return type and be are
+                                                                               
                                                                        unknown 
types at this layer */
 
 typedef struct file_loader_t {
        char *name;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org