Rename "exists" to "found" in TermVector and Get responses

- Adds the "created" field to the index action response - Reverses Delete class' notFound to Found to avoid double negative
elastic · Jan 7, 2014 · 2cb40fc · benatwork99 · Jan 30, 2014 · dakrone
1 parent d23f640
commit 2cb40fc
Show file tree

Hide file tree

Showing 28 changed files with 85 additions and 92 deletions.
diff --git a/docs/reference/search/termvectors.asciidoc b/docs/reference/search/termvectors.asciidoc
@@ -170,7 +170,7 @@ Response:
     "_index": "twitter",
     "_type": "tweet",
     "_version": 1,
-    "exists": true,
+    "found": true,
     "term_vectors": {
         "text": {
             "field_statistics": {
@@ -222,5 +222,3 @@ Response:
     }
 }
 --------------------------------------------------
-
-
diff --git a/rest-api-spec/test/get/60_realtime_refresh.yaml b/rest-api-spec/test/get/60_realtime_refresh.yaml
@@ -28,7 +28,7 @@
           id:       1
           realtime: 1
 
- - is_true: exists
+ - is_true: found
 
  - do:
       catch:        missing
@@ -46,5 +46,4 @@
           realtime: 0
           refresh:  1
 
- - is_true: exists
-
+ - is_true: found
diff --git a/rest-api-spec/test/mget/10_basic.yaml b/rest-api-spec/test/mget/10_basic.yaml
@@ -23,22 +23,22 @@
             - { _index: test_1, _type: test, _id: 2}
             - { _index: test_1, _type: test, _id: 1}
 
-  - is_false: docs.0.exists
+  - is_false: docs.0.found
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
 
-  - is_false: docs.1.exists
+  - is_false: docs.1.found
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      none        }
   - match:  { docs.1._id:        "1"         }
 
-  - is_false: docs.2.exists
+  - is_false: docs.2.found
   - match:  { docs.2._index:     test_1      }
   - match:  { docs.2._type:      test        }
   - match:  { docs.2._id:        "2"         }
 
-  - is_true:  docs.3.exists
+  - is_true:  docs.3.found
   - match:  { docs.3._index:     test_1      }
   - match:  { docs.3._type:      test        }
   - match:  { docs.3._id:        "1"         }

diff --git a/rest-api-spec/test/mget/11_default_index_type.yaml b/rest-api-spec/test/mget/11_default_index_type.yaml
@@ -25,22 +25,22 @@
             - {                              _id: 2}
             - {                              _id: 1}
 
-  - is_false: docs.0.exists
+  - is_false: docs.0.found
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
 
-  - is_false: docs.1.exists
+  - is_false: docs.1.found
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      none        }
   - match:  { docs.1._id:        "1"         }
 
-  - is_false: docs.2.exists
+  - is_false: docs.2.found
   - match:  { docs.2._index:     test_1      }
   - match:  { docs.2._type:      test        }
   - match:  { docs.2._id:        "2"         }
 
-  - is_true:  docs.3.exists
+  - is_true:  docs.3.found
   - match:  { docs.3._index:     test_1      }
   - match:  { docs.3._type:      test        }
   - match:  { docs.3._id:        "1"         }

diff --git a/rest-api-spec/test/mget/12_non_existent_index.yaml b/rest-api-spec/test/mget/12_non_existent_index.yaml
@@ -17,7 +17,7 @@
           docs:
             - { _index: test_2, _type: test, _id: 1}
 
-  - is_false: docs.0.exists
+  - is_false: docs.0.found
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
@@ -29,8 +29,7 @@
           docs:
             - { _index: test_1, _type: test, _id: 1}
 
-  - is_true:  docs.0.exists
+  - is_true:  docs.0.found
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
-
diff --git a/rest-api-spec/test/mget/13_missing_metadata.yaml b/rest-api-spec/test/mget/13_missing_metadata.yaml
@@ -43,10 +43,9 @@
           docs:
             - { _index: test_1, _id: 1}
 
-  - is_true: docs.0.exists
+  - is_true: docs.0.found
   - match: { docs.0._index:     test_1      }
   - match: { docs.0._type:      test        }
   - match: { docs.0._id:        "1"         }
   - match: { docs.0._version:   1           }
   - match: { docs.0._source:    { foo: bar }}
-
diff --git a/rest-api-spec/test/mget/15_ids.yaml b/rest-api-spec/test/mget/15_ids.yaml
@@ -25,14 +25,14 @@
         body:
           ids: [1, 2]
 
-  - is_true:  docs.0.exists
+  - is_true:  docs.0.found
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
   - match:  { docs.0._version:   1           }
   - match:  { docs.0._source:    { foo: bar }}
 
