change vertex handler from void* to int64

modules/graph/grin/predefine.h

@@ -825,7 +825,7 @@ typedef enum {
 /** @brief Null graph (invalid return value) */
 #define GRIN_NULL_GRAPH NULL
 /** @brief Non-existing vertex (invalid return value) */
-#define GRIN_NULL_VERTEX NULL
+#define GRIN_NULL_VERTEX (unsigned long long int)~0
 /** @brief Non-existing edge (invalid return value) */
 #define GRIN_NULL_EDGE NULL
 /** @brief Null list of any kind (invalid return value) */
@@ -859,7 +859,7 @@ typedef enum {
 
 /* Define the handlers using typedef */
 typedef void* GRIN_GRAPH;                      
-typedef void* GRIN_VERTEX;                     
+typedef unsigned long long int GRIN_VERTEX;                     
 typedef void* GRIN_EDGE;                       
 
 #ifdef GRIN_WITH_VERTEX_DATA

modules/graph/grin/rust/v6d_all.h

@@ -19,7 +19,7 @@
 
 /// RUST_KEEP pub const GRIN_NULL_DATATYPE: GrinDatatype = GRIN_DATATYPE_UNDEFINED;
 /// RUST_KEEP pub const GRIN_NULL_GRAPH: GrinGraph = std::ptr::null_mut();
-/// RUST_KEEP pub const GRIN_NULL_VERTEX: GrinVertex = std::ptr::null_mut();
+/// RUST_KEEP pub const GRIN_NULL_VERTEX: GrinVertex = u64::MAX;
 /// RUST_KEEP pub const GRIN_NULL_EDGE: GrinEdge = std::ptr::null_mut();
 /// RUST_KEEP pub const GRIN_NULL_LIST: *mut ::std::os::raw::c_void = std::ptr::null_mut();
 /// RUST_KEEP pub const GRIN_NULL_LIST_ITERATOR: *mut ::std::os::raw::c_void = std::ptr::null_mut();

modules/graph/grin/src/index/order.cc

@@ -18,25 +18,20 @@ extern "C" {
 
 #ifdef GRIN_ASSUME_ALL_VERTEX_LIST_SORTED
 bool grin_smaller_vertex(GRIN_GRAPH g, GRIN_VERTEX v1, GRIN_VERTEX v2) {
-    auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v1 = static_cast<GRIN_VERTEX_T*>(v1);
-    auto _v2 = static_cast<GRIN_VERTEX_T*>(v2);
-    return _g->Vertex2Gid(*_v1) < _g->Vertex2Gid(*_v2);
+    return v1 < v2;    
 }
 #endif
 
 #if defined(GRIN_ASSUME_ALL_VERTEX_LIST_SORTED) && defined(GRIN_ENABLE_VERTEX_LIST_ARRAY)
 size_t grin_get_position_of_vertex_from_sorted_list(GRIN_GRAPH g, GRIN_VERTEX_LIST vl, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
     auto _vl = static_cast<GRIN_VERTEX_LIST_T*>(vl);
-    return _v->GetValue() - _vl->vrs[0].begin_value();
-    // auto vtype = (unsigned)_g->vertex_label(*_v);
-    // if (vtype < _vl->type_begin || vtype >= _vl->type_end) return GRIN_NULL_SIZE;
-    // auto offset = _v->GetValue() - _vl->vrs[vtype - _vl->type_begin].begin_value();
-    // if (offset < _vl->vrs[vtype - _vl->type_begin].size()) {
-    //     return _vl->offsets[vtype - _vl->type_begin] + offset;
-    // }
-    // return GRIN_NULL_SIZE;
+    auto vtype = (unsigned)_g->vertex_label(_GRIN_VERTEX_T(v)); // TODO: optimize after rebase
+    if (vtype < _vl->type_begin || vtype >= _vl->type_end) return GRIN_NULL_SIZE;
+    auto offset = v - _vl->vrs[vtype - _vl->type_begin].begin_value();
+    if (offset < _vl->vrs[vtype - _vl->type_begin].size()) {
+        return _vl->offsets[vtype - _vl->type_begin] + offset;
+    }
+    return GRIN_NULL_SIZE;
 }
 #endif

modules/graph/grin/src/index/original_id.cc

@@ -23,18 +23,17 @@ GRIN_DATATYPE grin_get_vertex_original_id_datatype(GRIN_GRAPH g) {
 #ifdef GRIN_ENABLE_VERTEX_ORIGINAL_ID_OF_INT64
 long long int grin_get_vertex_original_id_of_int64(GRIN_GRAPH g, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    auto gid = _g->Vertex2Gid(*_v);
+    auto gid = _g->Vertex2Gid(_GRIN_VERTEX_T(v));
     return _g->Gid2Oid(gid);
 }
 
 GRIN_VERTEX grin_get_vertex_by_original_id_of_int64(GRIN_GRAPH g, long long int oid) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     _GRIN_GRAPH_T::vid_t gid;
-    auto v = new GRIN_VERTEX_T();
+    _GRIN_VERTEX_T v;
     if (_g->Oid2Gid(0, oid, gid)) {
-        if (_g->Gid2Vertex(gid, *v)) {
-            return v;
+        if (_g->Gid2Vertex(gid, v)) {
+            return v.GetValue();
         }
     }
     return GRIN_NULL_VERTEX;

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

@@ -35,12 +35,10 @@ GRIN_PARTITIONED_GRAPH grin_get_partitioned_graph_from_storage(int argc, char**
     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] = obj_id;
         }
     }
-  return pg;
+    return pg;
 }
 
 void grin_destroy_partitioned_graph(GRIN_PARTITIONED_GRAPH pg) {

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

@@ -21,24 +21,23 @@ extern "C" {
 #ifdef GRIN_ENABLE_VERTEX_REF
 GRIN_VERTEX_REF grin_get_vertex_ref_by_vertex(GRIN_GRAPH g, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    return _g->Vertex2Gid(*_v);
+    return _g->Vertex2Gid(_GRIN_VERTEX_T(v));
 }
 
 void grin_destroy_vertex_ref(GRIN_GRAPH g, GRIN_VERTEX_REF vr) {}
 
 GRIN_VERTEX grin_get_vertex_from_vertex_ref(GRIN_GRAPH g, GRIN_VERTEX_REF vr) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto v = new GRIN_VERTEX_T();
-    if (_g->Gid2Vertex(vr, *v)) {
-        return v;
+    _GRIN_VERTEX_T v;
+    if (_g->Gid2Vertex(vr, v)) {
+        return v.GetValue();
     }
     return GRIN_NULL_VERTEX;
 }
 
 GRIN_PARTITION grin_get_master_partition_from_vertex_ref(GRIN_GRAPH g, GRIN_VERTEX_REF vr) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto id_parser = vineyard::IdParser<GRIN_VERTEX_REF_T>();
+    auto id_parser = vineyard::IdParser<GRIN_VERTEX_REF_T>(); //TODO optimize after rebase
     id_parser.Init(_g->fnum(), _g->vertex_label_num());
     return id_parser.GetFid(vr);
 }
@@ -75,14 +74,12 @@ GRIN_VERTEX_REF grin_deserialize_to_vertex_ref(GRIN_GRAPH g, const char* msg) {
 
 bool grin_is_master_vertex(GRIN_GRAPH g, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    return _g->IsInnerVertex(*_v);
+    return _g->IsInnerVertex(_GRIN_VERTEX_T(v)); // TODO
 }
 
 bool grin_is_mirror_vertex(GRIN_GRAPH g, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    return _g->IsOuterVertex(*_v);
+    return _g->IsOuterVertex(_GRIN_VERTEX_T(v)); // TODO
 }
 #endif
 

modules/graph/grin/src/predefine.cc

@@ -72,14 +72,13 @@ const void* _get_value_from_vertex_property_table(GRIN_GRAPH g, GRIN_VERTEX_PROP
     grin_error_code = GRIN_ERROR_CODE::NO_ERROR;
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto _vpt = static_cast<GRIN_VERTEX_PROPERTY_TABLE_T*>(vpt);
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    unsigned vtype = _grin_get_type_from_property(vp);
-    unsigned vprop = _grin_get_prop_from_property(vp);
-    if (vtype != _vpt->vtype || !_vpt->vertices.Contain(*_v)) {
+    if (v < _vpt->vbegin || v >= _vpt->vend) {
         grin_error_code = GRIN_ERROR_CODE::INVALID_VALUE;
         return NULL;
     }
-    auto offset = _v->GetValue() - _vpt->vertices.begin_value();
+    unsigned vtype = _grin_get_type_from_property(vp);
+    unsigned vprop = _grin_get_prop_from_property(vp);
+    auto offset = v - _vpt->vbegin;
     auto array = _g->vertex_data_table(vtype)->column(vprop)->chunk(0);
     return vineyard::get_arrow_array_data_element(array, offset);
 }
@@ -107,7 +106,7 @@ void __grin_init_vertex_list(_GRIN_GRAPH_T* g, GRIN_VERTEX_LIST_T* vl) {
     vl->vrs.clear();
     _GRIN_GRAPH_T::vertices_t vr;
     vl->offsets.push_back(0);
-    unsigned sum = 0;
+    size_t sum = 0;
     for (auto vtype = vl->type_begin; vtype < vl->type_end; ++vtype) {
         if (vl->all_master_mirror == 0) {
             vr = g->Vertices(vtype);
@@ -129,7 +128,7 @@ void __grin_init_adjacent_list(_GRIN_GRAPH_T* g, GRIN_ADJACENT_LIST_T* al) {
     al->data.clear();
     _GRIN_GRAPH_T::raw_adj_list_t ral;
     al->offsets.push_back(0);
-    unsigned sum = 0;
+    size_t sum = 0;
     for (auto etype = al->etype_begin; etype < al->etype_end; ++etype) {
         if (al->dir == GRIN_DIRECTION::IN) {
             ral = g->GetIncomingRawAdjList(_GRIN_GRAPH_T::vertex_t(al->vid), etype);

modules/graph/grin/src/predefine.h

@@ -102,7 +102,7 @@ struct GRIN_GRAPH_T {
     std::shared_ptr<_GRIN_GRAPH_T> _g;
     _GRIN_GRAPH_T* g;
 };
-typedef _GRIN_GRAPH_T::vertex_t GRIN_VERTEX_T;     
+typedef _GRIN_GRAPH_T::vertex_t _GRIN_VERTEX_T;     
 struct GRIN_EDGE_T {
     _GRIN_GRAPH_T::vid_t src;
     _GRIN_GRAPH_T::vid_t dst;
@@ -116,7 +116,7 @@ struct GRIN_VERTEX_LIST_T {
     unsigned type_begin;
     unsigned type_end;
     unsigned all_master_mirror;
-    std::vector<unsigned> offsets;
+    std::vector<size_t> offsets;
     std::vector<_GRIN_GRAPH_T::vertices_t> vrs;
 };
 void __grin_init_vertex_list(_GRIN_GRAPH_T* g, GRIN_VERTEX_LIST_T* vl);
@@ -139,7 +139,7 @@ struct GRIN_ADJACENT_LIST_T {
     GRIN_DIRECTION dir;
     unsigned etype_begin;
     unsigned etype_end;
-    std::vector<unsigned> offsets;
+    std::vector<size_t> offsets;
     std::vector<_GRIN_GRAPH_T::raw_adj_list_t> data;
 };
 void __grin_init_adjacent_list(_GRIN_GRAPH_T* g, GRIN_ADJACENT_LIST_T* al);
@@ -179,7 +179,8 @@ typedef unsigned long long int GRIN_VERTEX_PROPERTY_T;
 typedef std::vector<GRIN_VERTEX_PROPERTY_T> GRIN_VERTEX_PROPERTY_LIST_T;
 struct GRIN_VERTEX_PROPERTY_TABLE_T {
     unsigned vtype;
-    _GRIN_GRAPH_T::vertices_t vertices;
+    _GRIN_GRAPH_T::vid_t vbegin;
+    _GRIN_GRAPH_T::vid_t vend;
 };
 #endif
 

modules/graph/grin/src/property/primarykey.cc

@@ -56,35 +56,26 @@ GRIN_VERTEX grin_get_vertex_by_primary_keys(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto _r = static_cast<GRIN_ROW_T*>(r);
     auto value = (*_r)[0];
+#if 0
     for (auto p = 0; p < _g->vertex_property_num(vtype); ++p) {
         if (_g->schema().GetVertexPropertyName(vtype, p) == "id") {
             auto arrow_dt = _g->schema().GetVertexPropertyType(vtype, p);
             auto dt = ArrowToDataType(arrow_dt);
 
-            if (dt == GRIN_DATATYPE::Int32) {
-                auto vid = static_cast<const int32_t*>(value);
-                auto _v = new GRIN_VERTEX_T();
-                if (!_g->GetVertex(vtype, *vid, *_v)) return GRIN_NULL_VERTEX;
-                return _v;
-            } else if (dt == GRIN_DATATYPE::UInt32) {
-                auto vid = static_cast<const uint32_t*>(value);
-                auto _v = new GRIN_VERTEX_T();
-                if (!_g->GetVertex(vtype, *vid, *_v)) return GRIN_NULL_VERTEX;
-                return _v;
-            } else if (dt == GRIN_DATATYPE::Int64) {
+            if (dt == GRIN_DATATYPE::Int64) {
+#endif
+                _GRIN_VERTEX_T v;
                 auto vid = static_cast<const int64_t*>(value);
-                auto _v = new GRIN_VERTEX_T();
-                if (!_g->GetVertex(vtype, *vid, *_v)) return GRIN_NULL_VERTEX;
-                return _v;
-            } else if (dt == GRIN_DATATYPE::UInt64) {
-                auto vid = static_cast<const uint64_t*>(value);
-                auto _v = new GRIN_VERTEX_T();
-                if (!_g->GetVertex(vtype, *vid, *_v)) return GRIN_NULL_VERTEX;
-                return _v;
+                if (!_g->GetVertex(vtype, *vid, v)) return GRIN_NULL_VERTEX;
+                return v.GetValue();
+#if 0
+            } else {
+                return GRIN_NULL_VERTEX;
             }
         }
     }
     return GRIN_NULL_VERTEX;
+#endif
 }
 #endif
 

modules/graph/grin/src/property/property.cc

@@ -22,7 +22,7 @@ const char* grin_get_vertex_property_name(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype,
     int len = s.length() + 1;
     char* out = new char[len];
     snprintf(out, len, "%s", s.c_str());
-    return out;
+    return out; // TODO: optimize after rebase, put strings in g.
 }
 
 GRIN_VERTEX_PROPERTY grin_get_vertex_property_by_name(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype,
@@ -59,7 +59,7 @@ const char* grin_get_edge_property_name(GRIN_GRAPH g, GRIN_EDGE_TYPE etype, GRIN
     int len = s.length() + 1;
     char* out = new char[len];
     snprintf(out, len, "%s", s.c_str());
-    return out;
+    return out; // TODO
 }
 
 GRIN_EDGE_PROPERTY grin_get_edge_property_by_name(GRIN_GRAPH g, GRIN_EDGE_TYPE etype,

modules/graph/grin/src/property/propertytable.cc

@@ -186,7 +186,9 @@ GRIN_VERTEX_PROPERTY_TABLE grin_get_vertex_property_table_by_type(GRIN_GRAPH g,
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto vpt = new GRIN_VERTEX_PROPERTY_TABLE_T();
     vpt->vtype = vtype;
-    vpt->vertices = _g->InnerVertices(vtype);
+    auto vr = _g->InnerVertices(vtype);
+    vpt->vbegin = vr.begin_value();
+    vpt->vend = vr.end_value();
     return vpt;
 }
 
@@ -295,10 +297,9 @@ GRIN_ROW grin_get_row_from_vertex_property_table(GRIN_GRAPH g, GRIN_VERTEX_PROPE
                                        GRIN_VERTEX_PROPERTY_LIST vpl) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto _vpt = static_cast<GRIN_VERTEX_PROPERTY_TABLE_T*>(vpt);
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
     auto _vpl = static_cast<GRIN_VERTEX_PROPERTY_LIST_T*>(vpl);
-    if (!_vpt->vertices.Contain(*_v)) return NULL;
-    auto offset = _v->GetValue() - _vpt->vertices.begin_value();
+    if (v < _vpt->vbegin || v >= _vpt->vend) return NULL;
+    auto offset = v - _vpt->vbegin;
 
     auto r = new GRIN_ROW_T();
     for (auto vp: *_vpl) {

modules/graph/grin/src/property/type.cc

@@ -22,8 +22,7 @@ bool grin_equal_vertex_type(GRIN_GRAPH g, GRIN_VERTEX_TYPE vt1, GRIN_VERTEX_TYPE
 
 GRIN_VERTEX_TYPE grin_get_vertex_type(GRIN_GRAPH g, GRIN_VERTEX v) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
-    return _g->vertex_label(*_v);
+    return _g->vertex_label(_GRIN_VERTEX_T(v));  // TODO
 }
 
 void grin_destroy_vertex_type(GRIN_GRAPH g, GRIN_VERTEX_TYPE vt) {}
@@ -71,7 +70,7 @@ const char* grin_get_vertex_type_name(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype) {
     int len = s.length() + 1;
     char* out = new char[len];
     snprintf(out, len, "%s", s.c_str());
-    return out;
+    return out; // TODO
 }
 
 GRIN_VERTEX_TYPE grin_get_vertex_type_by_name(GRIN_GRAPH g, const char* name) {
@@ -149,7 +148,7 @@ const char* grin_get_edge_type_name(GRIN_GRAPH g, GRIN_EDGE_TYPE etype) {
     int len = s.length() + 1;
     char* out = new char[len];
     snprintf(out, len, "%s", s.c_str());
-    return out;    
+    return out;    // TODO
 }
 
 GRIN_EDGE_TYPE grin_get_edge_type_by_name(GRIN_GRAPH g, const char* name) {
@@ -181,7 +180,7 @@ GRIN_VERTEX_TYPE_LIST grin_get_src_types_by_edge_type(GRIN_GRAPH g, GRIN_EDGE_TY
     for (auto& pair : entry.relations) {
         vtl->push_back(GRIN_VERTEX_TYPE_T(_g->schema().GetVertexLabelId(pair.first)));
     }
-    return vtl;
+    return vtl; // TODO
 }
 
 GRIN_VERTEX_TYPE_LIST grin_get_dst_types_by_edge_type(GRIN_GRAPH g, GRIN_EDGE_TYPE etype) {
@@ -191,7 +190,7 @@ GRIN_VERTEX_TYPE_LIST grin_get_dst_types_by_edge_type(GRIN_GRAPH g, GRIN_EDGE_TY
     for (auto& pair : entry.relations) {
         vtl->push_back(GRIN_VERTEX_TYPE_T(_g->schema().GetVertexLabelId(pair.second)));
     }
-    return vtl;
+    return vtl; // TODO
 }
 
 GRIN_EDGE_TYPE_LIST grin_get_edge_types_by_vertex_type_pair(GRIN_GRAPH g, GRIN_VERTEX_TYPE src_vt, 
@@ -209,6 +208,6 @@ GRIN_EDGE_TYPE_LIST grin_get_edge_types_by_vertex_type_pair(GRIN_GRAPH g, GRIN_V
             }
         }
     }
-    return etl;
+    return etl; // TODO
 }
 #endif

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

@@ -22,9 +22,8 @@ extern "C" {
 GRIN_ADJACENT_LIST grin_get_adjacent_list(GRIN_GRAPH g, GRIN_DIRECTION d, GRIN_VERTEX v) {
     if (d == GRIN_DIRECTION::BOTH) return GRIN_NULL_LIST;
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _v = static_cast<GRIN_VERTEX_T*>(v);
     auto al = new GRIN_ADJACENT_LIST_T();
-    al->vid = _v->GetValue();
+    al->vid = v;
     al->dir = d;
     al->etype_begin = 0;
     al->etype_end = _g->edge_label_num();
@@ -48,8 +47,7 @@ GRIN_VERTEX grin_get_neighbor_from_adjacent_list(GRIN_GRAPH g, GRIN_ADJACENT_LIS
         if (idx < _al->offsets[i+1]) {
             auto _idx = idx - _al->offsets[i];
             auto _nbr = _al->data[i].begin() + _idx;
-            auto v = new GRIN_VERTEX_T(_nbr->vid);
-            return v;
+            return _nbr->vid;
         }
     }
     return GRIN_NULL_VERTEX;
@@ -136,8 +134,7 @@ bool grin_is_adjacent_list_end(GRIN_GRAPH g, GRIN_ADJACENT_LIST_ITERATOR ali) {
 GRIN_VERTEX grin_get_neighbor_from_adjacent_list_iter(GRIN_GRAPH g, GRIN_ADJACENT_LIST_ITERATOR ali) {
     auto _ali = static_cast<GRIN_ADJACENT_LIST_ITERATOR_T*>(ali);
     auto _nbr = _ali->data.begin() + _ali->current;
-    auto v = new GRIN_VERTEX_T(_nbr->vid);
-    return v;
+    return _nbr->vid;
 }
 
 GRIN_EDGE grin_get_edge_from_adjacent_list_iter(GRIN_GRAPH g, GRIN_ADJACENT_LIST_ITERATOR ali) {