fix(interactive): Fix builtin procedure shortest_path_among_three, accept any type pk values (#4552)

As titled.

Author: zhanglei1949

flex/engines/graph_db/app/builtin/shortest_path_among_three.cc

@@ -17,9 +17,9 @@
 namespace gs {
 
 results::CollectiveResults ShortestPathAmongThree::Query(
-    const GraphDBSession& sess, std::string label_name1, int64_t oid1,
-    std::string label_name2, int64_t oid2, std::string label_name3,
-    int64_t oid3) {
+    const GraphDBSession& sess, std::string label_name1, std::string oid1_str,
+    std::string label_name2, std::string oid2_str, std::string label_name3,
+    std::string oid3_str) {
   ReadTransaction txn = sess.GetReadTransaction();
   const Schema& schema_ = txn.schema();
 
@@ -30,8 +30,26 @@ results::CollectiveResults ShortestPathAmongThree::Query(
     return {};
   }
   label_t label_v1 = schema_.get_vertex_label_id(label_name1);
+  auto oid1 = ConvertStringToAny(
+      oid1_str, std::get<0>(schema_.get_vertex_primary_key(label_v1)[0]));
+  if (oid1.type == PropertyType::Empty()) {
+    LOG(ERROR) << "Invalid oid1.";
+    return {};
+  }
   label_t label_v2 = schema_.get_vertex_label_id(label_name2);
+  auto oid2 = ConvertStringToAny(
+      oid2_str, std::get<0>(schema_.get_vertex_primary_key(label_v2)[0]));
+  if (oid2.type == PropertyType::Empty()) {
+    LOG(ERROR) << "Invalid oid2.";
+    return {};
+  }
   label_t label_v3 = schema_.get_vertex_label_id(label_name3);
+  auto oid3 = ConvertStringToAny(
+      oid3_str, std::get<0>(schema_.get_vertex_primary_key(label_v3)[0]));
+  if (oid3.type == PropertyType::Empty()) {
+    LOG(ERROR) << "Invalid oid3.";
+    return {};
+  }
   vid_t index_v1{};
   vid_t index_v2{};
   vid_t index_v3{};

flex/engines/graph_db/app/builtin/shortest_path_among_three.h

@@ -20,14 +20,14 @@
 
 namespace gs {
 class ShortestPathAmongThree
-    : public CypherReadAppBase<std::string, int64_t, std::string, int64_t,
-                               std::string, int64_t> {
+    : public CypherReadAppBase<std::string, std::string, std::string,
+                               std::string, std::string, std::string> {
  public:
   ShortestPathAmongThree() {}
   results::CollectiveResults Query(const GraphDBSession& sess,
-                                   std::string label_name1, int64_t oid1,
-                                   std::string label_name2, int64_t oid2,
-                                   std::string label_name3, int64_t oid3);
+                                   std::string label_name1, std::string oid1,
+                                   std::string label_name2, std::string oid2,
+                                   std::string label_name3, std::string oid3);
 
  private:
   bool ShortestPath(const gs::ReadTransaction& txn, label_t v1_l,

flex/interactive/sdk/python/gs_interactive/tests/test_robustness.py

@@ -282,11 +282,11 @@ def test_builtin_procedure(interactive_session, neo4j_session, create_modern_gra
         create_modern_graph,
         "shortest_path_among_three",
         '"person"',
-        "1L",
+        '"1"',
         '"person"',
-        "2L",
+        '"2"',
         '"person"',
-        "4L",
+        '"4"',
     )
 
 

flex/storages/metadata/graph_meta_store.cc

@@ -125,15 +125,15 @@ const std::vector<PluginMeta>& get_builtin_plugin_metas() {
     shortest_path_among_three.params.push_back(
         {"label_name1", PropertyType::kString, true});
     shortest_path_among_three.params.push_back(
-        {"oid1", PropertyType::kInt64, false});
+        {"oid1", PropertyType::kString, false});
     shortest_path_among_three.params.push_back(
         {"label_name2", PropertyType::kString, true});
     shortest_path_among_three.params.push_back(
-        {"oid2", PropertyType::kInt64, false});
+        {"oid2", PropertyType::kString, false});
     shortest_path_among_three.params.push_back(
         {"label_name3", PropertyType::kString, true});
     shortest_path_among_three.params.push_back(
-        {"oid3", PropertyType::kInt64, false});
+        {"oid3", PropertyType::kString, false});
     shortest_path_among_three.returns.push_back(
         {"path", PropertyType::kString});
     builtin_plugins.push_back(shortest_path_among_three);

flex/utils/property/types.cc

@@ -626,9 +626,9 @@ Any ConvertStringToAny(const std::string& value, const gs::PropertyType& type) {
   } else if (type == gs::PropertyType::StringView()) {
     return gs::Any(std::string_view(value));
   } else {
-    LOG(FATAL) << "Unsupported type: " << type;
+    LOG(ERROR) << "Unsupported type: " << type.ToString();
+    return gs::Any();
   }
-  return gs::Any();
 }
 
 }  // namespace gs