addressed yee's comments

vesoft-inc · May 24, 2021 · d05aa5f · d05aa5f
1 parent eeda8d3
commit d05aa5f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/src/parser/MaintainSentences.cpp b/src/parser/MaintainSentences.cpp
@@ -445,14 +445,15 @@ std::string DropHostFromZoneSentence::toString() const {
 std::string CreateFTIndexSentence::toString() const {
     std::string buf;
     buf.reserve(256);
-    buf += "CREATE FULLTEXT INDEX ";
-    buf += *indexName_;
-    buf += " ON ";
+    buf += "CREATE FULLTEXT ";
     if (isEdge_) {
-        buf += " EDGE ";
+        buf += "EDGE";
     } else {
-        buf += " TAG ";
+        buf += "TAG";
     }
+    buf += " INDEX ";
+    buf += *indexName_;
+    buf += " ON ";
     buf += *schemaName_;
     buf += "(";
     std::vector<std::string> fieldDefs;

diff --git a/src/parser/parser.yy b/src/parser/parser.yy
@@ -2278,11 +2278,11 @@ create_edge_index_sentence
     ;
 
 create_fulltext_index_sentence
-    : KW_CREATE KW_FULLTEXT KW_INDEX name_label KW_ON KW_TAG name_label L_PAREN name_label_list R_PAREN {
-        $$ = new CreateFTIndexSentence(false, $4, $7, $9);
+    : KW_CREATE KW_FULLTEXT KW_TAG KW_INDEX name_label KW_ON name_label L_PAREN name_label_list R_PAREN {
+        $$ = new CreateFTIndexSentence(false, $5, $7, $9);
     }
-    | KW_CREATE KW_FULLTEXT KW_INDEX name_label KW_ON KW_EDGE name_label L_PAREN name_label_list R_PAREN {
-        $$ = new CreateFTIndexSentence(true, $4, $7, $9);
+    | KW_CREATE KW_FULLTEXT KW_EDGE KW_INDEX name_label KW_ON name_label L_PAREN name_label_list R_PAREN {
+        $$ = new CreateFTIndexSentence(true, $5, $7, $9);
     }
     ;
 

diff --git a/src/util/FTIndexUtils.cpp b/src/util/FTIndexUtils.cpp
@@ -50,32 +50,30 @@ StatusOr<bool>
 FTIndexUtils::checkTSIndex(const std::vector<nebula::plugin::HttpClient>& tsClients,
                            const std::string& index) {
     auto retryCnt = FLAGS_ft_request_retry_times;
-    StatusOr<bool> ret = Status::Error("fulltext index get failed : %s", index.c_str());
     while (--retryCnt > 0) {
-        ret = nebula::plugin::ESGraphAdapter::kAdapter->indexExists(randomFTClient(tsClients),
-                                                                    index);
+        auto ret = nebula::plugin::ESGraphAdapter::kAdapter->indexExists(randomFTClient(tsClients),
+                                                                         index);
         if (!ret.ok()) {
             continue;
         }
-        return ret.value();
+        return std::move(ret).value();
     }
-    return ret.status();
+    return Status::Error("fulltext index get failed : %s", index.c_str());
 }
 
 StatusOr<bool>
 FTIndexUtils::dropTSIndex(const std::vector<nebula::plugin::HttpClient>& tsClients,
                           const std::string& index) {
     auto retryCnt = FLAGS_ft_request_retry_times;
-    StatusOr<bool> ret = Status::Error("drop fulltext index failed : %s", index.c_str());
     while (--retryCnt > 0) {
-        ret = nebula::plugin::ESGraphAdapter::kAdapter->dropIndex(randomFTClient(tsClients),
-                                                                  index);
+        auto ret = nebula::plugin::ESGraphAdapter::kAdapter->dropIndex(randomFTClient(tsClients),
+                                                                       index);
         if (!ret.ok()) {
             continue;
         }
-        return ret.value();
+        return std::move(ret).value();
     }
-    return ret.status();
+    return Status::Error("drop fulltext index failed : %s", index.c_str());
 }
 
 StatusOr<std::string> FTIndexUtils::rewriteTSFilter(bool isEdge, Expression* expr,