Add a flattened wrapper on property graph to run apps defined on simple graph

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
       run:
         shell: bash --noprofile --norc -eo pipefail {0}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.3.1
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:test_wrapper
       options:
         --shm-size 4096m
     strategy:
@@ -135,7 +135,7 @@ jobs:
       run:
         shell: bash --noprofile --norc -eo pipefail {0}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.3.1
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:test_wrapper
     steps:
     - name: Install Dependencies
       run: |
@@ -180,7 +180,7 @@ jobs:
       run:
         shell: bash --noprofile --norc -eo pipefail {0}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.3.1
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:test_wrapper
     steps:
     - uses: actions/checkout@v2.3.2
       with:
@@ -543,7 +543,7 @@ jobs:
       run:
         shell: bash --noprofile --norc -eo pipefail {0}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.3.1
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:test_wrapper
     steps:
 
     #- name: "Debug: Package dependancies for tmate"

analytical_engine/apps/boundary/edge_boundary.h

@@ -23,6 +23,7 @@ limitations under the License.
 #include "grape/grape.h"
 
 #include "apps/boundary/edge_boundary_context.h"
+#include "apps/boundary/utils.h"
 #include "core/app/app_base.h"
 
 namespace gs {
@@ -47,17 +48,21 @@ class EdgeBoundary : public AppBase<FRAG_T, EdgeBoundaryContext<FRAG_T>>,
              message_manager_t& messages) {
     // parse input node array from json
     folly::dynamic node_array_1 = folly::parseJson(ctx.nbunch1);
+    std::vector<oid_t> oid_array_1;
+    ExtractOidArrayFromDynamic(node_array_1, oid_array_1);
     std::set<vid_t> node_gid_set, node_gid_set_2;
     vid_t gid;
     vertex_t u;
-    for (const auto& oid : node_array_1) {
+    for (const auto& oid : oid_array_1) {
       if (frag.Oid2Gid(oid, gid)) {
         node_gid_set.insert(gid);
       }
     }
     if (!ctx.nbunch2.empty()) {
       auto node_array_2 = folly::parseJson(ctx.nbunch2);
-      for (const auto& oid : node_array_2) {
+      std::vector<oid_t> oid_array_2;
+      ExtractOidArrayFromDynamic(node_array_2, oid_array_2);
+      for (const auto& oid : oid_array_2) {
         if (frag.Oid2Gid(oid, gid)) {
           node_gid_set_2.insert(gid);
         }
@@ -67,7 +72,7 @@ class EdgeBoundary : public AppBase<FRAG_T, EdgeBoundaryContext<FRAG_T>>,
     // get the boundary
     for (auto& gid : node_gid_set) {
       if (frag.InnerVertexGid2Vertex(gid, u)) {
-        for (auto e : frag.GetOutgoingAdjList(u)) {
+        for (auto& e : frag.GetOutgoingAdjList(u)) {
           vid_t vgid = frag.Vertex2Gid(e.get_neighbor());
           if (node_gid_set_2.empty()) {
             if (node_gid_set.find(vgid) == node_gid_set.end()) {

analytical_engine/apps/boundary/node_boundary.h

@@ -23,6 +23,7 @@ limitations under the License.
 #include "grape/grape.h"
 
 #include "apps/boundary/node_boundary_context.h"
+#include "apps/boundary/utils.h"
 #include "core/app/app_base.h"
 
 namespace gs {
@@ -47,17 +48,21 @@ class NodeBoundary : public AppBase<FRAG_T, NodeBoundaryContext<FRAG_T>>,
              message_manager_t& messages) {
     // parse input node array from json
     folly::dynamic node_array_1 = folly::parseJson(ctx.nbunch1);
+    std::vector<oid_t> oid_array_1;
+    ExtractOidArrayFromDynamic(node_array_1, oid_array_1);
     std::set<vid_t> node_gid_set, node_gid_set_2;
     vid_t gid;
     vertex_t v;
-    for (const auto& oid : node_array_1) {
+    for (const auto& oid : oid_array_1) {
       if (frag.Oid2Gid(oid, gid)) {
         node_gid_set.insert(gid);
       }
     }
     if (!ctx.nbunch2.empty()) {
       auto node_array_2 = folly::parseJson(ctx.nbunch2);
-      for (const auto& oid : node_array_2) {
+      std::vector<oid_t> oid_array_2;
+      ExtractOidArrayFromDynamic(node_array_2, oid_array_2);
+      for (const auto& oid : oid_array_2) {
         if (frag.Oid2Gid(oid, gid)) {
           node_gid_set_2.insert(gid);
         }

analytical_engine/apps/boundary/utils.h

@@ -0,0 +1,52 @@
+/** Copyright 2020 Alibaba Group Holding Limited.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+Author: Ma JingYuan
+*/
+
+#ifndef ANALYTICAL_ENGINE_APPS_BOUNDARY_UTILS_H_
+#define ANALYTICAL_ENGINE_APPS_BOUNDARY_UTILS_H_
+
+#include <string>
+#include <vector>
+
+#include "folly/dynamic.h"
+
+namespace gs {
+template <typename T>
+void ExtractOidArrayFromDynamic(folly::dynamic node_array,
+                                std::vector<T>& oid_array) {}
+
+template <>
+void ExtractOidArrayFromDynamic<int64_t>(folly::dynamic node_array,
+                                         std::vector<int64_t>& oid_array) {
+  for (const auto& val : node_array) {
+    oid_array.push_back(val.asInt());
+  }
+}
+
+template <>
+void ExtractOidArrayFromDynamic<std::string>(
+    folly::dynamic node_array, std::vector<std::string>& oid_array) {
+  for (const auto& val : node_array) {
+    oid_array.push_back(val.asString());
+  }
+}
+
+template <>
+void ExtractOidArrayFromDynamic<folly::dynamic>(
+    folly::dynamic node_array, std::vector<folly::dynamic>& oid_array) {
+  for (const auto& val : node_array) {
+    oid_array.push_back(val);
+  }
+}
+}  // namespace gs
+
+#endif  // ANALYTICAL_ENGINE_APPS_BOUNDARY_UTILS_H_

analytical_engine/apps/projected/sssp_projected.h

@@ -94,6 +94,7 @@ class SSSPProjected : public AppBase<FRAG_T, SSSPProjectedContext<FRAG_T>> {
       auto es = frag.GetOutgoingAdjList(u);
       for (auto& e : es) {
         v = e.neighbor();
+
         distv = ctx.partial_result[v];
         double edata = 1.0;
         static_if<!std::is_same<edata_t, grape::EmptyType>{}>(

analytical_engine/core/context/tensor_context.h

@@ -34,6 +34,7 @@
 #include "core/context/i_context.h"
 #include "core/context/tensor_dataframe_builder.h"
 #include "core/error.h"
+#include "core/fragment/arrow_label_projected_fragment.h"
 #include "core/fragment/arrow_projected_fragment.h"
 #include "core/fragment/dynamic_projected_fragment.h"
 #include "core/object/i_fragment_wrapper.h"

analytical_engine/core/context/vertex_data_context.h

@@ -39,6 +39,7 @@
 #include "core/context/i_context.h"
 #include "core/context/tensor_dataframe_builder.h"
 #include "core/error.h"
+#include "core/fragment/arrow_label_projected_fragment.h"
 #include "core/fragment/arrow_projected_fragment.h"
 #include "core/fragment/dynamic_projected_fragment.h"
 #include "core/utils/transform_utils.h"