optimize vertexlist and adjlist impl

Author: andydiwenzhu

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

@@ -24,15 +24,12 @@ bool grin_smaller_vertex(GRIN_GRAPH g, GRIN_VERTEX v1, GRIN_VERTEX v2) {
 
 #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 _vl = static_cast<GRIN_VERTEX_LIST_T*>(vl);
-    auto bg = static_cast<GRIN_GRAPH_T*>(g);
-    auto vtype = bg->cache->id_parser.GetLabelId(v);
-    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;
+    if (v < _vl->end_ && v >= _vl->begin_) return v - _vl->begin_;
+    if (_vl->is_simple) return GRIN_NULL_SIZE;
+    if (_vl->offsets.empty()) __grin_init_complex_vertex_list(static_cast<GRIN_GRAPH_T*>(g)->g, _vl);
+    auto _cache = static_cast<GRIN_GRAPH_T*>(g)->cache;
+    auto vtype = _cache->id_parser.GetLabelId(v);
+    return v - _vl->offsets[vtype].second + _vl->offsets[vtype].first;
 }
 #endif

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

@@ -36,9 +36,8 @@ GRIN_VERTEX grin_get_vertex_from_vertex_ref(GRIN_GRAPH g, GRIN_VERTEX_REF vr) {
 }
 
 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 bg = static_cast<GRIN_GRAPH_T*>(g);
-    return bg->cache->id_parser.GetFid(vr);
+    auto _cache = static_cast<GRIN_GRAPH_T*>(g)->cache;
+    return _cache->id_parser.GetFid(vr);
 }
 
 const char* grin_serialize_vertex_ref(GRIN_GRAPH g, GRIN_VERTEX_REF vr) {

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

@@ -20,28 +20,26 @@ extern "C" {
 
 #ifdef GRIN_TRAIT_SELECT_MASTER_FOR_VERTEX_LIST
 GRIN_VERTEX_LIST grin_select_master_for_vertex_list(GRIN_GRAPH g, GRIN_VERTEX_LIST vl) {
-    auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto _vl = static_cast<GRIN_VERTEX_LIST_T*>(vl);
     if (_vl->all_master_mirror > 0) return GRIN_NULL_LIST;
-
+    auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto fvl = new GRIN_VERTEX_LIST_T();
-    fvl->type_begin = _vl->type_begin;
-    fvl->type_end = _vl->type_end;
     fvl->all_master_mirror = 1;
-    __grin_init_vertex_list(_g, fvl);
+    fvl->vtype = _vl->vtype;
+    fvl->is_simple = _vl->is_simple;
+    if (fvl->is_simple) __grin_init_simple_vertex_list(_g, fvl);
     return fvl;
 }
 
 GRIN_VERTEX_LIST grin_select_mirror_for_vertex_list(GRIN_GRAPH g, GRIN_VERTEX_LIST vl) {
-    auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto _vl = static_cast<GRIN_VERTEX_LIST_T*>(vl);
     if (_vl->all_master_mirror > 0) return GRIN_NULL_LIST;
-
+    auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
     auto fvl = new GRIN_VERTEX_LIST_T();
-    fvl->type_begin = _vl->type_begin;
-    fvl->type_end = _vl->type_end;
     fvl->all_master_mirror = 2;
-    __grin_init_vertex_list(_g, fvl);
+    fvl->vtype = _vl->vtype;
+    fvl->is_simple = _vl->is_simple;
+    if (fvl->is_simple) __grin_init_simple_vertex_list(_g, fvl);
     return fvl;
 }
 #endif