Merge branch 'apache:master' into master

Author: bitflicker64

.dockerignore

@@ -0,0 +1,60 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# IMPORTANT: .dockerignore does NOT inherit .gitignore — patterns must be restated.
+
+# Build output
+**/target/
+
+# Pre-extracted release dirs / archives
+apache-hugegraph-*/
+**/*.tar
+**/*.tar.gz
+**/*.zip
+**/*.war
+
+# IDE / OS
+.idea/
+.vscode/
+**/*.iml
+**/*.iws
+**/.DS_Store
+
+# Build / runtime artifacts
+**/logs/
+**/*.log
+**/*.class
+**/gen-java/
+**/upload-files/
+**/build/
+**/node_modules/
+
+# Env files
+.env.local
+.env.*.local
+
+# Git internals
+.git
+.gitignore
+.gitattributes
+.github
+
+# Compose / docs not needed in build context
+**/docker-compose*.yml
+**/docker-compose*.yaml
+**/*.md
+docs/

.github/workflows/docker-build-ci.yml

@@ -0,0 +1,48 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: "Docker Build CI"
+
+on:
+  push:
+    branches:
+      - master
+      - 'release-*'
+  pull_request:
+    paths:
+      - '**/Dockerfile*'
+      - '.dockerignore'
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        dockerfile:
+          - hugegraph-pd/Dockerfile
+          - hugegraph-store/Dockerfile
+          - hugegraph-server/Dockerfile
+          - hugegraph-server/Dockerfile-hstore
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build ${{ matrix.dockerfile }}
+        run: |
+          docker build -f ${{ matrix.dockerfile }} .

.github/workflows/pd-store-ci.yml

@@ -52,6 +52,11 @@ jobs:
             mvn -U -ntp dependency:get -Dartifact=org.apache.hugegraph:hugegraph-struct:$REVISION
           fi
 
+      - name: Run hugegraph-struct test
+        if: ${{ hashFiles('hugegraph-struct/pom.xml') != '' }}
+        run: |
+          mvn -U -ntp -pl hugegraph-struct test
+
   pd:
     needs: struct
     runs-on: ubuntu-latest

.github/workflows/rerun-ci.yml

@@ -18,6 +18,7 @@ env:
 
 jobs:
   decide-rerun-action:
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
     runs-on: ubuntu-latest
     outputs:
       action: ${{ steps.decision.outputs.action }}
@@ -28,19 +29,16 @@ jobs:
           WORKFLOW_NAME: ${{ github.event.workflow_run.name }}
           RUN_ID: ${{ github.event.workflow_run.id }}
           RUN_ATTEMPT: ${{ github.event.workflow_run.run_attempt }}
-          CONCLUSION: ${{ github.event.workflow_run.conclusion }}
           EVENT_NAME: ${{ github.event.workflow_run.event }}
           HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
         run: |
           set -euo pipefail
 
           action="skip"
-          reason="non-failure"
+          reason="unsupported event: $EVENT_NAME"
 
-          if [[ "$CONCLUSION" == "failure" ]]; then
-            if [[ "$EVENT_NAME" != "push" && "$EVENT_NAME" != "pull_request" ]]; then
-              reason="unsupported event: $EVENT_NAME"
-            elif (( RUN_ATTEMPT > MAX_RERUNS )); then
+          if [[ "$EVENT_NAME" == "push" || "$EVENT_NAME" == "pull_request" ]]; then
+            if (( RUN_ATTEMPT > MAX_RERUNS )); then
               reason="retry limit reached"
             else
               action="rerun"

.github/workflows/server-ci.yml

