MonetDB: parquet - simplified interface

[Niels Nes]

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

simplified interface


diffs (42 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
@@ -177,13 +177,13 @@ parquet_add_types(mvc *sql, sql_subfunc 
        return MAL_SUCCEED;
 }
 
-static int
+static list *
 parquet_load(mvc *sql, sql_subfunc *f, char *filename)
 {
        (void)sql;
        (void)f;
        (void)filename;
-       return 0;
+       return NULL;
 }
 
 static str
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
@@ -12,18 +12,12 @@
 #include "sql_types.h"
 #include "sql_mvc.h"
 
-/* TODO think of set of file names */
 typedef str (*fl_add_types_fptr)(mvc *sql, sql_subfunc *f, char *filename, 
list *res_exps, char *name);
-typedef int (*fl_load_fptr)(mvc *sql, sql_subfunc *f, char *filename);
+typedef list *(*fl_load_fptr)(mvc *sql, sql_subfunc *f, char *filename);
 
 typedef struct file_loader_t {
        char *name;
        fl_add_types_fptr add_types;
-       /* api needs more designing */
-       // void *fl_create(); load meta data from file
-       // fl_nrows(metadata); return number of rows
-       // fl_columnname(metadata, int i); return name of nth column
-       // fl_loadchunk(metadata, int colnr, output_buf, nrows);
        fl_load_fptr load;
 } file_loader_t;
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org