Merge remote-tracking branch 'apache/master' into use-jemalloc

.github/workflows/build-push-env-docker.yml

@@ -27,7 +27,7 @@ on:
     paths:
       - 'docker/pegasus-build-env/**'
       - '.github/workflows/build-push-env-docker.yml'
-      - 'rdsn/thirdparty/**'
+      - 'thirdparty/**'
 
   # for manually triggering workflow
   workflow_dispatch:

.github/workflows/lint_and_test_cpp.yaml

@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 1
           submodules: true
       - name: clang-format
-        run: ./scripts/run-clang-format.py --clang-format-executable clang-format-3.9 -e ./src/shell/linenoise -e ./src/shell/sds -e ./rdsn/thirdparty -r .
+        run: ./scripts/run-clang-format.py --clang-format-executable clang-format-3.9 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
 
   test_rdsn_Release:
     name: Test rdsn with Release
@@ -77,14 +77,14 @@ jobs:
             rdsn:
               - 'rdsn/**'
             thirdparty:
-              - 'rdsn/thirdparty/**'
+              - 'thirdparty/**'
       - name: Unpack prebuilt third-parties
         working-directory: rdsn
         if: steps.changes.outputs.thirdparty == 'false'
         run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Rebuild third-parties
         if: steps.changes.outputs.thirdparty == 'true'
-        working-directory: rdsn/thirdparty
+        working-directory: thirdparty
         run: |
           mkdir build
           cmake -DCMAKE_BUILD_TYPE=Release -B build/
@@ -119,14 +119,14 @@ jobs:
             rdsn:
               - 'rdsn/**'
             thirdparty:
-              - 'rdsn/thirdparty/**'
+              - 'thirdparty/**'
       - name: Unpack prebuilt third-parties
         working-directory: rdsn
         if: steps.changes.outputs.thirdparty == 'false'
         run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Rebuild third-parties
         if: steps.changes.outputs.thirdparty == 'true'
-        working-directory: rdsn/thirdparty
+        working-directory: thirdparty
         run: |
           mkdir build
           cmake -DCMAKE_BUILD_TYPE=Release -B build/
@@ -161,14 +161,14 @@ jobs:
             rdsn:
               - 'rdsn/**'
             thirdparty:
-              - 'rdsn/thirdparty/**'
+              - 'thirdparty/**'
       - name: Unpack prebuilt third-parties
         working-directory: rdsn
         if: steps.changes.outputs.thirdparty == 'false'
         run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Rebuild third-parties
         if: steps.changes.outputs.thirdparty == 'true'
-        working-directory: rdsn/thirdparty
+        working-directory: thirdparty
         run: |
           mkdir build
           cmake -DCMAKE_BUILD_TYPE=Release -B build/
@@ -203,14 +203,14 @@ jobs:
             rdsn:
               - 'rdsn/**'
             thirdparty:
-              - 'rdsn/thirdparty/**'
+              - 'thirdparty/**'
       - name: Unpack prebuilt third-parties
         working-directory: rdsn
         if: steps.changes.outputs.thirdparty == 'false'
         run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Rebuild third-parties
         if: steps.changes.outputs.thirdparty == 'true'
-        working-directory: rdsn/thirdparty
+        working-directory: thirdparty
         run: |
           mkdir build
           cmake -DCMAKE_BUILD_TYPE=Release -B build/
@@ -243,7 +243,7 @@ jobs:
               - 'src/**'
       - name: Unpack prebuilt third-parties
         if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
-        run: unzip /root/thirdparties-bin.zip -d ./rdsn/thirdparty
+        run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Compilation
         if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
         run: ./run.sh build -c -j $(($(nproc)/2+1))

.github/workflows/pegasus-regular-build.yml

@@ -62,7 +62,7 @@ jobs:
           git clone --depth=1 https://github.com/apache/incubator-pegasus.git
           cd incubator-pegasus
       - name: Unpack prebuilt third-parties
-        run: unzip /root/thirdparties-bin.zip -d ./rdsn/thirdparty
+        run: unzip /root/thirdparties-bin.zip -d ./thirdparty
       - name: Compilation rdsn on GCC
         if: ${{ matrix.compiler-family == 'gcc' }}
         run: |

.github/workflows/thirdparty-regular-push.yml

@@ -28,7 +28,7 @@ on:
       - 'docker/thirdparties-src/**'
       - 'docker/thirdparties-bin/**'
       - '.github/workflows/thirdparty-regular-push.yml'
-      - 'rdsn/thirdparty/**'
+      - 'thirdparty/**'
 
   # for manually triggering workflow
   workflow_dispatch:

.gitignore

@@ -64,7 +64,6 @@ make_config.mk
 *.vcxproj
 *.vcxproj.filters
 *.sln
-*.cmake
 CMakeCache.txt
 CMakeFiles/
 build/
@@ -264,8 +263,7 @@ go-client/bin
 
 # rdsn
 rdsn/builder
-rdsn/thirdparty/build
-rdsn/thirdparty/src
-rdsn/thirdparty/output
+thirdparty/build
+thirdparty/output
 rdsn/cmake-build-debug
 rdsn/test_reports