MonetDB: default - Fix compilation issue

[Martin Kersten]

Changeset: 98dd843e20d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98dd843e20d2
Modified Files:
        monetdb5/modules/atoms/Tests/json03.mal
        monetdb5/modules/atoms/json_atom.c
Branch: default
Log Message:

Fix compilation issue


diffs (63 lines):

diff --git a/monetdb5/modules/atoms/Tests/json03.mal 
b/monetdb5/modules/atoms/Tests/json03.mal
--- a/monetdb5/modules/atoms/Tests/json03.mal
+++ b/monetdb5/modules/atoms/Tests/json03.mal
@@ -3,8 +3,44 @@ js:= calc.json("[{ \"category\": \"refer
 
 io.print(js);
 
-(k,v):= json.pairs(js);
+(k,v):= json.unnest(js);
 io.print(k,v);
+jsn:= json.nest(k,v);
+io.print(jsn);
 
-(o,k,v):= json.pairs(js);
-io.print(o,k,v);
+(o,l,w):= json.unnest(js);
+io.print(o,l,w);
+jsm:= json.nest(o,l,w);
+io.print(jsm);
+
+b:= bat.new(:oid,:int);
+bat.append(b,1);
+bat.append(b,22);
+bat.append(b,333);
+
+bl:= json.nest(b);
+io.print(bl);
+
+# create comple structure
+bat.append(b,2);
+bat.append(b,3);
+bat.append(b,4);
+
+n:= bat.new(:oid,:str);
+bat.append(n,"a");
+bat.append(n,"b");
+bat.append(n,"c");
+bat.append(n,"a");
+bat.append(n,"c");
+bat.append(n,"b");
+i:= bat.new(:oid,:oid);
+bat.append(i,0@0);
+bat.append(i,0@0);
+bat.append(i,0@0);
+bat.append(i,1@0);
+bat.append(i,1@0);
+bat.append(i,2@0);
+
+jsn:= json.nest(i,n,b);
+io.print(jsn);
+
diff --git a/monetdb5/modules/atoms/json_atom.c 
b/monetdb5/modules/atoms/json_atom.c
--- a/monetdb5/modules/atoms/json_atom.c
+++ b/monetdb5/modules/atoms/json_atom.c
@@ -1199,7 +1199,7 @@ str JSONnestKeyValue(str *ret, int *id, 
        size_t i, len, lim, l;
        void *p;
        BUN cnt;
-       oid o;
+       oid o=0;;
 
        if ( key){
                bk = BATdescriptor(*key);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list