Merge branch 'main' of https://github.com/risingwavelabs/risingwave i…

…nto li0k/compaction_limit_overlapping_level_size

.github/label-commenter-config.yml

@@ -0,0 +1,22 @@
+comment:
+  header: Hi, there.
+  footer: "\
+    ---\n\n\
+    > This is an automated comment created by the [peaceiris/actions-label-commenter]. \
+    Responding to the bot or mentioning it won't have any effect.\n\n\
+    [peaceiris/actions-label-commenter]: https://github.com/peaceiris/actions-label-commenter"
+
+labels:
+  - name: 'user-facing-changes'
+    labeled:
+      pr:
+        body: |
+          :memo: **Telemetry Reminder**:
+          If you're implementing this feature, please consider adding telemetry metrics to track its usage. This helps us understand how the feature is being used and improve it further.
+          You can find the function `report_event` of telemetry reporting in the following files. Feel free to ask questions if you need any guidance!
+          * `src/frontend/src/telemetry.rs`
+          * `src/meta/src/telemetry.rs`
+          * `src/stream/src/telemetry.rs`
+          * `src/storage/compactor/src/telemetry.rs`
+          Or calling `report_event_common` (`src/common/telemetry_event/src/lib.rs`) as if finding it hard to implement.
+          :sparkles: Thank you for your contribution to RisingWave! :sparkles:

.github/workflows/label-triggered.yml

@@ -0,0 +1,23 @@
+name: Label Triggered Comment
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+  pull_request:
+    types: [labeled, unlabeled]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Label Commenter
+        uses: peaceiris/actions-label-commenter@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          config_file: .github/label-commenter-config.yml

Cargo.toml

@@ -138,7 +138,7 @@ otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev =
 prost = { version = "0.13" }
 prost-build = { version = "0.13" }
 # branch rw_patch
-icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "1783f8f106958d6d0ce0249c1c708934a15c2a47", features = [
+icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "0ec44fa826c91139c9cf459b005741df990ae9da", features = [
     "prometheus",
 ] }
 # branch dev-rebase-main-20241030

Makefile.toml

@@ -1438,10 +1438,10 @@ script = '''
 UPDATE_EXPECT=1 cargo test -p risingwave_connector tests::test_with_options_yaml_up_to_date
 '''
 
-#[tasks.backwards-compat-test]
-#category = "RiseDev - Test - Backwards Compatibility Test"
-#description = "Run backwards compatibility test"
-#script = "./e2e_test/backwards-compat-tests/scripts/run_local.sh"
+[tasks.backwards-compat-test]
+category = "RiseDev - Test - Backwards Compatibility Test"
+description = "Run backwards compatibility test"
+script = "./e2e_test/backwards-compat-tests/scripts/run_local.sh"
 
 # For debugging.
 # To show the env for a specific task, use `run_task = "show-env"` for that task.

ci/scripts/backwards-compat-test.sh

@@ -46,22 +46,22 @@ echo "--- Setting up cluster config"
 full-without-monitoring:
   steps:
     - use: minio
-    - use: etcd
+    - use: sqlite
     - use: meta-node
     - use: compute-node
     - use: frontend
     - use: compactor
 EOF
   else
-     # For versions >= 1.9.0, the default config will default to sql backend,
-     # breaking backwards compat, so we must specify meta-backend: etcd
+     # For versions >= 1.9.0, we have support for different sql meta-backend,
+     # so we need to specify the meta-backend: sqlite
      cat <<EOF > risedev-profiles.user.yml
 full-without-monitoring:
  steps:
    - use: minio
-   - use: etcd
+   - use: sqlite
    - use: meta-node
-     meta-backend: etcd
+     meta-backend: sqlite
    - use: compute-node
    - use: frontend
    - use: compactor

ci/scripts/run-e2e-test.sh

@@ -109,6 +109,10 @@ sqllogictest -p 4566 -d dev './e2e_test/ttl/ttl.slt'
 sqllogictest -p 4566 -d dev './e2e_test/database/prepare.slt'
 sqllogictest -p 4566 -d test './e2e_test/database/test.slt'
 
+echo "--- e2e, $mode, python_client"
+python3 -m pip install --break-system-packages psycopg
+python3 ./e2e_test/python_client/main.py
+
 echo "--- e2e, $mode, subscription"
 python3 -m pip install --break-system-packages psycopg2-binary
 sqllogictest -p 4566 -d dev './e2e_test/subscription/check_sql_statement.slt'

ci/workflows/main-cron.yml

@@ -615,40 +615,40 @@ steps:
     timeout_in_minutes: 5
 
   # Backwards compatibility tests
