- Adding the JSON table type

added:
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/std_data/biblio.jsn
  storage/connect/mysql-test/connect/std_data/expense.jsn
  storage/connect/mysql-test/connect/std_data/mulexp3.jsn
  storage/connect/mysql-test/connect/std_data/mulexp4.jsn
  storage/connect/mysql-test/connect/std_data/mulexp5.jsn
  storage/connect/mysql-test/connect/t/json.test
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/engmsg.h
  storage/connect/filamtxt.h
  storage/connect/ha_connect.cc
  storage/connect/msgid.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/tabdos.cpp
  storage/connect/value.cpp
  storage/connect/value.h

7 files changed, 1045 insertions, 0 deletions

diff --git a/storage/connect/mysql-test/connect/r/json.result b/storage/connect/mysql-test/connect/r/json.result
new file mode 100644
index 00000000000..137e82b1bc4
--- /dev/null
+++ b/storage/connect/mysql-test/connect/r/json.result
@@ -0,0 +1,439 @@
+#
+# Testing doc samples
+#
+CREATE TABLE t1
+(
+ISBN CHAR(15),
+LANG CHAR(2),
+SUBJECT CHAR(32),
+AUTHOR CHAR(64),
+TITLE CHAR(32),
+TRANSLATION CHAR(32),
+TRANSLATOR CHAR(80),
+PUBLISHER CHAR(32),
+DATEPUB int(4)
+) ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';
+SELECT * FROM t1;
+ISBN	LANG	SUBJECT	AUTHOR	TITLE	TRANSLATION	TRANSLATOR	PUBLISHER	DATEPUB
+9782212090819	fr	applications	Jean-Christophe Bernadac	Construire une application XML			Eyrolles Paris	1999
+9782840825685	fr	applications	William J. Pardi	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press Paris	1999
+DROP TABLE t1;
+#
+# Testing Jpath. Get the number of authors
+#
+CREATE TABLE t1
+(
+ISBN CHAR(15),
+Language CHAR(2) FIELD_FORMAT='LANG',
+Subject CHAR(32) FIELD_FORMAT='SUBJECT',
+Authors INT(2) FIELD_FORMAT='AUTHOR:[#]',
+Title CHAR(32) FIELD_FORMAT='TITLE',
+Translation CHAR(32) FIELD_FORMAT='TRANSLATION',
+Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',
+Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',
+Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',
+Year int(4) FIELD_FORMAT='DATEPUB'
+)
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';
+SELECT * FROM t1;
+ISBN	Language	Subject	Authors	Title	Translation	Translator	Publisher	Location	Year
+9782212090819	fr	applications	2	Construire une application XML			Eyrolles	Paris	1999
+9782840825685	fr	applications	1	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press	Paris	1999
+DROP TABLE t1;
+#
+# Concatenates the authors
+#
+CREATE TABLE t1
+(
+ISBN CHAR(15),
+Language CHAR(2) FIELD_FORMAT='LANG',
+Subject CHAR(32) FIELD_FORMAT='SUBJECT',
+AuthorFN CHAR(128) FIELD_FORMAT='AUTHOR:[" and "]:FIRSTNAME',
+AuthorLN CHAR(128) FIELD_FORMAT='AUTHOR:[" and "]:LASTNAME',
+Title CHAR(32) FIELD_FORMAT='TITLE',
+Translation CHAR(32) FIELD_FORMAT='TRANSLATION',
+Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',
+Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',
+Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',
+Year int(4) FIELD_FORMAT='DATEPUB'
+)
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';
+SELECT * FROM t1;
+ISBN	Language	Subject	AuthorFN	AuthorLN	Title	Translation	Translator	Publisher	Location	Year
+9782212090819	fr	applications	Jean-Christophe and François	Bernadac and Knab	Construire une application XML			Eyrolles	Paris	1999
+9782840825685	fr	applications	William J.	Pardi	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press	Paris	1999
+DROP TABLE t1;
+#
+# Testing expanding authors
+#
+CREATE TABLE t1
+(
+ISBN CHAR(15),
+Language CHAR(2) FIELD_FORMAT='LANG',
+Subject CHAR(32) FIELD_FORMAT='SUBJECT',
+AuthorFN CHAR(128) FIELD_FORMAT='AUTHOR:[X]:FIRSTNAME',
+AuthorLN CHAR(128) FIELD_FORMAT='AUTHOR:[X]:LASTNAME',
+Title CHAR(32) FIELD_FORMAT='TITLE',
+Translation CHAR(32) FIELD_FORMAT='TRANSLATION',
+Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',
+Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',
+Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',
+Year int(4) FIELD_FORMAT='DATEPUB'
+)
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';
+SELECT * FROM t1;
+ISBN	Language	Subject	AuthorFN	AuthorLN	Title	Translation	Translator	Publisher	Location	Year
+9782212090819	fr	applications	Jean-Christophe	Bernadac	Construire une application XML			Eyrolles	Paris	1999
+9782212090819	fr	applications	François	Knab	Construire une application XML			Eyrolles	Paris	1999
+9782840825685	fr	applications	William J.	Pardi	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press	Paris	1999
+UPDATE t1 SET AuthorFN = 'Philippe' WHERE AuthorLN = 'Knab';
+SELECT * FROM t1 WHERE ISBN = '9782212090819';
+ISBN	Language	Subject	AuthorFN	AuthorLN	Title	Translation	Translator	Publisher	Location	Year
+9782212090819	fr	applications	Jean-Christophe	Bernadac	Construire une application XML			Eyrolles	Paris	1999
+9782212090819	fr	applications	Philippe	Knab	Construire une application XML			Eyrolles	Paris	1999
+#
+# To add an author a new table must be created
+#
+CREATE TABLE t2 (
+FIRSTNAME CHAR(32),
+LASTNAME CHAR(32))
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn' OPTION_LIST='Object=[2]:AUTHOR';
+SELECT * FROM t2;
+FIRSTNAME	LASTNAME
+William J.	Pardi
+INSERT INTO t2 VALUES('Charles','Dickens');
+SELECT * FROM t1;
+ISBN	Language	Subject	AuthorFN	AuthorLN	Title	Translation	Translator	Publisher	Location	Year
+9782212090819	fr	applications	Jean-Christophe	Bernadac	Construire une application XML			Eyrolles	Paris	1999
+9782212090819	fr	applications	Philippe	Knab	Construire une application XML			Eyrolles	Paris	1999
+9782840825685	fr	applications	William J.	Pardi	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press	Paris	1999
+9782840825685	fr	applications	Charles	Dickens	XML en Action	adapté de l'anglais par	James Guerin	Microsoft Press	Paris	1999
+DROP TABLE t1;
+DROP TABLE t2;
+#
+# Check the biblio file has the good format
+#
+CREATE TABLE t1
+(
+line char(255)
+)
+ENGINE=CONNECT TABLE_TYPE=DOS FILE_NAME='biblio.jsn';
+SELECT * FROM t1;
+line
+[
+	{
+		"ISBN": "9782212090819",
+		"LANG": "fr",
+		"SUBJECT": "applications",
+		"AUTHOR": [
+			{
+				"FIRSTNAME": "Jean-Christophe",
+				"LASTNAME": "Bernadac"
+			},
+			{
+				"FIRSTNAME": "Philippe",
+				"LASTNAME": "Knab"
+			}
+		],
+		"TITLE": "Construire une application XML",
+		"PUBLISHER": {
+			"NAME": "Eyrolles",
+			"PLACE": "Paris"
+		},
+		"DATEPUB": 1999
+	},
+	{
+		"ISBN": "9782840825685",
+		"LANG": "fr",
+		"SUBJECT": "applications",
+		"AUTHOR": [
+			{
+				"FIRSTNAME": "William J.",
+				"LASTNAME": "Pardi"
+			},
+			{
+				"FIRSTNAME": "Charles",
+				"LASTNAME": "Dickens"
+			}
+		],
+		"TITLE": "XML en Action",
+		"TRANSLATION": "adapté de l'anglais par",
+		"TRANSLATOR": {
+			"FIRSTNAME": "James",
+			"LASTNAME": "Guerin"
+		},
+		"PUBLISHER": {
+			"NAME": "Microsoft Press",
+			"PLACE": "Paris"
+		},
+		"DATEPUB": 1999
+	}
+]
+DROP TABLE t1;
+#
+# A file with 2 arrays
+#
+CREATE TABLE t1 (
+WHO CHAR(12),
+WEEK INT(2) FIELD_FORMAT='WEEK:[X]:NUMBER',
+WHAT CHAR(32) FIELD_FORMAT='WEEK::EXPENSE:["+"]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK::EXPENSE:[+]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';
+SELECT * FROM t1;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer+Food+Food+Car	69.00
+Joe	4	Beer+Beer+Food+Food+Beer	83.00
+Joe	5	Beer+Food	26.00
+Beth	3	Beer	16.00
+Beth	4	Food+Beer	32.00
+Beth	5	Food+Beer	32.00
+Janet	3	Car+Food+Beer	55.00
+Janet	4	Car	17.00
+Janet	5	Beer+Car+Beer+Food	57.00
+DROP TABLE t1;
+#
+# Cannot be fully expanded
+#
+CREATE TABLE t1 (
+WHO CHAR(12),
+WEEK INT(2) FIELD_FORMAT='WEEK:[X]:NUMBER',
+WHAT CHAR(32) FIELD_FORMAT='WEEK:[X]:EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[X]:EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';
+SELECT * FROM t1;
+ERROR HY000: Got error 174 'Cannot expand more than one array' from CONNECT
+DROP TABLE t1;
+#
+# Expand expense in 3 one week tables
+#
+CREATE TABLE t2 (
+WHO CHAR(12),
+WEEK INT(2) FIELD_FORMAT='WEEK:[1]:NUMBER',
+WHAT CHAR(32) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';
+SELECT * FROM t2;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer	18.00
+Joe	3	Food	12.00
+Joe	3	Food	19.00
+Joe	3	Car	20.00
+Beth	3	Beer	16.00
+Janet	3	Car	19.00
+Janet	3	Food	18.00
+Janet	3	Beer	18.00
+CREATE TABLE t3 (
+WHO CHAR(12),
+WEEK INT(2) FIELD_FORMAT='WEEK:[2]:NUMBER',
+WHAT CHAR(32) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';
+SELECT * FROM t3;
+WHO	WEEK	WHAT	AMOUNT
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+CREATE TABLE t4 (
+WHO CHAR(12),
+WEEK INT(2) FIELD_FORMAT='WEEK:[3]:NUMBER',
+WHAT CHAR(32) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';
+SELECT * FROM t4;
+WHO	WEEK	WHAT	AMOUNT
+Joe	5	Beer	14.00
+Joe	5	Food	12.00
+Beth	5	Food	12.00
+Beth	5	Beer	20.00
+Janet	5	Beer	14.00
+Janet	5	Car	12.00
+Janet	5	Beer	19.00
+Janet	5	Food	12.00
+#
+# The expanded table is made as a TBL table
+#
+CREATE TABLE t1 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32),
+AMOUNT DOUBLE(8,2))
+ENGINE=CONNECT TABLE_TYPE=TBL TABLE_LIST='t2,t3,t4';
+SELECT * FROM t1;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer	18.00
+Joe	3	Food	12.00
+Joe	3	Food	19.00
+Joe	3	Car	20.00
+Beth	3	Beer	16.00
+Janet	3	Car	19.00
+Janet	3	Food	18.00
+Janet	3	Beer	18.00
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+Joe	5	Beer	14.00
+Joe	5	Food	12.00
+Beth	5	Food	12.00
+Beth	5	Beer	20.00
+Janet	5	Beer	14.00
+Janet	5	Car	12.00
+Janet	5	Beer	19.00
+Janet	5	Food	12.00
+DROP TABLE t1, t2, t3, t4;
+#
+# Three partial JSON tables
+#
+CREATE TABLE t2 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp3.jsn';
+SELECT * FROM t2;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer	18.00
+Joe	3	Food	12.00
+Joe	3	Food	19.00
+Joe	3	Car	20.00
+Beth	3	Beer	16.00
+Janet	3	Car	19.00
+Janet	3	Food	18.00
+Janet	3	Beer	18.00
+CREATE TABLE t3 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp4.jsn';
+SELECT * FROM t3;
+WHO	WEEK	WHAT	AMOUNT
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+CREATE TABLE t4 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp5.jsn';
+SELECT * FROM t4;
+WHO	WEEK	WHAT	AMOUNT
+Joe	5	Beer	14.00
+Joe	5	Food	12.00
+Beth	5	Food	12.00
+Beth	5	Beer	20.00
+Janet	5	Beer	14.00
+Janet	5	Car	12.00
+Janet	5	Beer	19.00
+Janet	5	Food	12.00
+#
+# The complete table can be a multiple JSON table
+#
+CREATE TABLE t1 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1;
+SELECT * FROM t1;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer	18.00
+Joe	3	Food	12.00
+Joe	3	Food	19.00
+Joe	3	Car	20.00
+Beth	3	Beer	16.00
+Janet	3	Car	19.00
+Janet	3	Food	18.00
+Janet	3	Beer	18.00
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+Joe	5	Beer	14.00
+Joe	5	Food	12.00
+Beth	5	Food	12.00
+Beth	5	Beer	20.00
+Janet	5	Beer	14.00
+Janet	5	Car	12.00
+Janet	5	Beer	19.00
+Janet	5	Food	12.00
+DROP TABLE t1;
+#
+# Or also a partition JSON table
+#
+CREATE TABLE t1 (
+WHO CHAR(12),
+WEEK INT(2),
+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp%s.jsn';
+ALTER TABLE t1
+PARTITION BY LIST COLUMNS(WEEK) (
+PARTITION `3` VALUES IN(3),
+PARTITION `4` VALUES IN(4),
+PARTITION `5` VALUES IN(5));
+Warnings:
+Warning	1105	Data repartition in 3 is unchecked
+Warning	1105	Data repartition in 4 is unchecked
+Warning	1105	Data repartition in 5 is unchecked
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1105	Data repartition in 3 is unchecked
+Warning	1105	Data repartition in 4 is unchecked
+Warning	1105	Data repartition in 5 is unchecked
+SELECT * FROM t1;
+WHO	WEEK	WHAT	AMOUNT
+Joe	3	Beer	18.00
+Joe	3	Food	12.00
+Joe	3	Food	19.00
+Joe	3	Car	20.00
+Beth	3	Beer	16.00
+Janet	3	Car	19.00
+Janet	3	Food	18.00
+Janet	3	Beer	18.00
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+Joe	5	Beer	14.00
+Joe	5	Food	12.00
+Beth	5	Food	12.00
+Beth	5	Beer	20.00
+Janet	5	Beer	14.00
+Janet	5	Car	12.00
+Janet	5	Beer	19.00
+Janet	5	Food	12.00
+SELECT * FROM t1 WHERE WEEK = 4;
+WHO	WEEK	WHAT	AMOUNT
+Joe	4	Beer	19.00
+Joe	4	Beer	16.00
+Joe	4	Food	17.00
+Joe	4	Food	17.00
+Joe	4	Beer	14.00
+Beth	4	Food	17.00
+Beth	4	Beer	15.00
+Janet	4	Car	17.00
+DROP TABLE t1, t2, t3, t4;
diff --git a/storage/connect/mysql-test/connect/std_data/biblio.jsn b/storage/connect/mysql-test/connect/std_data/biblio.jsn
new file mode 100644
index 00000000000..bab8fd24305
--- /dev/null
+++ b/storage/connect/mysql-test/connect/std_data/biblio.jsn
@@ -0,0 +1,45 @@
+[

+  {

+    "ISBN": "9782212090819",

+    "LANG": "fr",

+    "SUBJECT": "applications",

+    "AUTHOR": [

+      {

+        "FIRSTNAME": "Jean-Christophe",

+        "LASTNAME": "Bernadac"

+      },

+      {

+        "FIRSTNAME": "François",

+        "LASTNAME": "Knab"

+      }

+    ],

+    "TITLE": "Construire une application XML",

+    "PUBLISHER": {

+      "NAME": "Eyrolles",

+      "PLACE": "Paris"

+    },

+    "DATEPUB": 1999

+  },

+  {

+    "ISBN": "9782840825685",

+    "LANG": "fr",

+    "SUBJECT": "applications",

+    "AUTHOR": [

+      {

+        "FIRSTNAME": "William J.",

+        "LASTNAME": "Pardi"

+      }

+    ],

+    "TITLE": "XML en Action",

+    "TRANSLATION": "adapté de l'anglais par",

+    "TRANSLATOR": {

+      "FIRSTNAME": "James",

+      "LASTNAME": "Guerin"

+    },

+    "PUBLISHER": {

+      "NAME": "Microsoft Press",

+      "PLACE": "Paris"

+    },

+    "DATEPUB": 1999

+  }

+]

diff --git a/storage/connect/mysql-test/connect/std_data/expense.jsn b/storage/connect/mysql-test/connect/std_data/expense.jsn
new file mode 100644
index 00000000000..e65ad5261f1
--- /dev/null
+++ b/storage/connect/mysql-test/connect/std_data/expense.jsn
@@ -0,0 +1,158 @@
+[

+  {

+    "WHO": "Joe",

+    "WEEK": [

+      {

+        "NUMBER": 3,

+        "EXPENSE": [

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 18.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 12.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 19.00

+          },

+          {

+            "WHAT": "Car",

+            "AMOUNT": 20.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 4,

+        "EXPENSE": [

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 19.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 16.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 17.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 17.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 14.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 5,

+        "EXPENSE": [

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 14.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 12.00

+          }

+        ]

+      }

+    ]

+  },

+  {

+    "WHO": "Beth",

+    "WEEK": [

+      {

+        "NUMBER": 3,

+        "EXPENSE": [

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 16.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 4,

+        "EXPENSE": [

+          {

+            "WHAT": "Food",

+            "AMOUNT": 17.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 15.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 5,

+        "EXPENSE": [

+          {

+            "WHAT": "Food",

+            "AMOUNT": 12.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 20.00

+          }

+        ]

+      }

+    ]

+  },

+  {

+    "WHO": "Janet",

+    "WEEK": [

+      {

+        "NUMBER": 3,

+        "EXPENSE": [

+          {

+            "WHAT": "Car",

+            "AMOUNT": 19.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 18.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 18.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 4,

+        "EXPENSE": [

+          {

+            "WHAT": "Car",

+            "AMOUNT": 17.00

+          }

+        ]

+      },

+      {

+        "NUMBER": 5,

+        "EXPENSE": [

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 14.00

+          },

+          {

+            "WHAT": "Car",

+            "AMOUNT": 12.00

+          },

+          {

+            "WHAT": "Beer",

+            "AMOUNT": 19.00

+          },

+          {

+            "WHAT": "Food",

+            "AMOUNT": 12.00

+          }

+        ]

+      }

+    ]

+  }

+]

diff --git a/storage/connect/mysql-test/connect/std_data/mulexp3.jsn b/storage/connect/mysql-test/connect/std_data/mulexp3.jsn
new file mode 100644
index 00000000000..c228448b073
--- /dev/null
+++ b/storage/connect/mysql-test/connect/std_data/mulexp3.jsn
@@ -0,0 +1,52 @@
+[

+  {

+    "WHO": "Joe",

+    "WEEK": 3,

+    "EXPENSE": [

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 18.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 12.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 19.00

+      },

+      {

+        "WHAT": "Car",

+        "AMOUNT": 20.00

+      }

+    ]

+  },

+  {

+    "WHO": "Beth",

+    "WEEK": 3,

+    "EXPENSE": [

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 16.00

+      }

+    ]

+  },

+  {

+    "WHO": "Janet",

+    "WEEK": 3,

+    "EXPENSE": [

+      {

+        "WHAT": "Car",

+        "AMOUNT": 19.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 18.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 18.00

+      }

+    ]

+  }

+]

diff --git a/storage/connect/mysql-test/connect/std_data/mulexp4.jsn b/storage/connect/mysql-test/connect/std_data/mulexp4.jsn
new file mode 100644
index 00000000000..0e43ffec07b
--- /dev/null
+++ b/storage/connect/mysql-test/connect/std_data/mulexp4.jsn
@@ -0,0 +1,52 @@
+[

+  {

+    "WHO": "Joe",

+    "WEEK": 4,

+    "EXPENSE": [

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 19.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 16.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 17.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 17.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 14.00

+      }

+    ]

+  },

+  {

+    "WHO": "Beth",

+    "WEEK": 4,

+    "EXPENSE": [

+      {

+        "WHAT": "Food",

+        "AMOUNT": 17.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 15.00

+      }

+    ]

+  },

+  {

+    "WHO": "Janet",

+    "WEEK": 4,

+    "EXPENSE": [

+      {

+        "WHAT": "Car",

+        "AMOUNT": 17.00

+      }

+    ]

+  }

+]

diff --git a/storage/connect/mysql-test/connect/std_data/mulexp5.jsn b/storage/connect/mysql-test/connect/std_data/mulexp5.jsn
new file mode 100644
index 00000000000..7a707506c2f
--- /dev/null
+++ b/storage/connect/mysql-test/connect/std_data/mulexp5.jsn
@@ -0,0 +1,52 @@
+[

+  {

+    "WHO": "Joe",

+    "WEEK": 5,

+    "EXPENSE": [

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 14.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 12.00

+      }

+    ]

+  },

+  {

+    "WHO": "Beth",

+    "WEEK": 5,

+    "EXPENSE": [

+      {

+        "WHAT": "Food",

+        "AMOUNT": 12.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 20.00

+      }

+    ]

+  },

+  {

+    "WHO": "Janet",

+    "WEEK": 5,

+    "EXPENSE": [

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 14.00

+      },

+      {

+        "WHAT": "Car",

+        "AMOUNT": 12.00

+      },

+      {

+        "WHAT": "Beer",

+        "AMOUNT": 19.00

+      },

+      {

+        "WHAT": "Food",

+        "AMOUNT": 12.00

+      }

+    ]

+  }

+]

diff --git a/storage/connect/mysql-test/connect/t/json.test b/storage/connect/mysql-test/connect/t/json.test
new file mode 100644
index 00000000000..08297e5c556
--- /dev/null
+++ b/storage/connect/mysql-test/connect/t/json.test
@@ -0,0 +1,247 @@
+--source include/not_embedded.inc

+--source include/have_partition.inc

+

+let $MYSQLD_DATADIR= `select @@datadir`;

+

+--copy_file $MTR_SUITE_DIR/std_data/biblio.jsn $MYSQLD_DATADIR/test/biblio.jsn

+--copy_file $MTR_SUITE_DIR/std_data/expense.jsn $MYSQLD_DATADIR/test/expense.jsn

+--copy_file $MTR_SUITE_DIR/std_data/mulexp3.jsn $MYSQLD_DATADIR/test/mulexp3.jsn

+--copy_file $MTR_SUITE_DIR/std_data/mulexp4.jsn $MYSQLD_DATADIR/test/mulexp4.jsn

+--copy_file $MTR_SUITE_DIR/std_data/mulexp5.jsn $MYSQLD_DATADIR/test/mulexp5.jsn

+

+--echo #

+--echo # Testing doc samples

+--echo #

+CREATE TABLE t1

+(

+  ISBN CHAR(15),

+  LANG CHAR(2),

+  SUBJECT CHAR(32),

+  AUTHOR CHAR(64),

+  TITLE CHAR(32),

+  TRANSLATION CHAR(32),

+  TRANSLATOR CHAR(80),

+  PUBLISHER CHAR(32),

+  DATEPUB int(4)

+) ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';

+SELECT * FROM t1;

+DROP TABLE t1;

+

+

+--echo #

+--echo # Testing Jpath. Get the number of authors

+--echo #

+CREATE TABLE t1

+(

+  ISBN CHAR(15),

+  Language CHAR(2) FIELD_FORMAT='LANG',

+  Subject CHAR(32) FIELD_FORMAT='SUBJECT',

+  Authors INT(2) FIELD_FORMAT='AUTHOR:[#]',

+  Title CHAR(32) FIELD_FORMAT='TITLE',

+  Translation CHAR(32) FIELD_FORMAT='TRANSLATION',

+  Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',

+  Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',

+  Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',

+  Year int(4) FIELD_FORMAT='DATEPUB'

+)

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # Concatenates the authors

+--echo #

+CREATE TABLE t1

+(

+  ISBN CHAR(15),

+  Language CHAR(2) FIELD_FORMAT='LANG',

+  Subject CHAR(32) FIELD_FORMAT='SUBJECT',

+  AuthorFN CHAR(128) FIELD_FORMAT='AUTHOR:[" and "]:FIRSTNAME',

+  AuthorLN CHAR(128) FIELD_FORMAT='AUTHOR:[" and "]:LASTNAME',

+  Title CHAR(32) FIELD_FORMAT='TITLE',

+  Translation CHAR(32) FIELD_FORMAT='TRANSLATION',

+  Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',

+  Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',

+  Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',

+  Year int(4) FIELD_FORMAT='DATEPUB'

+)

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # Testing expanding authors

+--echo #

+CREATE TABLE t1

+(

+  ISBN CHAR(15),

+  Language CHAR(2) FIELD_FORMAT='LANG',

+  Subject CHAR(32) FIELD_FORMAT='SUBJECT',

+  AuthorFN CHAR(128) FIELD_FORMAT='AUTHOR:[X]:FIRSTNAME',

+  AuthorLN CHAR(128) FIELD_FORMAT='AUTHOR:[X]:LASTNAME',

+  Title CHAR(32) FIELD_FORMAT='TITLE',

+  Translation CHAR(32) FIELD_FORMAT='TRANSLATION',

+  Translator CHAR(80) FIELD_FORMAT='TRANSLATOR',

+  Publisher CHAR(20) FIELD_FORMAT='PUBLISHER:NAME',

+  Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',

+  Year int(4) FIELD_FORMAT='DATEPUB'

+)

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn';

+SELECT * FROM t1;

+UPDATE t1 SET AuthorFN = 'Philippe' WHERE AuthorLN = 'Knab';

+SELECT * FROM t1 WHERE ISBN = '9782212090819';

+

+--echo #

+--echo # To add an author a new table must be created

+--echo #

+CREATE TABLE t2 (

+FIRSTNAME CHAR(32),

+LASTNAME CHAR(32))

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.jsn' OPTION_LIST='Object=[2]:AUTHOR';

+SELECT * FROM t2;

+INSERT INTO t2 VALUES('Charles','Dickens');

+SELECT * FROM t1;

+DROP TABLE t1;

+DROP TABLE t2;

+

+--echo #

+--echo # Check the biblio file has the good format

+--echo #

+CREATE TABLE t1

+(

+  line char(255)

+)

+ENGINE=CONNECT TABLE_TYPE=DOS FILE_NAME='biblio.jsn';

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # A file with 2 arrays

+--echo #

+CREATE TABLE t1 (

+WHO CHAR(12),

+WEEK INT(2) FIELD_FORMAT='WEEK:[X]:NUMBER',

+WHAT CHAR(32) FIELD_FORMAT='WEEK::EXPENSE:["+"]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK::EXPENSE:[+]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # Cannot be fully expanded

+--echo #

+CREATE TABLE t1 (

+WHO CHAR(12),

+WEEK INT(2) FIELD_FORMAT='WEEK:[X]:NUMBER',

+WHAT CHAR(32) FIELD_FORMAT='WEEK:[X]:EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[X]:EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';

+--error ER_GET_ERRMSG

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # Expand expense in 3 one week tables

+--echo #

+CREATE TABLE t2 (

+WHO CHAR(12),

+WEEK INT(2) FIELD_FORMAT='WEEK:[1]:NUMBER',

+WHAT CHAR(32) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';

+SELECT * FROM t2;

+

+CREATE TABLE t3 (

+WHO CHAR(12),

+WEEK INT(2) FIELD_FORMAT='WEEK:[2]:NUMBER',

+WHAT CHAR(32) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';

+SELECT * FROM t3;

+

+CREATE TABLE t4 (

+WHO CHAR(12),

+WEEK INT(2) FIELD_FORMAT='WEEK:[3]:NUMBER',

+WHAT CHAR(32) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.jsn';

+SELECT * FROM t4;

+

+--echo #

+--echo # The expanded table is made as a TBL table

+--echo #

+CREATE TABLE t1 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32),

+AMOUNT DOUBLE(8,2))

+ENGINE=CONNECT TABLE_TYPE=TBL TABLE_LIST='t2,t3,t4';

+SELECT * FROM t1;

+DROP TABLE t1, t2, t3, t4;

+

+--echo #

+--echo # Three partial JSON tables

+--echo #

+CREATE TABLE t2 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp3.jsn';

+SELECT * FROM t2;

+

+CREATE TABLE t3 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp4.jsn';

+SELECT * FROM t3;

+

+CREATE TABLE t4 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp5.jsn';

+SELECT * FROM t4;

+

+--echo #

+--echo # The complete table can be a multiple JSON table

+--echo #

+CREATE TABLE t1 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1;

+SELECT * FROM t1;

+DROP TABLE t1;

+

+--echo #

+--echo # Or also a partition JSON table

+--echo #

+CREATE TABLE t1 (

+WHO CHAR(12),

+WEEK INT(2),

+WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',

+AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')

+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp%s.jsn';

+ALTER TABLE t1

+PARTITION BY LIST COLUMNS(WEEK) (

+PARTITION `3` VALUES IN(3),

+PARTITION `4` VALUES IN(4),

+PARTITION `5` VALUES IN(5));

+SHOW WARNINGS;

+SELECT * FROM t1;

+SELECT * FROM t1 WHERE WEEK = 4;

+DROP TABLE t1, t2, t3, t4;

+

+#

+# Clean up

+#

+--remove_file $MYSQLD_DATADIR/test/biblio.jsn

+--remove_file $MYSQLD_DATADIR/test/expense.jsn

+--remove_file $MYSQLD_DATADIR/test/mulexp3.jsn

+--remove_file $MYSQLD_DATADIR/test/mulexp4.jsn

+--remove_file $MYSQLD_DATADIR/test/mulexp5.jsn