Remove warning on Linux

  modified:   storage/connect/filamzip.cpp

Avoid calling the wrong AddValue (Windows compiler error ???)
  modified:   storage/connect/json.h

Fix looping bug in JARRAY::AddValue for arrays having one value.
Fix potential crash in JVALUE::SetValue
  modified:   storage/connect/json.cpp

Many changes to fix bugs, enhance memory handling and modify Jpath.
In JSNX some functions have been re-written or added to handle new Jpath.
BMX was re-defined to avoid a different size between Windows an Linux.
Jbin memory was fixed to use the proper memory when adding values.
Default pretty value is now 0 instead of 2.
Filename is stored in BSON when IsJson == 2.
BSON size is added to memlen in CalcLen when applicable.
The order or parameter was switch in Json_Object_Grp.
File name argument must be a constant (temporary?)
Json_Set_Item now returns file name when applicable.
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h

Include "mycat.h"
  modified:   storage/connect/mycat.cc

Udf_json test revisited and fixed for Linux
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc

storage/connect/filamzip.cpp

@@ -1404,8 +1404,13 @@ void ZLBFAM::Rewind(void)
   // We must be positioned after the header block
   if (CurBlk >= 0) {   // Nothing to do if no block read yet
     if (!Optimized) {  // If optimized, fseek will be done in ReadBuffer
+			size_t st;
+
       rewind(Stream);
-      (void) fread(Zlenp, sizeof(int), 1, Stream);
+
+			if (!(st = fread(Zlenp, sizeof(int), 1, Stream)) && trace)
+				htrc("fread error %d in Rewind", errno);
+
       fseek(Stream, *Zlenp + sizeof(int), SEEK_SET);
       OldBlk = -1;
       } // endif Optimized

storage/connect/json.cpp

@@ -1096,10 +1096,12 @@ PJVAL JARRAY::AddValue(PGLOBAL g, PJVAL jvp, int *x)
 			Last = jvp;
 
 	} else {
-		if (Last)
-			Last->Next = jvp;
-		else
+		if (!First)
 			First = jvp;
+		else if (Last == First)
+			First->Next = Last = jvp;
+		else
+			Last->Next = jvp;
 
 		Last = jvp;
 	} // endif x
