From 41a9db0add48fd6cb21e879b823e6c28126ea27c Mon Sep 17 00:00:00 2001
From: Tao He <linzhu.ht@alibaba-inc.com>
Date: Mon, 1 Apr 2024 12:01:51 +0800
Subject: [PATCH] Fixes value getters for date/time/timestamp arrays (#1853)

Fixes #1849

Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com>
---
 modules/basic/ds/arrow_utils.cc               | 10 ++++-----
 .../fragment/arrow_fragment.vineyard-mod      | 20 +----------------
 modules/graph/fragment/arrow_fragment_impl.h  | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/modules/basic/ds/arrow_utils.cc b/modules/basic/ds/arrow_utils.cc
index a431cb1b..026f871b 100644
--- a/modules/basic/ds/arrow_utils.cc
+++ b/modules/basic/ds/arrow_utils.cc
@@ -925,19 +925,19 @@ const void* get_arrow_array_data(std::shared_ptr<arrow::Array> const& array) {
         std::dynamic_pointer_cast<arrow::LargeStringArray>(array).get());
   } else if (array->type()->Equals(arrow::date32())) {
     return reinterpret_cast<const void*>(
-        std::dynamic_pointer_cast<arrow::Date32Array>(array).get());
+        std::dynamic_pointer_cast<arrow::Date32Array>(array)->raw_values());
   } else if (array->type()->Equals(arrow::date64())) {
     return reinterpret_cast<const void*>(
-        std::dynamic_pointer_cast<arrow::Date64Array>(array).get());
+        std::dynamic_pointer_cast<arrow::Date64Array>(array)->raw_values());
   } else if (array->type()->id() == arrow::Type::TIME32) {
     return reinterpret_cast<const void*>(
-        std::dynamic_pointer_cast<arrow::Time32Array>(array).get());
+        std::dynamic_pointer_cast<arrow::Time32Array>(array)->raw_values());
   } else if (array->type()->id() == arrow::Type::TIME64) {
     return reinterpret_cast<const void*>(
-        std::dynamic_pointer_cast<arrow::Time64Array>(array).get());
+        std::dynamic_pointer_cast<arrow::Time64Array>(array)->raw_values());
   } else if (array->type()->id() == arrow::Type::TIMESTAMP) {
     return reinterpret_cast<const void*>(
-        std::dynamic_pointer_cast<arrow::TimestampArray>(array).get());
+        std::dynamic_pointer_cast<arrow::TimestampArray>(array)->raw_values());
   } else if (array->type()->id() == arrow::Type::LIST) {
     return reinterpret_cast<const void*>(
         std::dynamic_pointer_cast<arrow::ListArray>(array).get());
diff --git a/modules/graph/fragment/arrow_fragment.vineyard-mod b/modules/graph/fragment/arrow_fragment.vineyard-mod
index 22c03e7a..a6b909d7 100644
--- a/modules/graph/fragment/arrow_fragment.vineyard-mod
+++ b/modules/graph/fragment/arrow_fragment.vineyard-mod
@@ -141,25 +141,7 @@ class [[vineyard]] ArrowFragment
 
   const std::string oid_typename() const override { return oid_type; }
 
-  void PostConstruct(const vineyard::ObjectMeta& meta) override {
-    vid_parser_.Init(fnum_, vertex_label_num_);
-    this->schema_.FromJSON(schema_json_);
-
-    // init pointers for arrays and tables
-    initPointers();
-
-    // init edge numbers
-    oenum_ = 0;
-    ienum_ = 0;
-    for (label_id_t i = 0; i < vertex_label_num_; i++) {
-      for (auto& v : InnerVertices(i)) {
-        for (label_id_t j = 0; j < edge_label_num_; j++) {
-          oenum_ += GetLocalOutDegree(v, j);
-          ienum_ += GetLocalInDegree(v, j);
-        }
-      }
-    }
-  }
+  void PostConstruct(const vineyard::ObjectMeta& meta) override;
 
   fid_t fid() const { return fid_; }
 
diff --git a/modules/graph/fragment/arrow_fragment_impl.h b/modules/graph/fragment/arrow_fragment_impl.h
index 144c215a..cd9ea477 100644
--- a/modules/graph/fragment/arrow_fragment_impl.h
+++ b/modules/graph/fragment/arrow_fragment_impl.h
@@ -54,6 +54,28 @@ limitations under the License.
 
 namespace vineyard {
 
+template <typename OID_T, typename VID_T, typename VERTEX_MAP_T, bool COMPACT>
+void ArrowFragment<OID_T, VID_T, VERTEX_MAP_T, COMPACT>::PostConstruct(
+    const vineyard::ObjectMeta& meta) {
+  vid_parser_.Init(fnum_, vertex_label_num_);
+  this->schema_.FromJSON(schema_json_);
+
+  // init pointers for arrays and tables
+  initPointers();
+
+  // init edge numbers
+  oenum_ = 0;
+  ienum_ = 0;
+  for (label_id_t i = 0; i < vertex_label_num_; i++) {
+    for (auto& v : InnerVertices(i)) {
+      for (label_id_t j = 0; j < edge_label_num_; j++) {
+        oenum_ += GetLocalOutDegree(v, j);
+        ienum_ += GetLocalInDegree(v, j);
+      }
+    }
+  }
+}
+
 template <typename OID_T, typename VID_T, typename VERTEX_MAP_T, bool COMPACT>
 void ArrowFragment<OID_T, VID_T, VERTEX_MAP_T, COMPACT>::PrepareToRunApp(
     const grape::CommSpec& comm_spec, grape::PrepareConf conf) {