MonetDB: nestedtypes - define type alias for multiset

[svetlin via checkin-list]

Changeset: 806a731651fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/806a731651fc
Modified Files:
        sql/backends/monet5/sql.c
        sql/include/sql_catalog.h
Branch: nestedtypes
Log Message:

define type alias for multiset


diffs (45 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5708,8 +5708,8 @@ insert_json(JSON *js, BAT *bats, int nr,
 }
 #endif
 
-static int insert_json_object(char **msg, JSON *js, BAT **bats, int 
bat_offset, int nr, int elm, size_t id, int anr, sql_subtype *t);
-static int insert_json_array(char **msg, JSON *js, BAT **bats, int bat_offset, 
int nr, int elm, size_t id, int oanr, sql_subtype *t);
+static int insert_json_object(char **msg, JSON *js, BAT **bats, int 
bat_offset, int nr, int elm, size_t id, msindex_t anr, sql_subtype *t);
+static int insert_json_array(char **msg, JSON *js, BAT **bats, int bat_offset, 
int nr, int elm, size_t id, msindex_t oanr, sql_subtype *t);
 
 static ValPtr
 jsonv2local(const ValPtr t, char *v)
@@ -5741,7 +5741,7 @@ jsonv2local(const ValPtr t, char *v)
 }
 
 static int
-insert_json_object(char **msg, JSON *js, BAT **bats, int bat_offset, int nr, 
int elm, size_t id, int anr, sql_subtype *t)
+insert_json_object(char **msg, JSON *js, BAT **bats, int bat_offset, int nr, 
int elm, size_t id, msindex_t anr, sql_subtype *t)
 {
        char buf[128]; /* TODO use proper buffer */
        int old_bat_offset = bat_offset;
@@ -5841,7 +5841,7 @@ insert_json_object(char **msg, JSON *js,
 }
 
 static int
-insert_json_array(char **msg, JSON *js, BAT **bats, int bat_offset, int nr, 
int elm, size_t id, int oanr, sql_subtype *t)
+insert_json_array(char **msg, JSON *js, BAT **bats, int bat_offset, int nr, 
int elm, size_t id, msindex_t oanr, sql_subtype *t)
 {
        JSONterm *ja = js->elm+elm;
        int tail = ja->tail;
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -938,4 +938,9 @@ typedef struct pl {
         semantics:1;
 } pl;
 
+typedef int msid_t;
+typedef int msindex_t;
+#define MSID_NAME "multisetid";
+#define MSINDEX_NAME "multisetnr";
+
 #endif /* SQL_CATALOG_H */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org