Merge branch 'main' into xuanwo/java-alpine-v1

Author: Xuanwo

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @Xuanwo
+* @Xuanwo @tisonkun
 
 /core @Xuanwo
 /bindings/c/ @xyjixyjixyji

.github/scripts/test_behavior/plan.py

@@ -33,8 +33,6 @@
 
 LANGUAGE_BINDING = ["java", "python", "nodejs", "go", "c", "cpp"]
 
-BIN = []
-
 INTEGRATIONS = ["object_store"]
 
 
@@ -92,8 +90,6 @@ class Hint:
     binding_c: bool = field(default=False, init=False)
     # Is binding cpp affected?
     binding_cpp: bool = field(default=False, init=False)
-    # Is bin ofs affected?
-    bin_ofs: bool = field(default=False, init=False)
     # Is integration object_store affected ?
     integration_object_store: bool = field(default=False, init=False)
 
@@ -109,6 +105,17 @@ def calculate_hint(changed_files: list[str]) -> Hint:
     # Remove all files that end with `.md`
     changed_files = [f for f in changed_files if not f.endswith(".md")]
 
+    def mark_service_affected(service: str) -> None:
+        hint.core = True
+        for language in LANGUAGE_BINDING:
+            setattr(hint, f"binding_{language}", True)
+        for integration in INTEGRATIONS:
+            setattr(hint, f"integration_{integration}", True)
+
+        hint.services.add(service)
+        hint.services.add(service.replace("-", "_"))
+        hint.services.add(service.replace("_", "-"))
+
     for p in changed_files:
         # workflow behavior tests affected
         if p == ".github/workflows/test_behavior.yml":
@@ -128,11 +135,6 @@ def calculate_hint(changed_files: list[str]) -> Hint:
                 setattr(hint, f"binding_{language}", True)
                 hint.all_service = True
 
-        for bin in BIN:
-            if p == f".github/workflows/test_behavior_bin_{bin}.yml":
-                setattr(hint, f"bin_{bin}", True)
-                hint.all_service = True
-
         for integration in INTEGRATIONS:
             if p == f".github/workflows/test_behavior_integration_{integration}.yml":
                 setattr(hint, f"integration_{integration}", True)
@@ -145,7 +147,10 @@ def calculate_hint(changed_files: list[str]) -> Hint:
             and not p.startswith("core/edge/")
             and not p.startswith("core/fuzz/")
             and not p.startswith("core/src/services/")
+            and not p.startswith("core/core/src/services/")
+            and not p.startswith("core/services/")
             and not p.startswith("core/src/docs/")
+            and not p.startswith("core/core/src/docs/")
         ):
             hint.core = True
             hint.binding_java = True
@@ -154,7 +159,6 @@ def calculate_hint(changed_files: list[str]) -> Hint:
             hint.binding_go = True
             hint.binding_c = True
             hint.binding_cpp = True
-            hint.bin_ofs = True
             for integration in INTEGRATIONS:
                 setattr(hint, f"integration_{integration}", True)
             hint.all_service = True
@@ -181,12 +185,6 @@ def calculate_hint(changed_files: list[str]) -> Hint:
             hint.binding_go = True
             hint.all_service = True
 
-        # bin affected
-        for bin in BIN:
-            if p.startswith(f"bin/{bin}"):
-                setattr(hint, f"bin_{bin}", True)
-                hint.all_service = True
-
         # integration affected
         for integration in INTEGRATIONS:
             if p.startswith(f"integrations/{integration}"):
@@ -196,38 +194,27 @@ def calculate_hint(changed_files: list[str]) -> Hint:
         # core service affected
         match = re.search(r"core/src/services/([^/]+)/", p)
         if match:
-            hint.core = True
-            for language in LANGUAGE_BINDING:
-                setattr(hint, f"binding_{language}", True)
-            for bin in BIN:
-                setattr(hint, f"bin_{bin}", True)
-            for integration in INTEGRATIONS:
-                setattr(hint, f"integration_{integration}", True)
-            hint.services.add(match.group(1))
+            mark_service_affected(match.group(1))
+
+        # service crate affected
+        match = re.search(r"core/services/([^/]+)/", p)
+        if match:
+            mark_service_affected(match.group(1))
+
+        # opendal-core internal service affected
+        match = re.search(r"core/core/src/services/([^/]+)/", p)
+        if match:
+            mark_service_affected(match.group(1))
 
         # core test affected
         match = re.search(r".github/services/([^/]+)/", p)
         if match:
-            hint.core = True
-            for language in LANGUAGE_BINDING:
-                setattr(hint, f"binding_{language}", True)
-            for bin in BIN:
-                setattr(hint, f"bin_{bin}", True)
-            for integration in INTEGRATIONS:
-                setattr(hint, f"integration_{integration}", True)
-            hint.services.add(match.group(1))
+            mark_service_affected(match.group(1))
 
         # fixture affected
         match = re.search(r"fixtures/([^/]+)/", p)
         if match:
-            hint.core = True
-            for language in LANGUAGE_BINDING:
-                setattr(hint, f"binding_{language}", True)
-            for bin in BIN:
-                setattr(hint, f"bin_{bin}", True)
-            for integration in INTEGRATIONS:
-                setattr(hint, f"integration_{integration}", True)
-            hint.services.add(match.group(1))
+            mark_service_affected(match.group(1))
 
     return hint
 