-  - is_false: docs.1.exists
+  - is_false: docs.1.found
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      test        }
   - match:  { docs.1._id:        "2"         }
@@ -43,14 +43,14 @@
         body:
           ids: [1, 2]
 
-  - is_true:  docs.0.exists
+  - is_true:  docs.0.found
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
   - match:  { docs.0._id:        "1"         }
   - match:  { docs.0._version:   1           }
   - match:  { docs.0._source:    { foo: bar }}
 
-  - is_true:  docs.1.exists
+  - is_true:  docs.1.found
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      test_2      }
   - match:  { docs.1._id:        "2"         }
@@ -70,4 +70,3 @@
       mget:
         index:  test_1
         body:   {}
-
diff --git a/rest-api-spec/test/mget/30_parent.yaml b/rest-api-spec/test/mget/30_parent.yaml
@@ -39,20 +39,19 @@
             - { _id: 1, parent: 4, fields: [ _parent, _routing ] }
             - { _id: 2, parent: 5, fields: [ _parent, _routing ] }
 
- - is_false:  docs.0.exists
- - is_false:  docs.1.exists
+ - is_false:  docs.0.found
+ - is_false:  docs.1.found
 
- - is_true:   docs.2.exists
+ - is_true:   docs.2.found
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
  - match:   { docs.2._id:             "1"    }
  - match:   { docs.2.fields._parent:  "4"    }
  - match:   { docs.2.fields._routing: "4"    }
 
- - is_true:   docs.3.exists
+ - is_true:   docs.3.found
  - match:   { docs.3._index:          test_1 }
  - match:   { docs.3._type:           test   }
  - match:   { docs.3._id:             "2"    }
  - match:   { docs.3.fields._parent:  "5"    }
  - match:   { docs.3.fields._routing: "5"    }
-
diff --git a/rest-api-spec/test/mget/40_routing.yaml b/rest-api-spec/test/mget/40_routing.yaml
@@ -22,10 +22,10 @@
               - { _id: 1, routing: 4 }
               - { _id: 1, routing: 5 }
 
- - is_false:  docs.0.exists
- - is_false:  docs.1.exists
+ - is_false:  docs.0.found
+ - is_false:  docs.1.found
 
- - is_true:   docs.2.exists
+ - is_true:   docs.2.found
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
  - match:   { docs.2._id:             "1"    }

diff --git a/rest-api-spec/test/mget/55_parent_with_routing.yaml b/rest-api-spec/test/mget/55_parent_with_routing.yaml
@@ -32,13 +32,12 @@
             - { _id: 1, parent: 4 }
             - { _id: 1, parent: 4, routing: 5 }
 
- - is_false:  docs.0.exists
- - is_false:  docs.1.exists
+ - is_false:  docs.0.found
+ - is_false:  docs.1.found
 
- - is_true:   docs.2.exists
+ - is_true:   docs.2.found
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
  - match:   { docs.2._id:             "1"    }
  - match:   { docs.2.fields._parent:  "4"    }
  - match:   { docs.2.fields._routing: "5"    }
-
diff --git a/rest-api-spec/test/mget/60_realtime_refresh.yaml b/rest-api-spec/test/mget/60_realtime_refresh.yaml
@@ -29,7 +29,7 @@
           body:
             ids:    [1]
 
- - is_false: docs.0.exists
+ - is_false: docs.0.found
 
  - do:
       mget:
@@ -39,7 +39,7 @@
           body:
             ids:    [1]
 
- - is_true: docs.0.exists
+ - is_true: docs.0.found
 
  - do:
       mget:
@@ -50,4 +50,4 @@
           body:
             ids:    [1]
 
- - is_true: docs.0.exists
+ - is_true: docs.0.found
diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
@@ -422,7 +422,7 @@ private WriteResult shardDeleteOperation(DeleteRequest deleteRequest, IndexShard
         indexShard.delete(delete);
         // update the request with the version so it will go to the replicas
         deleteRequest.version(delete.version());
-        DeleteResponse deleteResponse = new DeleteResponse(deleteRequest.index(), deleteRequest.type(), deleteRequest.id(), delete.version(), delete.notFound());
+        DeleteResponse deleteResponse = new DeleteResponse(deleteRequest.index(), deleteRequest.type(), deleteRequest.id(), delete.version(), delete.found());
         return new WriteResult(deleteResponse, deleteRequest.version(), null, null);
     }
 

diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java
@@ -37,18 +37,18 @@ public class DeleteResponse extends ActionResponse {
     private String id;
     private String type;
     private long version;
-    private boolean notFound;
+    private boolean found;
 
     public DeleteResponse() {
 
     }
 
-    public DeleteResponse(String index, String type, String id, long version, boolean notFound) {
+    public DeleteResponse(String index, String type, String id, long version, boolean found) {
         this.index = index;
         this.id = id;
         this.type = type;
         this.version = version;
-        this.notFound = notFound;
+        this.found = found;
     }
 
     /**
@@ -82,8 +82,8 @@ public long getVersion() {
     /**
      * Returns <tt>true</tt> if there was no doc found to delete.
      */
-    public boolean isNotFound() {
-        return notFound;
+    public boolean isFound() {
+        return found;
     }
 
     @Override
@@ -93,7 +93,7 @@ public void readFrom(StreamInput in) throws IOException {
         type = in.readSharedString();
         id = in.readString();
         version = in.readLong();
-        notFound = in.readBoolean();
+        found = in.readBoolean();
     }
 
     @Override
@@ -103,6 +103,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeSharedString(type);
         out.writeString(id);
         out.writeLong(version);
-        out.writeBoolean(notFound);
+        out.writeBoolean(found);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
@@ -114,13 +114,13 @@ public void onResponse(IndexDeleteResponse indexDeleteResponse) {
                             long version = Versions.MATCH_ANY;
                             boolean found = false;
                             for (ShardDeleteResponse deleteResponse : indexDeleteResponse.getResponses()) {
-                                if (!deleteResponse.isNotFound()) {
+                                if (deleteResponse.isFound()) {
                                     version = deleteResponse.getVersion();
                                     found = true;
                                     break;
                                 }
                             }
-                            listener.onResponse(new DeleteResponse(request.index(), request.type(), request.id(), version, !found));
+                            listener.onResponse(new DeleteResponse(request.index(), request.type(), request.id(), version, found));
                         }
 
                         @Override
@@ -193,7 +193,7 @@ protected PrimaryResponse<DeleteResponse, DeleteRequest> shardOperationOnPrimary
             }
         }
 
-        DeleteResponse response = new DeleteResponse(request.index(), request.type(), request.id(), delete.version(), delete.notFound());
+        DeleteResponse response = new DeleteResponse(request.index(), request.type(), request.id(), delete.version(), delete.found());
         return new PrimaryResponse<DeleteResponse, DeleteRequest>(shardRequest.request, response, null);
     }
 

diff --git a/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java b/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java
@@ -31,35 +31,35 @@
 public class ShardDeleteResponse extends ActionResponse {
 
     private long version;
-    private boolean notFound;
+    private boolean found;
 
     public ShardDeleteResponse() {
     }
 
-    public ShardDeleteResponse(long version, boolean notFound) {
+    public ShardDeleteResponse(long version, boolean found) {
         this.version = version;
-        this.notFound = notFound;
+        this.found = found;
     }
 
     public long getVersion() {
         return version;
     }
 
-    public boolean isNotFound() {
-        return notFound;
+    public boolean isFound() {
+        return found;
     }
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         version = in.readLong();
-        notFound = in.readBoolean();
+        found = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeLong(version);
-        out.writeBoolean(notFound);
+        out.writeBoolean(found);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java
@@ -107,7 +107,7 @@ protected PrimaryResponse<ShardDeleteResponse, ShardDeleteRequest> shardOperatio
         }
 
 
-        ShardDeleteResponse response = new ShardDeleteResponse(delete.version(), delete.notFound());
+        ShardDeleteResponse response = new ShardDeleteResponse(delete.version(), delete.found());
         return new PrimaryResponse<ShardDeleteResponse, ShardDeleteRequest>(shardRequest.request, response, null);
     }
 

diff --git a/src/main/java/org/elasticsearch/action/termvector/TermVectorResponse.java b/src/main/java/org/elasticsearch/action/termvector/TermVectorResponse.java
@@ -68,7 +68,7 @@ private static class FieldStrings {
         public static final XContentBuilderString _TYPE = new XContentBuilderString("_type");
         public static final XContentBuilderString _ID = new XContentBuilderString("_id");
         public static final XContentBuilderString _VERSION = new XContentBuilderString("_version");
-        public static final XContentBuilderString EXISTS = new XContentBuilderString("exists");
+        public static final XContentBuilderString FOUND = new XContentBuilderString("found");
         public static final XContentBuilderString TERMS = new XContentBuilderString("terms");
         public static final XContentBuilderString TERM_VECTORS = new XContentBuilderString("term_vectors");
 
@@ -169,7 +169,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(FieldStrings._TYPE, type);
         builder.field(FieldStrings._ID, id);
         builder.field(FieldStrings._VERSION, docVersion);
-        builder.field(FieldStrings.EXISTS, isExists());
+        builder.field(FieldStrings.FOUND, isExists());
         if (!isExists()) {
             builder.endObject();
             return builder;