@@ -1284,7 +1286,7 @@ PSZ JVALUE::GetText(PGLOBAL g, PSZ text)
 
 void JVALUE::SetValue(PJSON jsp)
 { 
-	if (jsp->GetType() == TYPE_JVAL) {
+	if (jsp && jsp->GetType() == TYPE_JVAL) {
 		Jsp = jsp->GetJsp();
 		Value = jsp->GetValue();
 	} else {

storage/connect/json.h

@@ -149,7 +149,7 @@ class JSON : public BLOCK {
   virtual JTYP   GetType(void) {return TYPE_JSON;}
   virtual JTYP   GetValType(void) {X return TYPE_JSON;}
   virtual void   InitArray(PGLOBAL g) {X}
-  virtual PJVAL  AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;}
+//virtual PJVAL  AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL) {X return NULL;}
   virtual PJPR   AddPair(PGLOBAL g, PSZ key) {X return NULL;}
 	virtual PJAR   GetKeyList(PGLOBAL g) {X return NULL;}
 	virtual PJVAL  GetValue(const char *key) {X return NULL;}
@@ -223,7 +223,7 @@ class JARRAY : public JSON {
   virtual void  Clear(void) {First = Last = NULL; Size = 0;}
   virtual JTYP  GetType(void) {return TYPE_JAR;}
   virtual PJAR  GetArray(void) {return this;}
-  virtual PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL);
+          PJVAL AddValue(PGLOBAL g, PJVAL jvp = NULL, int *x = NULL);
   virtual void  InitArray(PGLOBAL g);
   virtual PJVAL GetValue(int i);
 	virtual bool  Merge(PGLOBAL g, PJSON jsp);

storage/connect/jsonudf.h

@@ -239,7 +239,7 @@ class JSNX : public BLOCK {
 	my_bool SetJpath(PGLOBAL g, char *path, my_bool jb = false);
 	my_bool ParseJpath(PGLOBAL g);
 	void    ReadValue(PGLOBAL g);
-	PJVAL   GetValue(PGLOBAL g, PJSON row, int i, my_bool b = true);
+	PJVAL   GetRowValue(PGLOBAL g, PJSON row, int i, my_bool b = true);
 	PJVAL   GetJson(PGLOBAL g);
 	my_bool CheckPath(PGLOBAL g);
 	my_bool WriteValue(PGLOBAL g, PJVAL jvalp);
@@ -288,4 +288,5 @@ class JSNX : public BLOCK {
 	my_bool  Parsed;              // True when parsed
 	my_bool  Found;								// Item found by locate
 	my_bool  Wr;			  					// Write mode
+	my_bool  Jb;			  					// Must return json item
 }; // end of class JSNX

storage/connect/mycat.cc

@@ -89,6 +89,7 @@
 #if defined(XML_SUPPORT)
 #include "tabxml.h"
 #endif   // XML_SUPPORT
+#include "mycat.h"
 
 /***********************************************************************/
 /*  Extern static variables.                                           */

storage/connect/mysql-test/connect/std_data/gloss.json

+{
+  "glossary": {
+    "title": "example glossary",
+    "GlossDiv": {
+      "title": "S",
+      "GlossList": {
+        "GlossEntry": {
+          "ID": "SGML",
+          "SortAs": "SGML",
+          "GlossTerm": "Standard Generalized Markup Language",
+          "Acronym": "SGML",
+          "Abbrev": "ISO 8879:1986",
+          "GlossDef": {
+            "para": "A meta-markup language, used to create markup languages such as DocBook.",
+            "GlossSeeAlso": ["GML", "XML"]
+          },
+          "GlossSee": "markup"
+        }
+      }
+    }
+  }
+}

storage/connect/mysql-test/connect/t/json_udf.inc

@@ -15,14 +15,13 @@ if (!$HA_CONNECT_SO) {
 --eval CREATE FUNCTION json_array_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object_nonull RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_object_key RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object_add RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonvalue RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE AGGREGATE FUNCTION json_array_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE AGGREGATE FUNCTION json_object_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
---eval CREATE FUNCTION json_item_merge RETURNS STRING SONAME '$HA_CONNECT_SO';
---eval CREATE FUNCTION json_get_item RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonget_string RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonget_int RETURNS INTEGER SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonget_real RETURNS REAL SONAME '$HA_CONNECT_SO';
@@ -30,6 +29,13 @@ if (!$HA_CONNECT_SO) {
 --eval CREATE FUNCTION json_locate_all RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_file RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jfile_make RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsoncontains RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsoncontains_path RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_get_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_set_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_insert_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_update_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION json_item_merge RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_serialize RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_array RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_array_add_values RETURNS STRING SONAME '$HA_CONNECT_SO';
@@ -37,11 +43,15 @@ if (!$HA_CONNECT_SO) {
 --eval CREATE FUNCTION jbin_array_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_object RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_object_nonull RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_object_key RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_object_add RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_get_item RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_item_merge RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_set_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_insert_item RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jbin_update_item RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jbin_file RETURNS STRING SONAME '$HA_CONNECT_SO';
 
 --enable_query_log

storage/connect/mysql-test/connect/t/json_udf2.inc

 --disable_query_log
 
-DROP FUNCTION jsonvalue;
 DROP FUNCTION json_array;
 DROP FUNCTION json_array_add;
 DROP FUNCTION json_array_add_values;
 DROP FUNCTION json_array_delete;
 DROP FUNCTION json_object;
 DROP FUNCTION json_object_nonull;
+DROP FUNCTION json_object_key;
 DROP FUNCTION json_object_add;
 DROP FUNCTION json_object_delete;
 DROP FUNCTION json_object_list;
+DROP FUNCTION jsonvalue;
 DROP FUNCTION json_array_grp;
 DROP FUNCTION json_object_grp;
-DROP FUNCTION json_item_merge;
-DROP FUNCTION json_get_item;
-DROP FUNCTION JsonGet_string;
-DROP FUNCTION JsonGet_int;
-DROP FUNCTION JsonGet_real;
+DROP FUNCTION jsonget_string;
+DROP FUNCTION jsonget_int;
+DROP FUNCTION jsonget_real;
 DROP FUNCTION jsonlocate;
 DROP FUNCTION json_locate_all;
 DROP FUNCTION json_file;
-DROP FUNCTION json_serialize;
 DROP FUNCTION jfile_make;
+DROP FUNCTION json_get_item;
+DROP FUNCTION json_item_merge;
+DROP FUNCTION jsoncontains;
+DROP FUNCTION jsoncontains_path;
+DROP FUNCTION json_set_item;
+DROP FUNCTION json_insert_item;
+DROP FUNCTION json_update_item;
+DROP FUNCTION json_serialize;
 DROP FUNCTION jbin_array;
 DROP FUNCTION jbin_array_add_values;
 DROP FUNCTION jbin_array_add;
 DROP FUNCTION jbin_array_delete;
 DROP FUNCTION jbin_object;
 DROP FUNCTION jbin_object_nonull;
+DROP FUNCTION jbin_object_key;
 DROP FUNCTION jbin_object_add;
 DROP FUNCTION jbin_object_delete;
 DROP FUNCTION jbin_object_list;
 DROP FUNCTION jbin_get_item;
 DROP FUNCTION jbin_item_merge;
+DROP FUNCTION jbin_set_item;
+DROP FUNCTION jbin_insert_item;
+DROP FUNCTION jbin_update_item;
 DROP FUNCTION jbin_file;
 
 --enable_query_log