fix shared ptr copy problem in Graph_T

Author: andydiwenzhu

modules/graph/grin/src/partition/partition.cc

@@ -25,18 +25,19 @@ GRIN_PARTITIONED_GRAPH grin_get_partitioned_graph_from_storage(int argc, char**
         return nullptr;
     }
     auto pg = new GRIN_PARTITIONED_GRAPH_T();
+    pg->socket = std::string(argv[0]);
     pg->client.Connect(argv[0]);
     vineyard::ObjectID obj_id;
     std::stringstream ss(argv[1]);
     ss >> obj_id;
     pg->pg = std::dynamic_pointer_cast<vineyard::ArrowFragmentGroup>(pg->client.GetObject(obj_id));
-    pg->lgs.resize(pg->pg->total_frag_num(), nullptr);
+    pg->lgs.resize(pg->pg->total_frag_num(), 0);
     for (auto & [fid, location] : pg->pg->FragmentLocations()) {
         if (location == pg->client.instance_id()) {
             auto obj_id = pg->pg->Fragments().at(fid);
 //            std::cout << fid << ": " << obj_id << std::endl;
-            auto frag = std::dynamic_pointer_cast<_GRIN_GRAPH_T>(pg->client.GetObject(obj_id));
-            pg->lgs[fid] = frag;
+//            auto frag = std::dynamic_pointer_cast<_GRIN_GRAPH_T>(pg->client.GetObject(obj_id));
+            pg->lgs[fid] = obj_id;
         }
     }
   return pg;
@@ -102,7 +103,10 @@ const void* grin_get_partition_info(GRIN_PARTITIONED_GRAPH pg, GRIN_PARTITION p)
 GRIN_GRAPH grin_get_local_graph_by_partition(GRIN_PARTITIONED_GRAPH pg, GRIN_PARTITION p) {
     auto _pg = static_cast<GRIN_PARTITIONED_GRAPH_T*>(pg);
     auto g = new GRIN_GRAPH_T();
-    g->g = _pg->lgs[p];
+    
+    g->client.Connect(_pg->socket);
+    g->_g = std::dynamic_pointer_cast<_GRIN_GRAPH_T>(g->client.GetObject(_pg->lgs[p]));
+    g->g = g->_g.get();
     return g;
 }
 #endif

modules/graph/grin/src/predefine.cc

@@ -66,7 +66,7 @@ GRIN_DATATYPE ArrowToDataType(std::shared_ptr<arrow::DataType> type) {
 }
 
 #ifdef GRIN_ENABLE_VERTEX_LIST
-void __grin_init_vertex_list(std::shared_ptr<_GRIN_GRAPH_T> g, GRIN_VERTEX_LIST_T* vl) {
+void __grin_init_vertex_list(_GRIN_GRAPH_T* g, GRIN_VERTEX_LIST_T* vl) {
     vl->offsets.clear();
     vl->vrs.clear();
     _GRIN_GRAPH_T::vertices_t vr;
@@ -88,7 +88,7 @@ void __grin_init_vertex_list(std::shared_ptr<_GRIN_GRAPH_T> g, GRIN_VERTEX_LIST_
 #endif
 
 #ifdef GRIN_ENABLE_ADJACENT_LIST
-void __grin_init_adjacent_list(std::shared_ptr<_GRIN_GRAPH_T> g, GRIN_ADJACENT_LIST_T* al) {
+void __grin_init_adjacent_list(_GRIN_GRAPH_T* g, GRIN_ADJACENT_LIST_T* al) {
     al->offsets.clear();
     al->data.clear();
     _GRIN_GRAPH_T::raw_adj_list_t ral;

modules/graph/grin/src/predefine.h

@@ -94,7 +94,8 @@ unsigned _grin_get_prop_from_property(unsigned long long int);
 typedef vineyard::ArrowFragment<GRIN_OID_T, GRIN_VID_T> _GRIN_GRAPH_T;                 
 struct GRIN_GRAPH_T {
     vineyard::Client client;
-    std::shared_ptr<_GRIN_GRAPH_T> g;
+    std::shared_ptr<_GRIN_GRAPH_T> _g;
+    _GRIN_GRAPH_T* g;
 };
 typedef _GRIN_GRAPH_T::vertex_t GRIN_VERTEX_T;     
 struct GRIN_EDGE_T {
@@ -117,7 +118,7 @@ struct GRIN_VERTEX_LIST_T {
     std::vector<unsigned> offsets;
     std::vector<_GRIN_GRAPH_T::vertices_t> vrs;
 };
-void __grin_init_vertex_list(std::shared_ptr<_GRIN_GRAPH_T> g, GRIN_VERTEX_LIST_T* vl);
+void __grin_init_vertex_list(_GRIN_GRAPH_T* g, GRIN_VERTEX_LIST_T* vl);
 #endif
 
 #ifdef GRIN_ENABLE_VERTEX_LIST_ITERATOR
@@ -140,7 +141,7 @@ struct GRIN_ADJACENT_LIST_T {
     std::vector<unsigned> offsets;
     std::vector<_GRIN_GRAPH_T::raw_adj_list_t> data;
 };
-void __grin_init_adjacent_list(std::shared_ptr<_GRIN_GRAPH_T> g, GRIN_ADJACENT_LIST_T* al);
+void __grin_init_adjacent_list(_GRIN_GRAPH_T* g, GRIN_ADJACENT_LIST_T* al);
 #endif
 
 #ifdef GRIN_ENABLE_ADJACENT_LIST_ITERATOR
@@ -157,9 +158,10 @@ struct GRIN_ADJACENT_LIST_ITERATOR_T {
 
 #ifdef GRIN_ENABLE_GRAPH_PARTITION
 struct GRIN_PARTITIONED_GRAPH_T {
+  std::string socket;
   vineyard::Client client;
   std::shared_ptr<vineyard::ArrowFragmentGroup> pg;
-  std::vector<std::shared_ptr<_GRIN_GRAPH_T>> lgs;
+  std::vector<vineyard::ObjectID> lgs;
 };
 typedef unsigned GRIN_PARTITION_T;
 typedef std::vector<unsigned> GRIN_PARTITION_LIST_T;

modules/graph/grin/src/topology/structure.cc

@@ -17,17 +17,22 @@ limitations under the License.
 extern "C" {
 #include "graph/grin/include/topology/structure.h"
 }
+#include "client/client.h"
 
 GRIN_GRAPH grin_get_graph_from_storage(int argc, char** argv) {
     if (argc < 2) {
         return nullptr;
     }
+
     auto g = new GRIN_GRAPH_T();
     g->client.Connect(argv[0]);
+
     vineyard::ObjectID obj_id;
     std::stringstream ss(argv[1]);
     ss >> obj_id;
-    g->g = std::dynamic_pointer_cast<_GRIN_GRAPH_T>(g->client.GetObject(obj_id));
+ 
+    g->_g = std::dynamic_pointer_cast<_GRIN_GRAPH_T>(g->client.GetObject(obj_id));
+    g->g = g->_g.get();
     return g;
 }