Merge branch 'main' into improve-cli

Author: lnfjpt

.github/workflows/neug-test.yml

@@ -306,6 +306,7 @@ jobs:
       run: |
         cd ${GITHUB_WORKSPACE}/tools/python_bind/
         python3 -m pytest --cov=neug --cov-report=term --exitfirst --cov-append --cov-config=.coveragerc -sv tests/test_db_query.py
+        python3 -m pytest --cov=neug --cov-report=term --exitfirst --cov-append --cov-config=.coveragerc -sv tests/test_call_string_literal.py
         python3 -m pytest --cov=neug --cov-report=term --exitfirst --cov-append --cov-config=.coveragerc -sv tests/test_dataset.py
         python3 -m pytest --cov=neug --cov-report=term --exitfirst --cov-append --cov-config=.coveragerc -sv tests/test_merge.py
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/NEUG_VERSION NEUG_VERSION)
 # Strip trailing newline
@@ -279,8 +279,14 @@ macro(install_neug_target target)
         set(_neug_install_target ${target})
     endif()
 
-    get_target_property(_neug_public_headers ${_neug_install_target} PUBLIC_HEADER)
-    get_target_property(_neug_target_source_dir ${_neug_install_target} SOURCE_DIR)
+    get_target_property(_neug_target_type ${_neug_install_target} TYPE)
+    if(_neug_target_type STREQUAL "INTERFACE_LIBRARY")
+        set(_neug_public_headers "_neug_public_headers-NOTFOUND")
+        set(_neug_target_source_dir "")
+    else()
+        get_target_property(_neug_public_headers ${_neug_install_target} PUBLIC_HEADER)
+        get_target_property(_neug_target_source_dir ${_neug_install_target} SOURCE_DIR)
+    endif()
     if(_neug_public_headers AND NOT _neug_public_headers STREQUAL "_neug_public_headers-NOTFOUND" AND NOT _neug_public_headers STREQUAL "NOTFOUND")
         set(_neug_public_header_abs)
         foreach(_hdr IN LISTS _neug_public_headers)

cmake/BuildGlogAsThirdParty.cmake

@@ -19,11 +19,21 @@ function (build_glog_as_third_party)
     set(WITH_GFLAGS OFF CACHE BOOL "Build glog without gflags" FORCE)
     set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build static library" FORCE)
     set(BUILD_TESTING OFF CACHE BOOL "Build glog tests" FORCE)
+
+    # Disable libunwind in glog to prevent _Unwind_* symbol conflict with
+    # libgcc_s.so.1. When both libunwind.so.8 and libgcc_s.so.1 are loaded,
+    # the dynamic linker may resolve _Unwind_RaiseException to libunwind's
+    # version which cannot dispatch C++ exceptions, causing abort() instead
+    # of reaching catch blocks. With WITH_UNWIND=OFF, glog falls back to
+    # _Unwind_Backtrace from <unwind.h> (provided by libgcc_s) for stack
+    # traces in LOG(FATAL) / signal handlers — same quality, no conflict.
+    set(WITH_UNWIND OFF CACHE BOOL "Disable libunwind to avoid symbol conflict with libgcc_s" FORCE)
+
     add_subdirectory(third_party/glog)
     include_directories(third_party/glog/src)
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/glog/) # For generated headers
     set_target_properties(glog PROPERTIES DEBUG_POSTFIX "")
     set(GLOG_LIBRARIES glog::glog PARENT_SCOPE)
     set(GLOG_LIB glog::glog PARENT_SCOPE)
     set(GLOG_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/third_party/glog/src PARENT_SCOPE)
-endfunction()
+endfunction()

cmake/neug_symbol_visibility.cmake

@@ -41,4 +41,4 @@ macro(neug_apply_symbol_visibility target)
         set_target_properties(${target} PROPERTIES LINK_DEPENDS
             "${CMAKE_SOURCE_DIR}/cmake/neug_exports.ld")
     endif()
