WL12151 DevAPI: Indexing array fields

Author: Bogdan Degtyariov

common/collection.cc

@@ -144,7 +144,7 @@ struct Field_conv
     Any_prc* key_val(const string &key) override
     {
       static const std::set<std::string> allowed_keys =
-      { "field", "type", "required", "options", "srid" };
+      { "field", "type", "required", "options", "srid", "array" };
 
       std::string field_name = to_lower(key);
 

devapi/tests/ddl-t.cc

@@ -324,6 +324,14 @@ TEST_F(Ddl, create_index)
     R"({ "type" : "SPATIAL", "fields": [{ "field": "$.coords", "type" : "GEOJSON", "required" : false }] })")
              );
 
+  SKIP_IF_SERVER_VERSION_LESS(8, 0, 17);
+
+  cout << "Array index" << endl;
+  coll.createIndex("arr_idx",
+    R"-({ "fields": [{ "field": "$.zip", "type" : "CHAR(5)", "array" : true }] })-"
+  );
+  coll.dropIndex("arr_idx");
+
   cout << "Done!" << endl;
 }
 

xapi/tests/xapi_crud-t.cc

@@ -217,18 +217,19 @@ TEST_F(xapi, test_create_collection_index)
   const char *schema_name = "cc_crud_test";
   const char *coll_name = "index_test";
   const char *json[] = {
-    "{\"zip\": \"34239\", \"zcount\": \"10\", \"some_text\": \"just some text\"}",
-    "{\"zip\": \"30001\", \"zcount\": \"20\", \"some_text\": \"some more text\"}"
+    "{\"zip\": [\"34239\", \"23456\"], \"zcount\": \"10\", \"some_text\": \"just some text\"}",
+    "{\"zip\": [\"00001\", \"23456\"], \"zcount\": \"20\", \"some_text\": \"some more text\"}"
   };
 
   const char *geo_json =
   "{\"zip\": \"34239\", \"coords\" : { \"type\": \"Point\", \"coordinates\": [102.0, 0.0] }}";
 
   const char *json_idx = "{"\
              "\"fields\": ["\
-             "{ \"field\": \"$.zip\", \"required\" : true , \"type\" : \"TEXT(10)\" },"\
+             "{ \"field\": \"$.zip\", \"required\" : true , \"type\" : \"TEXT(10)\"},"\
              "{ \"field\": \"$.zcount\", \"type\" : \"INT UNSIGNED\" }]}";
 
+
   const char *geo_json_idx = "{"
              "\"type\" : \"SPATIAL\","
              "\"fields\": [{"
@@ -284,6 +285,20 @@ TEST_F(xapi, test_create_collection_index)
 
   EXPECT_EQ(RESULT_OK,
             mysqlx_collection_drop_index(collection, "geo_idx1"));
+
+  SKIP_IF_SERVER_VERSION_LESS(8, 0, 17);
+
+  EXPECT_EQ(RESULT_OK, mysqlx_collection_drop(schema, coll_name));
+  EXPECT_EQ(RESULT_OK, mysqlx_collection_create(schema, coll_name));
+  collection = mysqlx_get_collection(schema, coll_name, 0);
+
+  const char *multival_idx = "{"\
+            "\"fields\": ["\
+            "{ \"field\": \"$.zip\", \"type\" : \"CHAR(10)\", \"array\" : true}]}";
+  printf("\nCreate multivalue index.");
+  EXPECT_EQ(RESULT_OK,
+            mysqlx_collection_create_index(collection, "multival_idx1", multival_idx));
+  EXPECT_EQ(RESULT_OK, mysqlx_collection_drop(schema, coll_name));
 }