Merge branch 'main' into siyuan/fix-pg-type

.config/nextest.toml

@@ -34,7 +34,3 @@ test-group = 'failpoint-limited'
 [[profile.ci-sim.overrides]]
 filter = 'test(failpoint_limited::)'
 test-group = 'failpoint-limited'
-
-[[profile.ci.junit.overrides]]
-filter = 'test(failpoint_limited::)'
-test-group = 'failpoint-limited'

.git-blame-ignore-revs

@@ -42,3 +42,6 @@ c583e2c6c054764249acf484438c7bf7197765f4
 
 # chore: replace all ProstXxx with PbXxx (#8621)
 6fd8821f2e053957b183d648bea9c95b6703941f
+
+# chore: cleanup v2 naming for sql metastore (#18941)
+9a6a7f9052d5679165ff57cc01417c742c95351c

.github/labeler.yml

@@ -42,3 +42,7 @@ labels:
 - label: "ci/run-e2e-single-node-tests"
   files:
   - "src\\/meta\\/.*.rs"
+
+- label: "ci/run-e2e-test-other-backends"
+  files:
+  - "src\\/meta\\/.*.rs"

.github/pr-title-checker-config.json

@@ -4,7 +4,7 @@
     "color": "B60205"
   },
   "CHECKS": {
-    "regexp": "^(cherrypick|cherry pick|cherry-pick)?(| |:|: )+(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert|deprecate)(\\(.*\\))?:[^']*",
+    "regexp": "^(cherrypick|cherry pick|cherry-pick)?(| |:|: )+(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert|deprecate)(\\(.*\\))?:.*",
     "ignoreLabels" : ["ignore-title"]
   },
   "MESSAGES": {

.github/workflows/cherry-pick-to-release-branch.yml

@@ -6,53 +6,45 @@ on:
     types: ["closed", "labeled"]
 
 jobs:
-  release_pull_request_1_9:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.9')  &&  github.event.pull_request.merged == true"
+  get-release-branches:
+    if: |
+      github.event.pull_request.merged &&
+      ((github.event.action == 'labeled' && startsWith(github.event.label.name, 'need-cherry-pick')) ||
+      (github.event.action == 'closed' && contains(toJson(github.event.pull_request.labels), 'need-cherry-pick')))
     runs-on: ubuntu-latest
-    name: release_pull_request
+    outputs:
+      branches: ${{ steps.get-release-branches.outputs.branches }}
     steps:
-      - name: checkout
-        uses: actions/checkout@v1
-      - name: Create PR to branch
-        uses: risingwavelabs/github-action-cherry-pick@master
-        with:
-          pr_branch: 'release-1.9'
-          pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.9', github.event.number) }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  release_pull_request_1_10:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.10')  &&  github.event.pull_request.merged == true"
-    runs-on: ubuntu-latest
-    name: release_pull_request
-    steps:
-      - name: checkout
-        uses: actions/checkout@v1
-      - name: Create PR to branch
-        uses: risingwavelabs/github-action-cherry-pick@master
-        with:
-          pr_branch: 'release-1.10'
-          pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.10', github.event.number) }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+      - name: Get release branches
+        id: get-release-branches
+        run: |
+          if [[ ${{ github.event.action }} == 'labeled' ]]; then
+            echo "branches=[\"$(echo ${{ github.event.label.name }} | cut -d '-' -f 4-)\"]" >> "$GITHUB_OUTPUT"
+          else
+            labels='${{ toJson(github.event.pull_request.labels) }}'
+            echo branches=$(echo "$labels" | jq -r '.[] | select(.name | contains("need-cherry-pick")).name' | cut -d '-' -f 4- | jq --raw-input . | jq --slurp . -c) >> "$GITHUB_OUTPUT"
+          fi
 
-  release_pull_request_2_0:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-2.0')  &&  github.event.pull_request.merged == true"
+  release_pull_request:
+    needs:
+      - get-release-branches
     runs-on: ubuntu-latest
-    name: release_pull_request
+    strategy:
+      matrix:
+        branch: ${{ fromJson(needs.get-release-branches.outputs.branches) }}
     steps:
       - name: checkout
         uses: actions/checkout@v1
       - name: Create PR to branch
         uses: risingwavelabs/github-action-cherry-pick@master
         with:
-          pr_branch: 'release-2.0'
+          pr_branch: ${{ matrix.branch }}
           pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch release-2.0', github.event.number) }}
+          pr_body: ${{ format('Cherry picking \#{0} onto branch {1}', github.event.number, matrix.branch) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-permissions: write-all
+permissions:
+  issues: write
+  pull-requests: write
+  contents: write

.gitignore

@@ -83,7 +83,7 @@ e2e_test/iceberg/metastore_db
 **/*.sqlite
 **/*.sqlite-journal
 
-*.slt.temp
+*.slt*.temp
 
 .direnv/
 

.licenserc.yaml

@@ -18,7 +18,7 @@ header:
     - "src/sqlparser/**/*.rs"
     - "java/connector-node/risingwave-source-cdc/src/main/java/com/risingwave/connector/cdc/debezium/internal/*.java"
     - "java/connector-node/risingwave-sink-iceberg/src/main/java/org/apache/iceberg/**/*.java"
-    - "src/meta/model_v2/migration/**/*.rs"
+    - "src/meta/model/migration/**/*.rs"
     - "lints/ui/**"
 
   comment: on-failure

.typos.toml

@@ -38,5 +38,7 @@ extend-exclude = [
     "src/common/src/cast/mod.rs",
     "src/tests/simulation/tests/integration_tests/scale/shared_source.rs",
     # We don't want to fix "Divy" here, but may want in other places.
-    "integration_tests/deltalake-sink/spark-script/run-sql-file.sh"
+    "integration_tests/deltalake-sink/spark-script/run-sql-file.sh",
+    # These files are copied from debezium connector, we don't want to fix their typos
+    "java/connector-node/risingwave-source-cdc/src/main/java/io/debezium/connector/postgresql/*.java"
 ]