MonetDB: tvtree - merged with nested

[Niels Nes via checkin-list]

Changeset: 225fb350062f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/225fb350062f
Branch: tvtree
Log Message:

merged with nested


diffs (44 lines):

diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -52,7 +52,7 @@ typedef str json;
                }                                                               
                                                                \
        } while (0)
 
-int TYPE_json;
+static int TYPE_json;
 
 /* Internal constructors. */
 static int jsonhint = 8;
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
@@ -5843,6 +5843,7 @@ insert_json_object(char **msg, JSON *js,
                case JSON_NULL:
                        pos = -1;
                        ValPtr v = NULL;
+                       ValRecord vr = (ValRecord) {.bat=false, 
.vtype=TYPE_void};
                        if (jt->valuelen > 128-1)
                                return -8;
                        strncpy(buf, jt->value, jt->valuelen);
@@ -5852,7 +5853,7 @@ insert_json_object(char **msg, JSON *js,
                                int alen = (int)strlen(a->name);
                                if (nlen == alen && strncmp(name, a->name, 
nlen) == 0) {
                                        pos = i;
-                                       ValRecord vr = (ValRecord) {.bat=false, 
.vtype=a->type.type->localtype};
+                                       vr.vtype = a->type.type->localtype;
                                        v = jsonv2local(&vr, buf);
                                        break;
                                }
diff --git a/sql/backends/monet5/vaults/json/json.c 
b/sql/backends/monet5/vaults/json/json.c
--- a/sql/backends/monet5/vaults/json/json.c
+++ b/sql/backends/monet5/vaults/json/json.c
@@ -194,7 +194,7 @@ json_load(void *BE, sql_subfunc *f, char
 }
 
 
-int TYPE_json;
+static int TYPE_json;
 
 
 static str
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org