fix get string bug

Author: andydiwenzhu

modules/graph/grin/rust/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["dijie"]
 
 [features]
-default = ["grin_assume_has_directed_graph", "grin_assume_has_undirected_graph", "grin_assume_has_multi_edge_graph", "grin_enable_vertex_list", "grin_enable_vertex_list_array", "grin_enable_vertex_list_iterator", "grin_enable_adjacent_list", "grin_enable_adjacent_list_array", "grin_enable_adjacent_list_iterator", "grin_enable_graph_partition", "grin_trait_natural_id_for_partition", "grin_enable_vertex_ref", "grin_trait_fast_vertex_ref", "grin_assume_edge_cut_partition", "grin_trait_select_master_for_vertex_list", "grin_enable_row", "grin_trait_const_value_ptr", "grin_with_vertex_property", "grin_with_vertex_property_name", "grin_with_vertex_type_name", "grin_trait_natural_id_for_vertex_type", "grin_enable_vertex_primary_keys", "grin_trait_natural_id_for_vertex_property", "grin_with_edge_property", "grin_with_edge_property_name", "grin_with_edge_type_name", "grin_trait_natural_id_for_edge_type", "grin_trait_natural_id_for_edge_property", "grin_trait_select_type_for_vertex_list", "grin_trait_select_edge_type_for_adjacent_list", "grin_assume_column_store_for_vertex_property", "grin_assume_column_store_for_edge_property", "grin_assume_all_vertex_list_sorted", "grin_enable_vertex_original_id_of_int64"]
+default = ["grin_assume_has_directed_graph", "grin_assume_has_undirected_graph", "grin_assume_has_multi_edge_graph", "grin_enable_vertex_list", "grin_enable_vertex_list_array", "grin_enable_vertex_list_iterator", "grin_enable_adjacent_list", "grin_enable_adjacent_list_array", "grin_enable_adjacent_list_iterator", "grin_enable_graph_partition", "grin_trait_natural_id_for_partition", "grin_enable_vertex_ref", "grin_trait_fast_vertex_ref", "grin_assume_edge_cut_partition", "grin_trait_select_master_for_vertex_list", "grin_enable_row", "grin_trait_const_value_ptr", "grin_with_vertex_property", "grin_with_vertex_property_name", "grin_with_vertex_type_name", "grin_trait_natural_id_for_vertex_type", "grin_enable_vertex_primary_keys", "grin_trait_natural_id_for_vertex_property", "grin_with_edge_property", "grin_with_edge_property_name", "grin_with_edge_type_name", "grin_trait_natural_id_for_edge_type", "grin_trait_natural_id_for_edge_property", "grin_trait_select_type_for_vertex_list", "grin_trait_select_edge_type_for_adjacent_list", "grin_assume_all_vertex_list_sorted", "grin_enable_vertex_original_id_of_int64"]
 grin_assume_has_directed_graph = []
 grin_assume_has_undirected_graph = []
 grin_assume_has_multi_edge_graph = []
@@ -68,8 +68,6 @@ grin_assume_split_master_mirror_partition_for_vertex_property = []
 grin_assume_master_only_partition_for_edge_property = []
 grin_assume_replicate_master_mirror_partition_for_edge_property = []
 grin_assume_split_master_mirror_partition_for_edge_property = []
-grin_assume_column_store_for_vertex_property = []
-grin_assume_column_store_for_edge_property = []
 grin_with_vertex_label = []
 grin_with_edge_label = []
 grin_assume_all_vertex_list_sorted = []

modules/graph/grin/rust/grin_v6d.rs

@@ -408,6 +408,9 @@ extern "C" {
         arg3: GrinRow,
     ) -> GrinVertex;
 
+    #[allow(unused)]
+    pub fn grin_destroy_string_value(arg1: GrinGraph, arg2: *const ::std::os::raw::c_char);
+
     #[doc = " @brief get the vertex property name\n @param GrinGraph the graph\n @param GrinVertexProperty the vertex property"]
     #[cfg(feature = "grin_with_vertex_property_name")]
     #[allow(unused)]
