go sentence support integer/timestamp type to start traverse. (vesoft…

…-inc#2225) Co-authored-by: trippli <trippli@tencent.com> Co-authored-by: dangleptr <37216992+dangleptr@users.noreply.github.com>
tong-hao · Jul 21, 2020 · c20c54f · c20c54f
1 parent 3f603e5
commit c20c54f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/graph/InterimResult.cpp b/src/graph/InterimResult.cpp
@@ -191,11 +191,14 @@ InterimResult::buildIndex(const std::string &vidColumn) const {
         auto name = schema->getFieldName(i);
         if (vidColumn == name) {
             VLOG(1) << "col name: " << vidColumn << ", col index: " << i;
-            if (schema->getFieldType(i).type != SupportedType::VID) {
+            if (schema->getFieldType(i).type != SupportedType::INT &&
+                schema->getFieldType(i).type != SupportedType::VID &&
+                schema->getFieldType(i).type != SupportedType::TIMESTAMP) {
                 return Status::Error(
-                        "Build internal index for input data failed. "
-                        "The specific vid column `%s' is not type of VID, column index: %ul.",
-                        vidColumn.c_str(), i);
+                    "Build internal index for input data failed. "
+                    "The specific vid column `%s' is not type of VID, INT or TIMESTAMP, "
+                    "column index: %u.",
+                    vidColumn.c_str(), i);
             }
             vidIndex = i;
         }
@@ -256,6 +259,9 @@ InterimResult::buildIndex(const std::string &vidColumn) const {
                     if (rc != ResultType::SUCCEEDED) {
                         return Status::Error("Get int from interim failed.");
                     }
+                    if (i == vidIndex) {
+                        index->vidToRowIndex_.emplace(v, rowIndex++);
+                    }
                     row.emplace_back(v);
                     break;
                 }

diff --git a/src/graph/test/GoTest.cpp b/src/graph/test/GoTest.cpp
@@ -50,6 +50,23 @@ TEST_P(GoTest, OneStepOutBound) {
         };
         ASSERT_TRUE(verifyResult(resp, expected));
     }
+    {
+        cpp2::ExecutionResponse resp;
+        auto *fmt = "YIELD %ld as vid | GO FROM $-.vid OVER serve";
+        auto query = folly::stringPrintf(fmt, players_["Tim Duncan"].vid());
+        auto code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+
+        std::vector<std::string> expectedColNames{
+            {"serve._dst"}
+        };
+        ASSERT_TRUE(verifyColNames(resp, expectedColNames));
+
+        std::vector<std::tuple<int64_t>> expected = {
+            {teams_["Spurs"].vid()},
+        };
+        ASSERT_TRUE(verifyResult(resp, expected));
+    }
     {
         cpp2::ExecutionResponse resp;
         auto &player = players_["Boris Diaw"];