@@ -100,3 +100,76 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ${{ env.REPORT_DIR }}/*.xml
+
+  build-server-macos-rocksdb:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-15-intel
+            server_java_options: ''
+          - os: macos-15
+            server_java_options: '-Xms512m -Xmx2g'
+    env:
+      USE_STAGE: 'false' # Whether to include the stage repository.
+      TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
+      REPORT_DIR: target/site/jacoco
+      BACKEND: rocksdb
+      JAVA_VERSION: '11'
+      SERVER_JAVA_OPTIONS: ${{ matrix.server_java_options }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+
+      - name: Install Java ${{ env.JAVA_VERSION }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: 'zulu'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Use staged maven repo settings
+        if: ${{ env.USE_STAGE == 'true' }}
+        run: |
+          cp $HOME/.m2/settings.xml /tmp/settings.xml
+          cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml
+
+      - name: Compile
+        run: |
+          mvn clean compile -pl hugegraph-server/hugegraph-test -am -U -Dmaven.javadoc.skip=true -ntp
+
+      - name: Run RocksDB core test
+        run: |
+          $TRAVIS_DIR/run-core-test.sh $BACKEND
+
+      - name: Run RocksDB API test
+        run: |
+          $TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR
+
+      - name: Show server log on failure
+        if: failure()
+        run: |
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          SERVER_DIR=hugegraph-server/apache-hugegraph-server-$VERSION/
+          if [ -f "$SERVER_DIR/logs/hugegraph-server.log" ]; then
+            tail -n 200 "$SERVER_DIR/logs/hugegraph-server.log"
+          fi
+
+      - name: Stop RocksDB server
+        if: always()
+        run: |
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          SERVER_DIR=hugegraph-server/apache-hugegraph-server-$VERSION/
+          if [ -f "$SERVER_DIR/bin/pid" ]; then
+            $TRAVIS_DIR/stop-server.sh $SERVER_DIR || true
+          fi

.gitignore

@@ -92,7 +92,10 @@ hugegraph-server/hugegraph-dist/docker/data/
 
 # AI-IDE prompt files (We only keep AGENTS.md, other files could soft-linked it when needed)
 # Serena MCP memories
-.serena/
+.serena/*
+!.serena/project.yml
+!.serena/memories/
+.mcp.json
 # Claude Projects
 CLAUDE.md
 CLAUDE_*.md
@@ -114,3 +117,4 @@ codeium-instructions.md
 .ai-instructions.md
 *.ai-prompt.md
 WARP.md
+.mcp.json

.serena/memories/architecture_and_modules.md

@@ -3,97 +3,33 @@
 ## Three-Tier Architecture
 
 ### 1. Client Layer
-- Gremlin/Cypher query interfaces
-- REST API endpoints
-- Multiple client language bindings
+- Gremlin/Cypher queries, REST APIs, Swagger UI
 
-### 2. Server Layer (hugegraph-server)
-- **REST API Layer** (hugegraph-api): GraphAPI, SchemaAPI, GremlinAPI, CypherAPI, AuthAPI
-- **Graph Engine Layer** (hugegraph-core): Schema management, traversal optimization, task scheduling
-- **Backend Interface**: Abstraction over storage backends
+### 2. Server Layer (hugegraph-server, 13 submodules)
+- **REST API** (hugegraph-api): GraphAPI, SchemaAPI, GremlinAPI, CypherAPI, AuthAPI, GraphSpaceAPI (distributed only), ManagerAPI (distributed only)
+- **Graph Engine** (hugegraph-core): Schema (with TTL update), traversal, task scheduling, GraphSpace multi-tenancy
+- **Backend Interface**: Pluggable via `BackendStore`
 
 ### 3. Storage Layer
-- Pluggable backend implementations
-- Each backend extends `hugegraph-core` abstractions
-- Implements `BackendStore` interface
+- RocksDB (default/embedded), HStore (distributed/production)
+- Legacy (≤1.5.0, deprecated, excluded from context): MySQL, PostgreSQL, Cassandra, ScyllaDB, HBase, Palo
 
-## Multi-Module Structure
+## Module Structure (7 top-level modules)
 
-The project consists of 7 main modules:
+### hugegraph-server (13 submodules)
+`hugegraph-core`, `hugegraph-api` (includes `opencypher/`, `space/`), `hugegraph-dist`, `hugegraph-test`, `hugegraph-example`, plus backends: `hugegraph-rocksdb`, `hugegraph-hstore`, `hugegraph-hbase`, `hugegraph-mysql`, `hugegraph-postgresql`, `hugegraph-cassandra`, `hugegraph-scylladb`, `hugegraph-palo`
 
-### 1. hugegraph-server (13 submodules)
-Core graph engine, REST APIs, and backend implementations:
-- `hugegraph-core` - Core graph engine and abstractions
-- `hugegraph-api` - REST API implementations (includes OpenCypher in `opencypher/`)
-- `hugegraph-dist` - Distribution packaging and scripts
-- `hugegraph-test` - Test suites (unit, core, API, TinkerPop)
-- `hugegraph-example` - Example code
-- Backend implementations:
-  - `hugegraph-rocksdb` (default)
-  - `hugegraph-hstore` (distributed)
-  - `hugegraph-hbase`
-  - `hugegraph-mysql`
-  - `hugegraph-postgresql`
-  - `hugegraph-cassandra`
-  - `hugegraph-scylladb`
-  - `hugegraph-palo`
+### hugegraph-pd (8 submodules)
+Placement Driver: `hg-pd-core`, `hg-pd-service`, `hg-pd-client`, `hg-pd-common`, `hg-pd-grpc`, `hg-pd-cli`, `hg-pd-dist`, `hg-pd-test`
 
-### 2. hugegraph-pd (8 submodules)
-Placement Driver for distributed deployments (meta server):
-- `hg-pd-core` - Core PD logic
-- `hg-pd-service` - PD service implementation
-- `hg-pd-client` - Client library
-- `hg-pd-common` - Shared utilities
-- `hg-pd-grpc` - gRPC protocol definitions (auto-generated)
-- `hg-pd-cli` - Command line interface
-- `hg-pd-dist` - Distribution packaging
-- `hg-pd-test` - Test suite
+### hugegraph-store (9 submodules)
+Distributed storage + Raft: `hg-store-core`, `hg-store-node`, `hg-store-client`, `hg-store-common`, `hg-store-grpc`, `hg-store-rocksdb`, `hg-store-cli`, `hg-store-dist`, `hg-store-test`
 
-### 3. hugegraph-store (9 submodules)
-Distributed storage backend with RocksDB and Raft:
-- `hg-store-core` - Core storage logic
-- `hg-store-node` - Storage node implementation
-- `hg-store-client` - Client library
-- `hg-store-common` - Shared utilities
-- `hg-store-grpc` - gRPC protocol definitions (auto-generated)
-- `hg-store-rocksdb` - RocksDB integration
-- `hg-store-cli` - Command line interface
-- `hg-store-dist` - Distribution packaging
-- `hg-store-test` - Test suite
+### Others
+- **hugegraph-commons**: Shared utilities, RPC framework
+- **hugegraph-struct**: Data structures (must build before PD/Store)
+- **install-dist**: Distribution packaging, license files
+- **hugegraph-cluster-test**: Cluster integration tests
 
-### 4. hugegraph-commons
-Shared utilities across modules:
-- Locks and concurrency utilities
-- Configuration management
-- RPC framework components
-
-### 5. hugegraph-struct
-Data structure definitions shared between modules.
-**Important**: Must be built before PD and Store modules.
-
-### 6. install-dist
-Distribution packaging and release management:
-- License and NOTICE files
-- Dependency management scripts
-- Release documentation
-
-### 7. hugegraph-cluster-test
-Cluster integration tests for distributed deployments
-
-## Cross-Module Dependencies
-
-```
-hugegraph-commons → (shared by all modules)
-hugegraph-struct → hugegraph-pd + hugegraph-store
-hugegraph-core → (extended by all backend implementations)
-```
-
-## Distributed Architecture (Optional)
-
-For production distributed deployments:
-- **hugegraph-pd**: Service discovery, partition management, metadata
-- **hugegraph-store**: Distributed storage with Raft (3+ nodes)
-- **hugegraph-server**: Multiple server instances (3+)
-- Communication: All use gRPC with Protocol Buffers
-
-**Status**: Distributed components (PD + Store) are in BETA
+## Distributed Deployment (BETA)
+PD + Store + Server (3+ nodes each), all gRPC. Docker compose configs in `docker/` directory, using bridge networking (migrated from host mode).