@@ -786,9 +789,6 @@ extern "C" {
         arg3: GrinEdgeProperty,
     ) -> GrinEdgePropertyId;
 
-    #[allow(unused)]
-    pub fn grin_destroy_string_value(arg1: GrinGraph, arg2: *const ::std::os::raw::c_char);
-
     #[cfg(feature = "grin_enable_row")]
     #[allow(unused)]
     pub fn grin_destroy_row(arg1: GrinGraph, arg2: GrinRow);
@@ -943,12 +943,12 @@ extern "C" {
         arg4: usize,
     ) -> *const ::std::os::raw::c_void;
 
-    #[doc = " @brief get vertex row directly from the graph, this API only works for row store system\n @param GrinGraph the graph\n @param GrinVertex the vertex which is the row index\n @param GrinVertexPropertyList the vertex property list as columns"]
+    #[doc = " @brief get vertex row directly from the graph, this API only works for row store system\n @param GrinGraph the graph\n @param GrinVertex the vertex which is the row index"]
     #[cfg(all(feature = "grin_with_vertex_property", feature = "grin_enable_row"))]
     #[allow(unused)]
     pub fn grin_get_vertex_row(arg1: GrinGraph, arg2: GrinVertex) -> GrinRow;
 
-    #[doc = " @brief get edge row directly from the graph, this API only works for row store system\n @param GrinGraph the graph\n @param GrinEdge the edge which is the row index\n @param GrinEdgePropertyList the edge property list as columns"]
+    #[doc = " @brief get edge row directly from the graph, this API only works for row store system\n @param GrinGraph the graph\n @param GrinEdge the edge which is the row index"]
     #[cfg(all(feature = "grin_with_edge_property", feature = "grin_enable_row"))]
     #[allow(unused)]
     pub fn grin_get_edge_row(arg1: GrinGraph, arg2: GrinEdge) -> GrinRow;

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

@@ -136,7 +136,7 @@ double grin_get_vertex_property_value_of_double(GRIN_GRAPH g, GRIN_VERTEX v, GRI
 const char* grin_get_vertex_property_value_of_string(GRIN_GRAPH g, GRIN_VERTEX v, GRIN_VERTEX_PROPERTY vp) {
     const void* result = _get_value_from_vertex_property_table(g, v, vp);
     if (result == NULL) return NULL;
-    return static_cast<const char*>(result);
+    return static_cast<const std::string*>(result)->c_str();
 }
 
 int grin_get_vertex_property_value_of_date32(GRIN_GRAPH g, GRIN_VERTEX v, GRIN_VERTEX_PROPERTY vp) {
@@ -253,7 +253,7 @@ double grin_get_edge_property_value_of_double(GRIN_GRAPH g, GRIN_EDGE e, GRIN_ED
 const char* grin_get_edge_property_value_of_string(GRIN_GRAPH g, GRIN_EDGE e, GRIN_EDGE_PROPERTY ep) {
     const void* result = _get_value_from_edge_property_table(g, e, ep);
     if (result == NULL) return NULL;
-    return static_cast<const char*>(result);
+    return static_cast<const std::string*>(result)->c_str();
 }
 
 int grin_get_edge_property_value_of_date32(GRIN_GRAPH g, GRIN_EDGE e, GRIN_EDGE_PROPERTY ep) {

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

@@ -203,10 +203,10 @@ GRIN_ROW grin_get_edge_row(GRIN_GRAPH g, GRIN_EDGE e) {
 
     auto r = new GRIN_ROW_T();
     r->resize(_g->edge_property_num(etype));
-    for (auto ep = 0; ep < _g->edge_property_num(etype); ++ep) {
+    for (auto ep = 1; ep < _g->edge_property_num(etype); ++ep) {
         auto array = _cache->etables[etype]->column(ep)->chunk(0);
         auto result = vineyard::get_arrow_array_data_element(array, offset);
-        (*r)[ep] = result;
+        (*r)[ep-1] = result;
     }
     return r;
 }