Add experimental Bson_Array function (not documented)

Change names of functions not returning Json. modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/plugutil.c modified: storage/connect/value.cpp modified: storage/connect/value.h
MariaDB · Sep 6, 2015 · 7915abf · 7915abf
1 parent 175ef09
commit 7915abf
Show file tree

Hide file tree

Showing 8 changed files with 888 additions and 734 deletions.
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
@@ -63,7 +63,7 @@ PJSON ParseJson(PGLOBAL g, char *s, int len, int pretty, bool *comma)
     switch (s[i]) {
       case '[':
         if (jsp) {
-					if (pretty < 3) {
+					if (pretty && pretty < 3) {
 						strcpy(g->Message, "More than one item in file");
 						goto err;
 					} else
@@ -75,7 +75,7 @@ PJSON ParseJson(PGLOBAL g, char *s, int len, int pretty, bool *comma)
         break;
       case '{':
         if (jsp) {
-					if (pretty < 3) {
+					if (pretty && pretty < 3) {
 						strcpy(g->Message, "More than one item in file");
 						goto err;
 					} else
@@ -336,7 +336,6 @@ PJVAL ParseValue(PGLOBAL g, int& i, STRG& src)
 
     }; // endswitch s[i]
 
-  jvp->Size = 1;
   return jvp;
 
 err:
@@ -973,6 +972,7 @@ void JOBJECT::DeleteKey(PSZ key)
 	for (jp = First; jp; jp = jp->Next)
 		if (!strcmp(jp->Key, key)) {
 			*pjp = jp->Next;
+			Size--;
 			break;
 		} else
 			pjp = &jp->Next;
@@ -1246,9 +1246,9 @@ void JVALUE::SetFloat(PGLOBAL g, double f)
 /***********************************************************************/
 /* Set the Value's value as the given string.                          */
 /***********************************************************************/
-void JVALUE::SetString(PGLOBAL g, PSZ s)
+void JVALUE::SetString(PGLOBAL g, PSZ s, short c)
 {
-  Value = AllocateValue(g, s, TYPE_STRING);
+  Value = AllocateValue(g, s, TYPE_STRING, c);
 } // end of SetString
 
 /***********************************************************************/

diff --git a/storage/connect/json.h b/storage/connect/json.h
@@ -155,7 +155,8 @@ class JSON : public BLOCK {
   virtual PJAR   GetArray(void) {return NULL;}
 	virtual PJVAL  GetValue(int i) {X return NULL;}
   virtual PVAL   GetValue(void) {X return NULL;}
-  virtual PJSON  GetJson(void) {X return NULL;}
+	virtual PJSON  GetJsp(void) { X return NULL; }
+	virtual PJSON  GetJson(void) { X return NULL; }
   virtual PJPR   GetFirst(void) {X return NULL;}
   virtual int    GetInteger(void) {X return 0;}
   virtual double GetFloat() {X return 0.0;}
@@ -165,7 +166,7 @@ class JSON : public BLOCK {
   virtual void   SetValue(PGLOBAL g, PJVAL jvp, PSZ key) {X}
   virtual void   SetValue(PVAL valp) {X}
   virtual void   SetValue(PJSON jsp) {X}
-  virtual void   SetString(PGLOBAL g, PSZ s) {X}
+  virtual void   SetString(PGLOBAL g, PSZ s, short c) {X}
   virtual void   SetInteger(PGLOBAL g, int n) {X}
   virtual void   SetFloat(PGLOBAL g, double f) {X}
 	virtual void   DeleteKey(char *k) {X}
@@ -258,15 +259,16 @@ class JVALUE : public JSON {
   virtual PJOB   GetObject(void);
   virtual PJAR   GetArray(void);
   virtual PVAL   GetValue(void) {return Value;}
-  virtual PJSON  GetJson(void) {return (Jsp ? Jsp : this);}
-  virtual int    GetInteger(void);
+  virtual PJSON  GetJsp(void) {return Jsp;}
+	virtual PJSON  GetJson(void) { return (Jsp ? Jsp : this); }
+	virtual int    GetInteger(void);
 	virtual long long GetBigint(void);
 	virtual double GetFloat(void);
   virtual PSZ    GetString(void);
   virtual PSZ    GetText(PGLOBAL g, PSZ text);
   virtual void   SetValue(PVAL valp) {Value = valp;}
   virtual void   SetValue(PJSON jsp) {Jsp = jsp;}
-  virtual void   SetString(PGLOBAL g, PSZ s);
+  virtual void   SetString(PGLOBAL g, PSZ s, short c = 0);
   virtual void   SetInteger(PGLOBAL g, int n);
 	virtual void   SetBigint(PGLOBAL g, longlong ll);
 	virtual void   SetFloat(PGLOBAL g, double f);