fix original id impl

Author: andydiwenzhu

modules/graph/grin/c/test.c

@@ -298,19 +298,20 @@ void test_property_topology(int argc, char** argv) {
 #endif
 
 #ifdef GRIN_ASSUME_BY_TYPE_VERTEX_ORIGINAL_ID
-  GRIN_DATATYPE dt = grin_get_vertex_original_id_type(g);
+  GRIN_DATATYPE dt = grin_get_vertex_original_id_data_type(g);
   if (dt == Int64) {
-    long int v0id = 4;
-    GRIN_VERTEX v0 = grin_get_vertex_by_original_id_by_type(g, vt, &v0id);
+    long long int v0id = 4;
+    GRIN_VERTEX v0 = grin_get_vertex_by_original_id_by_type(g, vt, dt, &v0id);
     if (v0 == GRIN_NULL_VERTEX) {
-      printf("(Wrong) vertex of id %ld can not be found\n", v0id);
+      printf("(Wrong) vertex of id %lld can not be found\n", v0id);
     } else {
-      printf("vertex of original id %ld found\n", v0id);
-      GRIN_VERTEX_ORIGINAL_ID oid0 = grin_get_vertex_original_id(g, v0);
-      printf("get vertex original id: %ld\n", *((long int*) oid0));
-      grin_destroy_vertex_original_id(g, oid0);
+      printf("vertex of original id %lld found\n", v0id);
+      const void* oid0 = grin_get_vertex_original_id_value(g, v0);
+      printf("get vertex original id: %lld\n", *((long long int*) oid0));
     }
     grin_destroy_vertex(g, v0);
+  } else {
+    printf("(Wrong) vertex original id type not int64\n");
   }
 #endif
 
@@ -759,10 +760,14 @@ void test_property_primary_key(int argc, char** argv) {
         if (v == GRIN_NULL_VERTEX) {
           printf("(Wrong) vertex of primary keys %zu does not exist\n", j);
         } else {
-          GRIN_VERTEX_ORIGINAL_ID oid0 = grin_get_vertex_original_id(g, v);
-          printf("(Correct) vertex of primary keys %zu exists %ld\n", j,
-                 *((long int*) oid0));
-          grin_destroy_vertex_original_id(g, oid0);
+          GRIN_DATATYPE dt0 = grin_get_vertex_original_id_data_type(g);
+          const void* oid0 = grin_get_vertex_original_id_value(g, v);
+          if (dt0 == Int64) {
+            printf("(Correct) vertex of primary keys %zu exists %lld\n", j,
+                 *((long long int*) oid0));
+          } else {
+            printf("(Wrong) unmatch original id type\n");
+          }
           grin_destroy_vertex(g, v);
         }
       } else {

modules/graph/grin/include

@@ -169,18 +169,14 @@ extern "C" {
 
     #[cfg(feature = "grin_with_vertex_original_id")]
     #[allow(unused)]
-    pub fn grin_destroy_vertex_original_id(arg1: GrinGraph, arg2: GrinVertexOriginalId);
+    pub fn grin_get_vertex_original_id_data_type(arg1: GrinGraph) -> GrinDatatype;
 
     #[cfg(feature = "grin_with_vertex_original_id")]
     #[allow(unused)]
-    pub fn grin_get_vertex_original_id_type(arg1: GrinGraph) -> GrinDatatype;
-
-    #[cfg(feature = "grin_with_vertex_original_id")]
-    #[allow(unused)]
-    pub fn grin_get_vertex_original_id(
+    pub fn grin_get_vertex_original_id_value(
         arg1: GrinGraph,
         arg2: GrinVertex,
-    ) -> GrinVertexOriginalId;
+    ) -> *const ::std::os::raw::c_void;
 
     #[allow(unused)]
     pub fn grin_destroy_value(
@@ -1061,7 +1057,8 @@ extern "C" {
     pub fn grin_get_vertex_by_original_id_by_type(
         arg1: GrinGraph,
         arg2: GrinVertexType,
-        arg3: GrinVertexOriginalId,
+        arg3: GrinDatatype,
+        arg4: *const ::std::os::raw::c_void,
     ) -> GrinVertex;
 
     #[cfg(feature = "grin_trait_select_type_for_vertex_list")]

modules/graph/grin/rust/grin_v6d.rs

@@ -30,12 +30,13 @@ size_t grin_get_position_of_vertex_from_sorted_list(GRIN_GRAPH g, GRIN_VERTEX_LI
     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);
-    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;
+    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;
 }
 #endif

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

@@ -30,9 +30,9 @@ size_t grin_get_edge_num_by_type(GRIN_GRAPH g, GRIN_EDGE_TYPE etype) {
 #endif
 
 #ifdef GRIN_ASSUME_BY_TYPE_VERTEX_ORIGINAL_ID
-GRIN_VERTEX grin_get_vertex_by_original_id_by_type(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype, GRIN_VERTEX_ORIGINAL_ID oid) {
+GRIN_VERTEX grin_get_vertex_by_original_id_by_type(GRIN_GRAPH g, GRIN_VERTEX_TYPE vtype, GRIN_DATATYPE dt, const void* oid) {
     auto _g = static_cast<GRIN_GRAPH_T*>(g)->g;
-    auto _oid = static_cast<VERTEX_ORIGINAL_ID_T*>(oid);
+    auto _oid = static_cast<const VERTEX_ORIGINAL_ID_T*>(oid);
     _GRIN_GRAPH_T::vid_t gid;
     auto v = new GRIN_VERTEX_T();
     if (_g->Oid2Gid(vtype, *_oid, gid)) {

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

@@ -79,17 +79,12 @@ bool grin_equal_vertex(GRIN_GRAPH g, GRIN_VERTEX v1, GRIN_VERTEX v2) {
 
 
 #ifdef GRIN_WITH_VERTEX_ORIGINAL_ID
-void grin_destroy_vertex_original_id(GRIN_GRAPH g, GRIN_VERTEX_ORIGINAL_ID oid) {
-    auto _oid = static_cast<VERTEX_ORIGINAL_ID_T*>(oid);
-    delete _oid;
-} 
 
-GRIN_DATATYPE grin_get_vertex_original_id_type(GRIN_GRAPH g) {
+GRIN_DATATYPE grin_get_vertex_original_id_data_type(GRIN_GRAPH g) {
     return GRIN_DATATYPE_ENUM<VERTEX_ORIGINAL_ID_T>::value;
 }
 
-
-GRIN_VERTEX_ORIGINAL_ID grin_get_vertex_original_id(GRIN_GRAPH g, GRIN_VERTEX v) {
+const void* grin_get_vertex_original_id_value(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);
@@ -99,7 +94,7 @@ GRIN_VERTEX_ORIGINAL_ID grin_get_vertex_original_id(GRIN_GRAPH g, GRIN_VERTEX v)
 #endif
 
 #if defined(GRIN_WITH_VERTEX_ORIGINAL_ID) && !defined(GRIN_ASSUME_BY_TYPE_VERTEX_ORIGINAL_ID)
-GRIN_VERTEX grin_get_vertex_by_original_id(GRIN_GRAPH, GRIN_VERTEX_ORIGINAL_ID);
+GRIN_VERTEX grin_get_vertex_by_original_id(GRIN_GRAPH, GRIN_DATATYPE, const void*);
 #endif
 
 // Data