@graphscope-neug/osx-arm64 0.2.0 → 0.2.1

package/CMakeLists.txt

@@ -62,13 +62,34 @@ add_dependencies(neug_node_bind neug_proto)
 set(NEUG_LIBRARIES neug)
 
 find_package(OpenSSL REQUIRED)
-target_link_libraries(neug_node_bind PRIVATE
-  ${NEUG_LIBRARIES}
-  ${GLOG_LIBRARIES}
-  ${Protobuf_LIBRARIES}
-  OpenSSL::SSL
-  OpenSSL::Crypto
-)
+if (WIN32)
+  set(NODE_IMPORT_LIB "" CACHE FILEPATH
+    "Path to the Node.js import library (node.lib)")
+  if (NOT NODE_IMPORT_LIB OR NOT EXISTS "${NODE_IMPORT_LIB}")
+    message(FATAL_ERROR
+      "Cannot find the Node.js import library. Set NODE_IMPORT_LIB to node.lib.")
+  endif()
+
+  # Protobuf namespace-scope default instances are not exported from neug.dll.
+  # Link the generated objects into the addon, matching the Windows Python binding.
+  target_link_libraries(neug_node_bind PRIVATE
+    ${NEUG_LIBRARIES}
+    ${GLOG_LIBRARIES}
+    ${Protobuf_LIBRARIES}
+    $<TARGET_OBJECTS:neug_proto>
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    "${NODE_IMPORT_LIB}"
+  )
+else()
+  target_link_libraries(neug_node_bind PRIVATE
+    ${NEUG_LIBRARIES}
+    ${GLOG_LIBRARIES}
+    ${Protobuf_LIBRARIES}
+    OpenSSL::SSL
+    OpenSSL::Crypto
+  )
+endif()
 
 target_compile_definitions(neug_node_bind PRIVATE
   NAPI_VERSION=8
@@ -99,13 +120,20 @@ endif()
 # into the package and replaces non-portable RPATHs before npm pack runs.
 if(APPLE)
   set(_neug_node_rpath "@loader_path")
-else()
+elseif(NOT WIN32)
   set(_neug_node_rpath "$ORIGIN")
 endif()
 
-set_target_properties(neug_node_bind PROPERTIES
-  BUILD_RPATH "${_neug_node_rpath}"
-  INSTALL_RPATH "${_neug_node_rpath}"
-  BUILD_WITH_INSTALL_RPATH FALSE
-)
-set_property(TARGET neug APPEND PROPERTY BUILD_RPATH "${_neug_node_rpath}")
+if(NOT WIN32)
+  set_target_properties(neug_node_bind PROPERTIES
+    BUILD_RPATH "${_neug_node_rpath}"
+    INSTALL_RPATH "${_neug_node_rpath}"
+    BUILD_WITH_INSTALL_RPATH FALSE
+  )
+  set_property(TARGET neug APPEND PROPERTY BUILD_RPATH "${_neug_node_rpath}")
+else()
+  # Windows has no RPATH. Keep neug.dll beside the addon so the loader can find it.
+  add_custom_command(TARGET neug_node_bind POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:neug> $<TARGET_FILE_DIR:neug_node_bind>)
+endif()

package/README.md

@@ -86,7 +86,7 @@ For local source builds, use `NEUG_NATIVE_ARCH=ON make dev`.
 The resulting tarball can be installed without a C++ build environment:
 
 ```bash
-npm install ./neug-0.2.0.tgz
+npm install ./neug-0.2.1.tgz
 ```
 
  
@@ -142,8 +142,8 @@ db.close();
 ## Explicit Transactions
 
 Since v0.2, the embedded Node.js `Connection` API supports explicit AP
-transactions. Auto-commit remains the default; begin a transaction only when
-multiple ordinary queries must share one private view and one final commit.
+transactions. Auto-commit remains the default; begin a transaction when
+multiple queries must share one private view and one final commit.
 
 ```js
 const conn = db.connect();
@@ -163,5 +163,9 @@ conn.rollback();
 `hasActiveTransaction` remains true after a failed statement because the
 connection is rollback-only. Call `rollback()` before issuing another query.
 Nested transactions, read-to-write upgrades, Cypher `BEGIN`/`COMMIT`/`ROLLBACK`,
-and explicit-transaction COPY, batch, index, checkpoint, procedure, and
-temporary-schema operations are not supported.
+checkpoint/maintenance, and mutating procedure calls are not supported. Since
+v0.2.1, embedded read-write transactions may group persistent `COPY FROM`
+statements with ordinary DML and DDL into one checkpoint at `commit()`;
+graph-read-only `LOAD FROM`/`COPY TO` and `COPY TEMP` may run in either
+transaction mode, and `COPY TEMP` may be mixed with durable writes (only
+persistent changes reach disk).

package/lib/binding.js

@@ -16,14 +16,15 @@
 'use strict';
 
 // Native artifacts live in build/<Release|Debug>/<platform>/.
-// Platform tags: linux_x86_64, linux_arm64, osx_x86_64, osx_arm64
+// Platform tags: linux_x86_64, linux_arm64, osx_x86_64, osx_arm64,
+// windows_x86_64
 // Prefer Debug if present (dev intent); otherwise Release (the only
 // flavor shipped in npm tarballs).
 
 const path = require('path');
 const fs = require('fs');
 
-const OS_MAP = { linux: 'linux', darwin: 'osx' };
+const OS_MAP = { linux: 'linux', darwin: 'osx', win32: 'windows' };
 const ARCH_MAP = { x64: 'x86_64', arm64: 'arm64' };
 
 const os = OS_MAP[process.platform];

package/lib/connection.js

@@ -77,6 +77,8 @@ class Connection {
    * @param {{readOnly?: boolean}} [options={}] Transaction options.
    * @param {boolean} [options.readOnly=false] Pin one read view and reject
    *   writes. By default, the transaction uses a private COW write view.
+   *   Since v0.2.1, persistent COPY FROM statements may be grouped with
+   *   ordinary DML/DDL into one checkpoint at commit.
    * @throws {Error} If the connection is closed or already has an active
    *   transaction.
    */
@@ -102,6 +104,8 @@ class Connection {
   /**
    * Commit the active explicit transaction.
    *
+   * Persistent COPY FROM statements are published through one checkpoint;
+   * other writes use the ordinary logical-WAL commit path.
    * A rollback-only transaction must be rolled back instead.
    */
   commit() {

package/lib/database.js

@@ -28,7 +28,11 @@ const {
 // Load the native binding (unified loader handles prebuilds/ and build/)
 const nativeBinding = require('./binding');
 
-const ILLEGAL_CHARS = ['?', '*', '"', '<', '>', '|', ':', '\\'];
+// On Windows, ':' (drive letter) and '\' (path separator) are valid, matching
+// the Python binding's platform-aware validation.
+const ILLEGAL_CHARS = process.platform === 'win32'
+  ? ['?', '*', '"', '<', '>', '|']
+  : ['?', '*', '"', '<', '>', '|', ':', '\\'];
 const PURE_MEMORY_PATHS = [':memory', ':memory:'];
 const VALID_MODES = [
   'r', 'read', 'w', 'rw', 'write',
@@ -58,9 +62,12 @@ const VALID_MODES = [
  */
 class Database {
   /**
-   * Return the number of online CPUs, using the same system call as
-   * Python's os.cpu_count() (sysconf(_SC_NPROCESSORS_ONLN)).
-   * This is more reliable than os.cpus().length on arm64 Linux.
+   * Return the number of CPUs usable by the process, via the portable
+   * std::thread::hardware_concurrency() in the native binding
+   * (sysconf(_SC_NPROCESSORS_ONLN) on POSIX, GetSystemInfo on Windows).
+   * Typically matches Python's os.cpu_count() on mainstream platforms;
+   * returns 1 when the count is not detectable. This is more reliable
+   * than os.cpus().length on arm64 Linux.
    * @returns {number}
    */
   static cpuCount() {
@@ -121,8 +128,9 @@ class Database {
       );
     }
 
-    // Use sysconf(_SC_NPROCESSORS_ONLN) via native binding to match
-    // Python's os.cpu_count() behaviour (especially on arm64 Linux).
+    // Use std::thread::hardware_concurrency() via native binding (with a
+    // minimum of 1) to match Python's os.cpu_count() behaviour on
+    // mainstream platforms (especially on arm64 Linux).
     const cpuCount = Database.cpuCount();
     if (maxThreadNum > cpuCount) {
       throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphscope-neug/osx-arm64",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "NeuG Graph Database Node.js bindings - high performance embedded graph database with Cypher query support",
   "main": "lib/index.js",
   "exports": "./lib/index.js",

package/src/node_database.cc

@@ -15,7 +15,7 @@
 
 #include "node_database.h"
 
-#include <unistd.h>
+#include <thread>
 
 #include <string>
 
@@ -156,7 +156,7 @@ Napi::Value NodeDatabase::Close(const Napi::CallbackInfo& info) {
 }
 
 Napi::Value NodeDatabase::GetCpuCount(const Napi::CallbackInfo& info) {
-  long n = sysconf(_SC_NPROCESSORS_ONLN);
+  unsigned int n = std::thread::hardware_concurrency();
   if (n < 1) {
     n = 1;
   }