@@ -300,29 +287,6 @@ def generate_language_binding_cases(
     return cases
 
 
-def generate_bin_cases(
-    cases: list[dict[str, str]], hint: Hint, bin: str
-) -> list[dict[str, str]]:
-    # Return empty if this bin is False
-    if not getattr(hint, f"bin_{bin}"):
-        return []
-
-    cases = unique_cases(cases)
-
-    if bin == "ofs":
-        supported_services = ["fs", "s3"]
-        cases = [v for v in cases if v["service"] in supported_services]
-
-    # Return all services if all_service is True
-    if hint.all_service:
-        return cases
-
-    # Filter all cases that not shown up in changed files
-    cases = [v for v in cases if v["service"] in hint.services]
-
-    return cases
-
-
 def generate_integration_cases(
     cases: list[dict[str, str]], hint: Hint, integration: str
 ) -> list[dict[str, str]]:
@@ -401,14 +365,6 @@ def plan(changed_files: list[str]) -> dict[str, Any]:
                     }
                 )
 
-    for bin in BIN:
-        jobs[f"bin_{bin}"] = []
-        jobs["components"][f"bin_{bin}"] = False
-        bin_cases = generate_bin_cases(cases, hint, bin)
-        if len(bin_cases) > 0:
-            jobs["components"][f"bin_{bin}"] = True
-            jobs[f"bin_{bin}"].append({"os": "ubuntu-latest", "cases": bin_cases})
-
     for integration in INTEGRATIONS:
         jobs[f"integration_{integration}"] = []
         jobs["components"][f"integration_{integration}"] = False

.github/scripts/test_behavior/test_plan.py

@@ -33,16 +33,25 @@ def test_core_cargo_toml(self):
         self.assertTrue(result["components"]["core"])
 
     def test_core_services_fs(self):
-        result = plan(["core/src/services/fs/mod.rs"])
+        result = plan(["core/services/fs/src/lib.rs"])
         self.assertTrue(result["components"]["core"])
         self.assertTrue(len(result["core"]) > 0)
 
         cases = [v["service"] for v in result["core"][0]["cases"]]
-        # Should not contain fs
+        # Should contain fs
         self.assertTrue("fs" in cases)
         # Should not contain s3
         self.assertFalse("s3" in cases)
 
+    def test_core_services_hdfs_native_mapping(self):
+        result = plan(["core/services/hdfs-native/src/lib.rs"])
+        self.assertTrue(result["components"]["core"])
+        self.assertTrue(len(result["core"]) > 0)
+
+        cases = [v["service"] for v in result["core"][0]["cases"]]
+        self.assertTrue("hdfs_native" in cases)
+        self.assertFalse("fs" in cases)
+
     def test_binding_java(self):
         result = plan(["bindings/java/pom.xml"])
         self.assertFalse(result["components"]["core"])
@@ -56,7 +65,7 @@ def test_integration_object_store(self):
         self.assertTrue(result["components"]["integration_object_store"])
         self.assertTrue(len(result["integration_object_store"]) > 0)
 
-        result = plan(["core/src/services/fs/mod.rs"])
+        result = plan(["core/services/fs/src/lib.rs"])
         cases = [v["service"] for v in result["integration_object_store"][0]["cases"]]
         # Should contain fs
         self.assertTrue("fs" in cases)

.github/workflows/ci_bindings_c.yml

@@ -43,7 +43,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup

.github/workflows/ci_bindings_cpp.yml

@@ -44,7 +44,7 @@ jobs:
   test:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: |
           sudo apt-get update

.github/workflows/ci_bindings_d.yml

@@ -49,7 +49,7 @@ jobs:
         dlang: ["ldc-latest", "dmd-latest"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: dlang-community/setup-dlang@v2
         with:
           compiler: ${{ matrix.dlang }}

.github/workflows/ci_bindings_dart.yml

@@ -46,12 +46,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: |
             ~/.cargo/bin/

.github/workflows/ci_bindings_dotnet.yml

@@ -43,7 +43,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup dotnet toolchain
         uses: actions/setup-dotnet@v5
         with:

.github/workflows/ci_bindings_go.yml

@@ -47,11 +47,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
           go-version: stable
-      - uses: golangci/golangci-lint-action@v8
+      - uses: golangci/golangci-lint-action@v9
         with:
           version: "v2.1"
           working-directory: bindings/go

.github/workflows/ci_bindings_haskell.yml

@@ -43,7 +43,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Haskell toolchain (ghc-9.4.8)
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
@@ -57,7 +57,7 @@ jobs:
         run: |
           cargo clippy -- -D warnings
       - name: Restore haskell cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           key: ${{ runner.os }}-haskell-${{ hashFiles('**/*.cabal', '**/Setup.hs') }}
           path: |
@@ -69,7 +69,7 @@ jobs:
         run: |
           cabal test
       - name: Save haskell cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           key: ${{ runner.os }}-haskell-${{ hashFiles('**/*.cabal', '**/Setup.hs') }}
           path: |
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Haskell toolchain (ghc-9.2.8)
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
@@ -90,7 +90,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup
       - name: Restore haskell cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           key: ${{ runner.os }}-haskell-${{ hashFiles('**/*.cabal', '**/Setup.hs') }}
           path: |
@@ -105,7 +105,7 @@ jobs:
           tar xf opendal-*.crate --strip-components=1
           cabal sdist
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: bindings-haskell-sdist
           path: bindings/haskell/target/package/dist-newstyle/sdist/*.tar.gz