Merge branch 'main' into dependabot/cargo/rustls-0.22.0

.cargo/audit.toml

@@ -3,16 +3,6 @@
 # So we ignore known false positives here.
 [advisories]
 ignore = [
-    # We depends on `chrono`, but not `time`, and `chrono` is not affected by `RUSTSEC-2020-0071`
-    # (see https://github.com/time-rs/time/issues/293#issuecomment-946382614).
-    #
-    # `chrono` also suffers from a similar vulnerability ([`RUSTSEC-2020-0159`](https://rustsec.org/advisories/RUSTSEC-2020-0159),
-    # but it's already patched in `0.4.20` by rewriting vulnerable C function in Rust).
-    "RUSTSEC-2020-0071",
-
-    # https://github.com/risingwavelabs/risingwave/issues/11842
-    "RUSTSEC-2023-0052",
-
     # https://github.com/risingwavelabs/risingwave/issues/13703
     # It's impossible to get rid of OpenSSL (or more accurately, the `rsa` crate), and no patch is yet available.
     "RUSTSEC-2023-0071",

.cargo/config.toml

@@ -34,7 +34,7 @@ rustflags = [
 rustflags = [
     "--cfg",
     "tokio_unstable",
-    # uncomment the following two lines to enable `TaskLocalAlloc`
+    # Uncomment the following two lines to enable `TaskLocalAlloc`.
     # "--cfg",
     # "enable_task_local_alloc",
 ]

.config/hakari.toml

@@ -41,4 +41,5 @@ third-party = [
     { name = "criterion" },
     { name = "console" },
     { name = "similar" },
+    { name = "deltalake", git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd4640490202ffe98adbd13b09cef8e007b" },
 ]

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

@@ -3,11 +3,11 @@ on:
   pull_request:
     branches:
       - main
-    types: ["closed", "labeled"]
+    types: ["closed"]
 
 jobs:
-  release_pull_request_1_5_0:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.5.0')  &&  github.event.pull_request.merged == true"
+  release_pull_request_1_5:
+    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.5')  &&  github.event.pull_request.merged == true"
     runs-on: ubuntu-latest
     name: release_pull_request
     steps:
@@ -16,14 +16,14 @@ jobs:
       - name: Create PR to branch
         uses: risingwavelabs/github-action-cherry-pick@master
         with:
-          pr_branch: 'v1.5.0-rc'
+          pr_branch: 'release-1.5'
           pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch v1.5.0-rc', github.event.number) }}
+          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.5', github.event.number) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  release_pull_request_1_4:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.4')  &&  github.event.pull_request.merged == true"
+  release_pull_request_1_6:
+    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.6')  &&  github.event.pull_request.merged == true"
     runs-on: ubuntu-latest
     name: release_pull_request
     steps:
@@ -32,9 +32,8 @@ jobs:
       - name: Create PR to branch
         uses: risingwavelabs/github-action-cherry-pick@master
         with:
-          pr_branch: 'v1.4-rc'
+          pr_branch: 'release-1.6'
           pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch v1.4-rc', github.event.number) }}
+          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.6', github.event.number) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/doc.yml

@@ -4,11 +4,12 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
-  RUSTDOCFLAGS: "--cfg docsrs --markdown-css rust.css --markdown-no-toc --index-page /home/runner/work/risingwave/risingwave/docs/rustdoc/index.md -Zunstable-options"
+  RUSTDOCFLAGS: "--markdown-css rust.css --markdown-no-toc --index-page /home/runner/work/risingwave/risingwave/docs/rustdoc/index.md -Zunstable-options"
 
 jobs:
   build:

.vscode/settings.json.example

@@ -9,16 +9,29 @@
         "src/risedevtool/schemas/risedev.json": "risedev.yml",
         "src/risedevtool/schemas/risedev-profiles.user.json": "risedev-profiles.user.yml"
     },
-    // // ============================================================================
+
+    // Optional: check with custom lints using `cargo dylint`
+    //
+    // "rust-analyzer.check.overrideCommand": [
+    //     "cargo",
+    //     "dylint",
+    //     "--all",
+    //     "--workspace",
+    //     "--",
+    //     "--all-targets",
+    //     "--message-format=json"
+    // ],
+
+    // // ===========================================================================
     // // BEGIN SECTION: configurations for the development of deterministic testing
-    // // ============================================================================
+    // // ===========================================================================
     // "rust-analyzer.cargo.extraEnv": {
     //     "RUSTFLAGS": "--cfg tokio_unstable --cfg madsim"
     // },
     // "rust-analyzer.runnableEnv": {
     //     "RUSTFLAGS": "--cfg tokio_unstable --cfg madsim"
     // },
-    // "rust-analyzer.checkOnSave.overrideCommand": [
+    // "rust-analyzer.check.overrideCommand": [
     //     "cargo",
     //     "check",
     //     "-p",

.vscode/tasks.json.example

@@ -8,8 +8,8 @@
             "command": "/bin/bash",
             "args": [
                 "-c",
-                "risedev k ; cargo build --bin risingwave"
+                "${workspaceFolder}/risedev k ; cargo build --bin risingwave"
             ]
         }
     ]
-}
+}