Unify symbol to exists.

vesoft-inc · Jan 3, 2020 · 8487785 · 8487785
1 parent 804b502
commit 8487785
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/graph/DropEdgeExecutor.cpp b/src/graph/DropEdgeExecutor.cpp
@@ -28,7 +28,7 @@ void DropEdgeExecutor::execute() {
  auto *mc = ectx()->getMetaClient();
  auto *name = sentence_->name();
  auto spaceId = ectx()->rctx()->session()->space();
- auto future = mc->dropEdgeSchema(spaceId, *name, sentence_->isIfExist());
+ auto future = mc->dropEdgeSchema(spaceId, *name, sentence_->isIfExists());
 
  auto *runner = ectx()->rctx()->runner();
  auto cb = [this] (auto &&resp) {

diff --git a/src/graph/DropSpaceExecutor.cpp b/src/graph/DropSpaceExecutor.cpp
@@ -23,7 +23,7 @@ Status DropSpaceExecutor::prepare() {
 
 
 void DropSpaceExecutor::execute() {
- auto future = ectx()->getMetaClient()->dropSpace(*spaceName_, sentence_->isIfExist());
+ auto future = ectx()->getMetaClient()->dropSpace(*spaceName_, sentence_->isIfExists());
  auto *runner = ectx()->rctx()->runner();
 
  auto cb = [this] (auto &&resp) {

diff --git a/src/graph/DropTagExecutor.cpp b/src/graph/DropTagExecutor.cpp
@@ -28,7 +28,7 @@ void DropTagExecutor::execute() {
  auto *mc = ectx()->getMetaClient();
  auto *name = sentence_->name();
  auto spaceId = ectx()->rctx()->session()->space();
- auto future = mc->dropTagSchema(spaceId, *name, sentence_->isIfExist());
+ auto future = mc->dropTagSchema(spaceId, *name, sentence_->isIfExists());
 
  auto *runner = ectx()->rctx()->runner();
  auto cb = [this] (auto &&resp) {

diff --git a/src/meta/client/MetaClient.cpp b/src/meta/client/MetaClient.cpp
@@ -608,10 +608,10 @@ MetaClient::getSpace(std::string name) {
  return future;
 }
 
-folly::Future<StatusOr<bool>> MetaClient::dropSpace(std::string name, const bool ifExist) {
+folly::Future<StatusOr<bool>> MetaClient::dropSpace(std::string name, const bool ifExists) {
  cpp2::DropSpaceReq req;
  req.set_space_name(std::move(name));
- req.set_if_exists(ifExist);
+ req.set_if_exists(ifExists);
  folly::Promise<StatusOr<bool>> promise;
  auto future = promise.getFuture();
  getResponse(std::move(req), [] (auto client, auto request) {
@@ -1002,11 +1002,11 @@ MetaClient::listTagSchemas(GraphSpaceID spaceId) {
 
 
 folly::Future<StatusOr<bool>>
-MetaClient::dropTagSchema(int32_t spaceId, std::string tagName, const bool ifExist) {
+MetaClient::dropTagSchema(int32_t spaceId, std::string tagName, const bool ifExists) {
  cpp2::DropTagReq req;
  req.set_space_id(spaceId);
  req.set_tag_name(std::move(tagName));
- req.set_if_exists(ifExist);
+ req.set_if_exists(ifExists);
  folly::Promise<StatusOr<bool>> promise;
  auto future = promise.getFuture();
  getResponse(std::move(req), [] (auto client, auto request) {
@@ -1109,11 +1109,11 @@ MetaClient::getEdgeSchema(GraphSpaceID spaceId, std::string name, SchemaVer vers
 
 
 folly::Future<StatusOr<bool>>
-MetaClient::dropEdgeSchema(GraphSpaceID spaceId, std::string name, const bool ifExist) {
+MetaClient::dropEdgeSchema(GraphSpaceID spaceId, std::string name, const bool ifExists) {
  cpp2::DropEdgeReq req;
  req.set_space_id(std::move(spaceId));
  req.set_edge_name(std::move(name));
- req.set_if_exists(ifExist);
+ req.set_if_exists(ifExists);
  folly::Promise<StatusOr<bool>> promise;
  auto future = promise.getFuture();
  getResponse(std::move(req), [] (auto client, auto request) {

diff --git a/src/meta/client/MetaClient.h b/src/meta/client/MetaClient.h
@@ -156,7 +156,7 @@ class MetaClient {
  getSpace(std::string name);
 
  folly::Future<StatusOr<bool>>
- dropSpace(std::string name, bool ifExist = false);
+ dropSpace(std::string name, bool ifExists = false);
 
  folly::Future<StatusOr<std::vector<cpp2::HostItem>>>
  listHosts();
@@ -183,7 +183,7 @@ class MetaClient {
  listTagSchemas(GraphSpaceID spaceId);
 
  folly::Future<StatusOr<bool>>
- dropTagSchema(int32_t spaceId, std::string name, bool ifExist = false);
+ dropTagSchema(int32_t spaceId, std::string name, bool ifExists = false);
 
  // Return the latest schema when ver = -1
  folly::Future<StatusOr<nebula::cpp2::Schema>>
@@ -208,7 +208,7 @@ class MetaClient {
  getEdgeSchema(GraphSpaceID spaceId, std::string name, SchemaVer version = -1);
 
  folly::Future<StatusOr<bool>>
- dropEdgeSchema(GraphSpaceID spaceId, std::string name, bool ifExist = false);
+ dropEdgeSchema(GraphSpaceID spaceId, std::string name, bool ifExists = false);
 
  // Operations for index
  folly::Future<StatusOr<TagIndexID>>

diff --git a/src/parser/Sentence.h b/src/parser/Sentence.h
@@ -88,14 +88,14 @@ class CreateSentence : public Sentence {
 
 class DropSentence : public Sentence {
 public:
- explicit DropSentence(bool ifExist) : ifExist_{ifExist} {}
+ explicit DropSentence(bool ifExists) : ifExists_{ifExists} {}
  virtual ~DropSentence() = default;
 
- bool isIfExist() {
- return ifExist_;
+ bool isIfExists() {
+ return ifExists_;
  }
 private:
- bool ifExist_{false};
+ bool ifExists_{false};
 };
 
 inline std::ostream& operator<<(std::ostream &os, Sentence::Kind kind) {