-endmacro()
+endmacro()

doc/source/installation/installation.md

@@ -54,7 +54,7 @@ make install
 In your cmake project, find and link NeuG libraries with the following command:
 
 ```cmake
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.16)
 project (
   NeuGTest
   VERSION 0.1

include/neug/compiler/common/in_mem_overflow_buffer.h

@@ -22,6 +22,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iterator>
 #include <memory>
 #include <vector>
@@ -39,15 +40,16 @@ namespace common {
 
 struct NEUG_API BufferBlock {
  public:
-  explicit BufferBlock(std::unique_ptr<storage::MemoryBuffer> block);
+  explicit BufferBlock(uint64_t size);
   ~BufferBlock();
 
-  uint64_t size() const;
-  uint8_t* data() const;
+  uint64_t size() const { return bufferSize; }
+  uint8_t* data() const { return buffer.get(); }
 
  public:
   uint64_t currentOffset;
-  std::unique_ptr<storage::MemoryBuffer> block;
+  uint64_t bufferSize;
+  std::unique_ptr<uint8_t[]> buffer;
 
   void resetCurrentOffset() { currentOffset = 0; }
 };

include/neug/storages/csr/csr_base.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "neug/storages/allocators.h"
@@ -94,8 +95,9 @@ class CsrBase {
   virtual void revert_delete_edge(vid_t src, vid_t nbr, int32_t offset,
                                   timestamp_t ts) = 0;
 
-  virtual int32_t put_generic_edge(vid_t src, vid_t dst, const Property& data,
-                                   timestamp_t ts, Allocator& alloc) = 0;
+  virtual std::pair<int32_t, const void*> put_generic_edge(
+      vid_t src, vid_t dst, const Property& data, timestamp_t ts,
+      Allocator& alloc) = 0;
 
   virtual std::tuple<std::vector<vid_t>, std::vector<vid_t>> batch_export(
       std::shared_ptr<ColumnBase> prev_data_col) const = 0;
@@ -109,14 +111,18 @@ class TypedCsrBase : public CsrBase {
                                const std::vector<EDATA_T>& data_list,
                                timestamp_t ts = 0) = 0;
 
-  virtual int32_t put_edge(vid_t src, vid_t dst, const EDATA_T& data,
-                           timestamp_t ts, Allocator& alloc) {
+  virtual std::pair<int32_t, const void*> put_edge(vid_t src, vid_t dst,
+                                                   const EDATA_T& data,
+                                                   timestamp_t ts,
+                                                   Allocator& alloc) {
     LOG(FATAL) << "not supported...";
-    return 0;
+    return {0, nullptr};
   }
 
-  int32_t put_generic_edge(vid_t src, vid_t dst, const Property& data,
-                           timestamp_t ts, Allocator& alloc) override {
+  std::pair<int32_t, const void*> put_generic_edge(vid_t src, vid_t dst,
+                                                   const Property& data,
+                                                   timestamp_t ts,
+                                                   Allocator& alloc) override {
     return this->put_edge(src, dst, PropUtils<EDATA_T>::to_typed(data), ts,
                           alloc);
   }

include/neug/storages/csr/mutable_csr.h

@@ -110,8 +110,9 @@ class MutableCsr : public TypedCsrBase<EDATA_T> {
                        const std::vector<EDATA_T>& data_list,
                        timestamp_t ts = 0) override;
 
-  int32_t put_edge(vid_t src, vid_t dst, const EDATA_T& data, timestamp_t ts,
-                   Allocator& alloc) override {
+  std::pair<int32_t, const void*> put_edge(vid_t src, vid_t dst,
+                                           const EDATA_T& data, timestamp_t ts,
+                                           Allocator& alloc) override {
     if (src >= vertex_capacity()) {
       THROW_INVALID_ARGUMENT_EXCEPTION(
           "Source vertex id out of range: " + std::to_string(src) +
@@ -140,8 +141,9 @@ class MutableCsr : public TypedCsrBase<EDATA_T> {
     nbr.data = data;
     nbr.timestamp.store(ts);
     edge_num_.fetch_add(1);
+    const void* data_ptr = static_cast<const void*>(&nbr.data);
     locks_[src].unlock();
-    return prev_size;
+    return {prev_size, data_ptr};
   }
 
   std::tuple<std::vector<vid_t>, std::vector<vid_t>> batch_export(
@@ -270,8 +272,9 @@ class SingleMutableCsr : public TypedCsrBase<EDATA_T> {
                        const std::vector<EDATA_T>& data_list,
                        timestamp_t ts = 0) override;
 
-  int32_t put_edge(vid_t src, vid_t dst, const EDATA_T& data, timestamp_t ts,
-                   Allocator& alloc) override {
+  std::pair<int32_t, const void*> put_edge(vid_t src, vid_t dst,
+                                           const EDATA_T& data, timestamp_t ts,
+                                           Allocator& alloc) override {
     if (src >= vertex_capacity()) {
       THROW_INVALID_ARGUMENT_EXCEPTION(
           "Source vertex id out of range: " + std::to_string(src) +
@@ -283,7 +286,7 @@ class SingleMutableCsr : public TypedCsrBase<EDATA_T> {
     CHECK_EQ(nbrs[src].timestamp, std::numeric_limits<timestamp_t>::max());
     nbrs[src].timestamp.store(ts);
     edge_num_.fetch_add(1, std::memory_order_relaxed);
-    return 0;
+    return {0, static_cast<const void*>(&nbrs[src].data)};
   }
 
   std::tuple<std::vector<vid_t>, std::vector<vid_t>> batch_export(
@@ -391,9 +394,10 @@ class EmptyCsr : public TypedCsrBase<EDATA_T> {
                        const std::vector<EDATA_T>& data_list,
                        timestamp_t ts = 0) override {}
 
-  int32_t put_edge(vid_t src, vid_t dst, const EDATA_T& data, timestamp_t ts,
-                   Allocator&) override {
-    return 0;
+  std::pair<int32_t, const void*> put_edge(vid_t src, vid_t dst,
+                                           const EDATA_T& data, timestamp_t ts,
+                                           Allocator&) override {
+    return {0, nullptr};
   }
 
   std::tuple<std::vector<vid_t>, std::vector<vid_t>> batch_export(

include/neug/storages/graph/edge_table.h

@@ -20,6 +20,7 @@
 #include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "neug/storages/allocators.h"
@@ -91,9 +92,9 @@ class EdgeTable {
 
   // Add a single edge to the edge table. Note this method requires an Allocator
   // to allocate memory for the edge data. Should be called in tp mode.
-  int32_t AddEdge(vid_t src_lid, vid_t dst_lid,
-                  const std::vector<Property>& properties, timestamp_t ts,
-                  Allocator& alloc, bool insert_safe);
+  std::pair<int32_t, const void*> AddEdge(
+      vid_t src_lid, vid_t dst_lid, const std::vector<Property>& properties,
+      timestamp_t ts, Allocator& alloc, bool insert_safe);
 
   void RenameProperties(const std::vector<std::string>& old_names,
                         const std::vector<std::string>& new_names);

include/neug/storages/graph/graph_interface.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include <optional>
 #include "neug/storages/graph/property_graph.h"
 #include "neug/storages/graph/schema.h"
 #include "neug/utils/property/types.h"
@@ -365,8 +366,9 @@ class StorageReadInterface : virtual public IStorageInterface {
  * inserter.AddVertex(person_label, Property("alice"), props, vid);
  *
  * // Add edge between vertices
+ * const void* edge_prop = nullptr;
  * inserter.AddEdge(person_label, src_vid, person_label, dst_vid, knows_label,
- * {});
+ *                  {}, edge_prop);
  * @endcode
  *
  * @note This interface is write-only; use StorageReadInterface for reads.
@@ -391,11 +393,12 @@ class StorageInsertInterface : virtual public IStorageInterface {
    * @param label Vertex label
    * @param id Primary key value
    * @param props Property values (excluding primary key)
-   * @param vid Output: assigned internal vertex ID
-   * @return true if vertex added successfully
+   * @param vid Output: assigned internal vertex ID on success
+   * @return Status::OK() on success, or an error Status if validation fails
+   *         (e.g. property count/type mismatch, capacity failure).
    */
-  virtual bool AddVertex(label_t label, const Property& id,
-                         const std::vector<Property>& props, vid_t& vid) = 0;
+  virtual Status AddVertex(label_t label, const Property& id,
+                           const std::vector<Property>& props, vid_t& vid) = 0;
 
   /**
    * @brief Add a single edge to the graph.
@@ -406,11 +409,16 @@ class StorageInsertInterface : virtual public IStorageInterface {
    * @param dst Destination vertex internal ID
    * @param edge_label Edge label
    * @param properties Edge property values
-   * @return true if edge added successfully
+   * @param prop Output: pointer to the inserted edge property storage. For an
+   *             insert transaction the edge property is not actually inserted
+   *             into the graph until commit, so this is set to nullptr.
+   * @return Status::OK() on success, or an error Status if validation fails
+   *         (e.g. missing source/destination vertex, property mismatch).
    */
-  virtual bool AddEdge(label_t src_label, vid_t src, label_t dst_label,
-                       vid_t dst, label_t edge_label,
-                       const std::vector<Property>& properties) = 0;
+  virtual Status AddEdge(label_t src_label, vid_t src, label_t dst_label,
+                         vid_t dst, label_t edge_label,
+                         const std::vector<Property>& properties,
+                         const void*& prop) = 0;
 
   /**
    * @brief Batch insert vertices from a record supplier.
@@ -517,12 +525,13 @@ class StorageUpdateInterface : public StorageReadInterface,
                                   int32_t ie_offset, int32_t col_id,
                                   const Property& value) = 0;
 
-  virtual bool AddVertex(label_t label, const Property& id,
-                         const std::vector<Property>& props,
-                         vid_t& vid) override = 0;
-  virtual bool AddEdge(label_t src_label, vid_t src, label_t dst_label,
-                       vid_t dst, label_t edge_label,
-                       const std::vector<Property>& properties) override = 0;
+  virtual Status AddVertex(label_t label, const Property& id,
+                           const std::vector<Property>& props,
+                           vid_t& vid) override = 0;
+  virtual Status AddEdge(label_t src_label, vid_t src, label_t dst_label,
+                         vid_t dst, label_t edge_label,
+                         const std::vector<Property>& properties,
+                         const void*& prop) override = 0;
 
   /**
    * @brief Delete multiple vertices by their internal IDs.
@@ -599,11 +608,11 @@ class StorageAPUpdateInterface : public StorageUpdateInterface {
                           vid_t dst, label_t edge_label, int32_t oe_offset,
                           int32_t ie_offset, int32_t col_id,
                           const Property& value) override;
-  bool AddVertex(label_t label, const Property& id,
-                 const std::vector<Property>& props, vid_t& vid) override;
-  bool AddEdge(label_t src_label, vid_t src, label_t dst_label, vid_t dst,
-               label_t edge_label,
-               const std::vector<Property>& properties) override;
+  Status AddVertex(label_t label, const Property& id,
+                   const std::vector<Property>& props, vid_t& vid) override;
+  Status AddEdge(label_t src_label, vid_t src, label_t dst_label, vid_t dst,
+                 label_t edge_label, const std::vector<Property>& properties,
+                 const void*& prop) override;
   void CreateCheckpoint() override;
   Status BatchAddVertices(
       label_t v_label_id,