Fix test bwc issue

liketic · liketic · commit 2024751c8be2 · 2018-04-03T11:33:34.000+08:00
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json b/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json
@@ -37,10 +37,6 @@
           "type" : "string",
           "description" : "Default document type for items which don't provide one"
         },
-        "fields": {
-          "type": "list",
-          "description" : "Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request"
-        },
         "_source": {
           "type" : "list",
           "description" : "True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request"
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update.json
@@ -27,10 +27,6 @@
           "type": "string",
           "description": "Sets the number of shard copies that must be active before proceeding with the update operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)"
         },
-        "fields": {
-          "type": "list",
-          "description": "A comma-separated list of fields to return in the response"
-        },
         "_source": {
           "type" : "list",
           "description" : "True or false to return the _source field or not, or a list of fields to return"
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
@@ -1,5 +1,9 @@
 ---
 "Source filtering":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
+
   - do:
       index:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
@@ -1,5 +1,8 @@
 ---
 "Update check shard header":
+ - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
@@ -1,5 +1,8 @@
 ---
 "Update result field":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
   - do:
       update:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
@@ -1,5 +1,8 @@
 ---
 "Doc upsert":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
   - do:
       update:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
@@ -1,5 +1,8 @@
 ---
 "Doc as upsert":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
   - do:
       update:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yml
@@ -1,7 +1,10 @@
 ---
 "Internal version":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
- - do:
+  - do:
       catch:        missing
       update:
           index:    test_1
@@ -11,15 +14,15 @@
           body:
             doc:    { foo: baz }
 
- - do:
+  - do:
       index:
           index:    test_1
           type:     test
           id:       1
           body:
             doc:    { foo: baz }
 
- - do:
+  - do:
       catch:        conflict
       update:
           index:    test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
@@ -1,5 +1,8 @@
 ---
 "Routing":
+ - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml
@@ -9,8 +9,11 @@ setup:
                 _parent: { type: "foo" }
 ---
 "Parent":
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
- - do:
+  - do:
       catch:      /routing_missing_exception/
       update:
           index:   test_1
@@ -20,7 +23,7 @@ setup:
             doc:        { foo: baz }
             upsert:     { foo: bar }
 
- - do:
+  - do:
       update:
           index:   test_1
           type:    test
@@ -30,18 +33,18 @@ setup:
             doc:        { foo: baz }
             upsert:     { foo: bar }
 
- - do:
+  - do:
       get:
           index:   test_1
           type:    test
           id:      1
           parent:  5
           stored_fields:  [_parent, _routing]
 
- - match: { _parent:  "5"}
- - match: { _routing: "5"}
+  - match: { _parent:  "5"}
+  - match: { _routing: "5"}
 
- - do:
+  - do:
       update:
           index:   test_1
           type:    test
@@ -51,7 +54,7 @@ setup:
           body:
             doc:        { foo: baz }
 
- - match: { get._source.foo: baz }
+  - match: { get._source.foo: baz }
 
 ---
 "Parent omitted":
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yml
@@ -1,5 +1,8 @@
 ---
 "Parent with routing":
+ - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
@@ -79,37 +79,41 @@
 
 ---
 "refresh=wait_for waits until changes are visible in search":
- - do:
+  - skip:
+      version: " - 6.99.99"
+      reason:  fields dropped in 7.0
+
+  - do:
       index:
           index:   update_60_refresh_1
           type:    test
           id:      update_60_refresh_id1
           body:    { foo: bar }
           refresh: true
- - is_true: forced_refresh
+  - is_true: forced_refresh
 
- - do:
+  - do:
       search:
           index:   update_60_refresh_1
           type:    test
           body:
             query:   { term: { _id: update_60_refresh_id1 }}
- - match: { hits.total: 1 }
+  - match: { hits.total: 1 }
 
- - do:
+  - do:
      update:
          index:   update_60_refresh_1
          type:    test
          id:      update_60_refresh_id1
          refresh: wait_for
          body:
            doc: { test: asdf }
- - is_false: forced_refresh
+  - is_false: forced_refresh
 
- - do:
+  - do:
       search:
           index:   update_60_refresh_1
           type:    test
           body:
             query:   { match: { test: asdf } }
- - match: { hits.total: 1 }
+  - match: { hits.total: 1 }
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
@@ -375,6 +375,9 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null
                             } else {
                                 throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
                             }
+                        } else if (token == XContentParser.Token.START_ARRAY) {
+                            throw new IllegalArgumentException("Malformed action/metadata line [" + line +
+                                "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
                         } else if (token == XContentParser.Token.START_OBJECT && SOURCE.match(currentFieldName, parser.getDeprecationHandler())) {
                             fetchSourceContext = FetchSourceContext.fromXContent(parser);
                         } else if (token != XContentParser.Token.VALUE_NULL) {
diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
@@ -113,9 +113,10 @@ public void testSimpleBulk4() throws Exception {
 
     public void testBulkAllowExplicitIndex() throws Exception {
         String bulkAction1 = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk.json");
-        expectThrows(Exception.class,
+        Exception ex = expectThrows(Exception.class,
             () -> new BulkRequest().add(
                 new BytesArray(bulkAction1.getBytes(StandardCharsets.UTF_8)), null, null, false, XContentType.JSON));
+        assertEquals("explicit index in bulk is not allowed", ex.getMessage());
 
         String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk5.json");
         new BulkRequest().add(new BytesArray(bulkAction.getBytes(StandardCharsets.UTF_8)), "test", null, false, XContentType.JSON);
@@ -174,6 +175,16 @@ public void testSimpleBulk10() throws Exception {
         assertThat(bulkRequest.numberOfActions(), equalTo(9));
     }
 
+    public void testBulkActionShouldNotContainArray() throws Exception {
+        String bulkAction = "{ \"index\":{\"_index\":[\"index1\", \"index2\"],\"_type\":\"type1\",\"_id\":\"1\"} }\r\n"
+            + "{ \"field1\" : \"value1\" }\r\n";
+        BulkRequest bulkRequest = new BulkRequest();
+        IllegalArgumentException exc = expectThrows(IllegalArgumentException.class,
+            () -> bulkRequest.add(bulkAction.getBytes(StandardCharsets.UTF_8), 0, bulkAction.length(), null, null, XContentType.JSON));
+        assertEquals(exc.getMessage(), "Malformed action/metadata line [1]" +
+            ", expected a simple value for field [_index] but found [START_ARRAY]");
+    }
+
     public void testBulkEmptyObject() throws Exception {
         String bulkIndexAction = "{ \"index\":{\"_index\":\"test\",\"_type\":\"type1\",\"_id\":\"1\"} }\r\n";
         String bulkIndexSource = "{ \"field1\" : \"value1\" }\r\n";
diff --git a/server/src/test/java/org/elasticsearch/update/UpdateIT.java b/server/src/test/java/org/elasticsearch/update/UpdateIT.java
@@ -293,8 +293,9 @@ public void testUpdate() throws Exception {
         ensureGreen();
 
         Script fieldIncScript = new Script(ScriptType.INLINE, UPDATE_SCRIPTS, FIELD_INC_SCRIPT, Collections.singletonMap("field", "field"));
-        expectThrows(DocumentMissingException.class,
+        DocumentMissingException ex = expectThrows(DocumentMissingException.class,
             () -> client().prepareUpdate(indexOrAlias(), "type1", "1").setScript(fieldIncScript).execute().actionGet());
+        assertEquals("[type1][1]: document missing", ex.getMessage());
 
         client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
 