-  #  - label: "Backwards compatibility tests version_offset={{matrix.version_offset}}"
-  #    key: "backwards-compat-tests"
-  #    command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-release"
-  #    if: |
-  #      !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
-  #      || build.pull_request.labels includes "ci/run-backwards-compat-tests"
-  #      || build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
-  #    depends_on:
-  #      - "build"
-  #    plugins:
-  #      - docker-compose#v5.1.0:
-  #          run: source-test-env
-  #          config: ci/docker-compose.yml
-  #          mount-buildkite-agent: true
-  #          environment:
-  #            - BUILDKITE_BRANCH
-  #      - ./ci/plugins/upload-failure-logs
-  #    matrix:
-  #      setup:
-  #        # Test the 4 latest versions against the latest main.
-  #        # e.g.
-  #        # 1: 2.0.0
-  #        # 2: 1.1.1
-  #        # 3: 1.0.1
-  #        # 4: 1.0.0
-  #        # It is ordered by the full version number, rather than minor / major version.
-  #        # We can change to just be on major version in the future.
-  #        version_offset:
-  #          - "1"
-  #          - "2"
-  #          - "3"
-  #          - "4"
-  #    timeout_in_minutes: 30
-  #    retry: *auto-retry
+  - label: "Backwards compatibility tests version_offset={{matrix.version_offset}}"
+    key: "backwards-compat-tests"
+    command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-release"
+    if: |
+      !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
+      || build.pull_request.labels includes "ci/run-backwards-compat-tests"
+      || build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
+    depends_on:
+      - "build"
+    plugins:
+      - docker-compose#v5.1.0:
+          run: source-test-env
+          config: ci/docker-compose.yml
+          mount-buildkite-agent: true
+          environment:
+            - BUILDKITE_BRANCH
+      - ./ci/plugins/upload-failure-logs
+    matrix:
+      setup:
+        # Test the 4 latest versions against the latest main.
+        # e.g.
+        # 1: 2.0.0
+        # 2: 1.1.1
+        # 3: 1.0.1
+        # 4: 1.0.0
+        # It is ordered by the full version number, rather than minor / major version.
+        # We can change to just be on major version in the future.
+        version_offset:
+          - "1"
+          - "2"
+          - "3"
+          - "4"
+    timeout_in_minutes: 30
+    retry: *auto-retry
 
   # Sqlsmith differential testing
   - label: "Sqlsmith Differential Testing"

ci/workflows/pull-request.yml

@@ -698,39 +698,38 @@ steps:
     timeout_in_minutes: 60 # ~3-4 queries can run
 
   # Backwards compatibility tests
-  # TODO: support backwards compatibility tests for sql backend
-  #  - label: "Backwards compatibility tests"
-  #    command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-dev"
-  #    if: |
-  #      build.pull_request.labels includes "breaking-change" ||
-  #        build.pull_request.labels includes "ci/run-backwards-compat-tests" ||
-  #        build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
-  #    depends_on:
-  #      - "build"
-  #    plugins:
-  #      - docker-compose#v5.1.0:
-  #          run: source-test-env
-  #          config: ci/docker-compose.yml
-  #          mount-buildkite-agent: true
-  #          environment:
-  #            - BUILDKITE_BRANCH
-  #      - ./ci/plugins/upload-failure-logs
-  #    matrix:
-  #      setup:
-  #        # Test the 4 latest versions against the latest main.
-  #        # e.g.
-  #        # 1: 2.0.0
-  #        # 2: 1.1.1
-  #        # 3: 1.0.1
-  #        # 4: 1.0.0
-  #        # It is ordered by the full version number, rather than minor / major version.
-  #        # We can change to just be on major version in the future.
-  #        version_offset:
-  #          - "1"
-  #          - "2"
-  #          - "3"
-  #          - "4"
-  #    timeout_in_minutes: 25
+  - label: "Backwards compatibility tests"
+    command: "VERSION_OFFSET={{matrix.version_offset}} RW_COMMIT=$BUILDKITE_COMMIT ci/scripts/backwards-compat-test.sh -p ci-dev"
+    if: |
+      build.pull_request.labels includes "breaking-change" ||
+        build.pull_request.labels includes "ci/run-backwards-compat-tests" ||
+        build.env("CI_STEPS") =~ /(^|,)backwards?-compat-tests?(,|$$)/
+    depends_on:
+      - "build"
+    plugins:
+      - docker-compose#v5.1.0:
+          run: source-test-env
+          config: ci/docker-compose.yml
+          mount-buildkite-agent: true
+          environment:
+            - BUILDKITE_BRANCH
+      - ./ci/plugins/upload-failure-logs
+    matrix:
+      setup:
+        # Test the 4 latest versions against the latest main.
+        # e.g.
+        # 1: 2.0.0
+        # 2: 1.1.1
+        # 3: 1.0.1
+        # 4: 1.0.0
+        # It is ordered by the full version number, rather than minor / major version.
+        # We can change to just be on major version in the future.
+        version_offset:
+          - "1"
+          - "2"
+          - "3"
+          - "4"
+    timeout_in_minutes: 25
 
   # Sqlsmith differential testing
   - label: "Sqlsmith Differential Testing"