Browse Source

Fix failing doc tests in feature/seq_no

This commit fixes failing doc tests in feature/seq_no after merging
master into this branch.
Jason Tedor 9 years ago
parent
commit
8879360f66

+ 13 - 5
docs/reference/docs/bulk.asciidoc

@@ -98,7 +98,9 @@ The result of this bulk operation is:
                "failed": 0
             },
             "created": true,
-            "status": 201
+            "status": 201,
+            "_seq_no" : 0,
+            "_shard_id" : 0
          }
       },
       {
@@ -114,7 +116,9 @@ The result of this bulk operation is:
                "successful": 1,
                "failed": 0
             },
-            "status": 404
+            "status": 404,
+            "_seq_no" : 1,
+            "_shard_id" : 1
          }
       },
       {
@@ -130,7 +134,9 @@ The result of this bulk operation is:
                "failed": 0
             },
             "created": true,
-            "status": 201
+            "status": 201,
+            "_seq_no" : 2,
+            "_shard_id" : 2
          }
       },
       {
@@ -145,13 +151,15 @@ The result of this bulk operation is:
                 "successful": 1,
                 "failed": 0
             },
-            "status": 200
+            "status": 200,
+            "_seq_no" : 3,
+            "_shard_id" : 3
          }
       }
    ]
 }
 --------------------------------------------------
-// TESTRESPONSE[s/"took": 30/"took": $body.took/ s/"index_uuid": .../"index_uuid": $body.items.3.update.error.index_uuid/]
+// TESTRESPONSE[s/"took": 30/"took": $body.took/ s/"index_uuid": .../"index_uuid": $body.items.3.update.error.index_uuid/ s/"_shard_id" : 0/"_shard_id" : $body.items.0.index._shard_id/ s/"_shard_id" : 1/"_shard_id" : $body.items.1.delete._shard_id/ s/"_shard_id" : 2/"_shard_id" : $body.items.2.create._shard_id/ s/"_shard_id" : 3/"_shard_id" : $body.items.3.update._shard_id/ s/"_seq_no" : 0/"_seq_no" : $body.items.0.index._seq_no/ s/"_seq_no" : 1/"_seq_no" : $body.items.1.delete._seq_no/ s/"_seq_no" : 2/"_seq_no" : $body.items.2.create._seq_no/ s/"_seq_no" : 3/"_seq_no" : $body.items.3.update._seq_no/]
 
 The endpoints are `/_bulk`, `/{index}/_bulk`, and `{index}/{type}/_bulk`.
 When the index or the index/type are provided, they will be used by

+ 0 - 5
docs/reference/docs/index_.asciidoc

@@ -33,7 +33,6 @@ The result of the above index operation is:
     "created" : true,
     "_seq_no" : 0,
     "_shard_id" : 3,
-    "forced_refresh": false
     "result" : created
 }
 --------------------------------------------------
@@ -234,13 +233,9 @@ The result of the above index operation is:
     "_id" : "6a8ca01c-7896-48e9-81cc-9f70661fcb32",
     "_version" : 1,
     "created" : true,
-<<<<<<< HEAD
     "_seq_no" : 0,
     "_shard_id" : 2,
-    "forced_refresh": false
-=======
     "result": "created"
->>>>>>> master
 }
 --------------------------------------------------
 // TESTRESPONSE[s/6a8ca01c-7896-48e9-81cc-9f70661fcb32/$body._id/ s/"successful" : 2/"successful" : 1/ s/"_shard_id" : 2/"_shard_id" : "$body._shard_id"/]

+ 3 - 2
docs/reference/docs/update.asciidoc

@@ -170,10 +170,11 @@ the request was ignored.
    "_type": "type1",
    "_id": "1",
    "_version": 6,
-   "result": noop
+   "result": noop,
+   "_shard_id" : 3
 }
 --------------------------------------------------
-// TESTRESPONSE
+// TESTRESPONSE[s/"_shard_id" : 3/"_shard_id" : "$body._shard_id"/]
 
 You can disable this behavior by setting "detect_noop": false like this:
 

+ 4 - 2
docs/reference/ingest/ingest-node.asciidoc

@@ -825,10 +825,12 @@ PUT /myindex/type/1?pipeline=monthlyindex
     "successful" : 1,
     "failed" : 0
   },
-  "created" : true
+  "created" : true,
+  "_shard_id" : 3,
+  "_seq_no" : 0
 }
 --------------------------------------------------
-// TESTRESPONSE
+// TESTRESPONSE[s/"_shard_id" : 3/"_shard_id" : "$body._shard_id"/]
 
 
 The above request will not index this document into the `myindex` index, but into the `myindex-2016-04-01` index because

+ 4 - 2
docs/reference/query-dsl/percolate-query.asciidoc

@@ -181,10 +181,12 @@ Index response:
     "failed": 0
   },
   "created": true,
-  "result": "created"
+  "result": "created",
+  "_shard_id" : 3,
+  "_seq_no" : 1
 }
 --------------------------------------------------
-// TESTRESPONSE
+// TESTRESPONSE[s/"_shard_id" : 3/"_shard_id" : "$body._shard_id"/]
 
 Percolating an existing document, using the index response as basis to build to new search request: