diff --git a/.config/hakari.toml b/.config/hakari.toml
index 4d9ec4b357346..c1355e0892334 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -34,6 +34,9 @@ workspace-members = [
]
third-party = [
{ name = "opendal" },
+ # For some reasons, tikv-jemalloc-sys would be compiled twice if being added into `workspace-hack`
+ { name = "tikv-jemalloc-sys", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" },
+ { name = "tikv-jemallocator", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" },
# These are solely dev-dependencies. Unifying them may slow down build.
{ name = "criterion" },
{ name = "console" },
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index bae692a579559..c3a80429ee84d 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -33,3 +33,6 @@ f8266748dcb70541da944664552c1944ff8362e4
# feat(risedev): add check for trailing spaces in `risedev check` (#11294)
f2a3fd021059e680b35b24c63cff5f8dbe9f9d5f
+
+# chore(rustfmt): format let-chains and let-else #9409
+d70dba827c303373f3220c9733f7c7443e5c2d37
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2dd2d9347b96b..b2d58279b5290 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,7 +7,10 @@ updates:
open-pull-requests-limit: 10
# Disable auto rebase to reduce cost. Use `@dependabot rebase` manually instead.
rebase-strategy: "disabled"
-
+ # Ignore patch to reduce spam. Manually run `cargo update` regularly instead.
+ ignore:
+ - dependency-name: "*"
+ update-types: ["version-update:semver-patch"]
# Create a group of dependencies to be updated together in one pull request
groups:
arrow:
@@ -16,3 +19,7 @@ updates:
aws:
patterns:
- "aws*"
+ tonic:
+ patterns:
+ - "tonic*"
+ - "prost*"
diff --git a/.github/workflows/cherry-pick-to-release-branch.yml b/.github/workflows/cherry-pick-to-release-branch.yml
index e98e1769630b9..026b2313d8353 100644
--- a/.github/workflows/cherry-pick-to-release-branch.yml
+++ b/.github/workflows/cherry-pick-to-release-branch.yml
@@ -6,8 +6,8 @@ on:
types: ["closed", "labeled"]
jobs:
- release_pull_request_1_1:
- if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.1') && github.event.pull_request.merged == true"
+ release_pull_request_1_3:
+ if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.3') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
@@ -16,9 +16,9 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
- pr_branch: 'v1.1-rc'
+ pr_branch: 'v1.3-rc'
pr_labels: 'cherry-pick'
- pr_body: ${{ format('Cherry picking \#{0} onto branch v1.1-rc', github.event.number) }}
+ pr_body: ${{ format('Cherry picking \#{0} onto branch v1.3-rc', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 66f740666e2a7..3e181eda27fce 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -14,6 +14,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
+ - name: Maximize build space
+ uses: easimon/maximize-build-space@master
+ with:
+ remove-dotnet: 'true'
+ remove-android: 'true'
+ remove-haskell: 'true'
+ remove-codeql: 'true'
+ remove-docker-images: 'true'
+ root-reserve-mb: 10240
+ temp-reserve-mb: 10240
- uses: actions/checkout@v3
- name: Setup Rust toolchain
run: rustup show
@@ -30,6 +40,8 @@ jobs:
mkdir artifact
cp -R target/doc/* artifact
+ - name: Show available storage
+ run: df -h
- name: Install cargo-docset
uses: taiki-e/install-action@v2
with:
@@ -49,7 +61,8 @@ jobs:
uses: actions/upload-pages-artifact@v1
with:
path: artifact
-
+ - name: Show available storage
+ run: df -h
deploy:
needs: build
permissions:
diff --git a/.github/workflows/hakari_fix.yml b/.github/workflows/hakari_fix.yml
index 670ca38cccc27..b8ded582c36e9 100644
--- a/.github/workflows/hakari_fix.yml
+++ b/.github/workflows/hakari_fix.yml
@@ -15,7 +15,8 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: ${{ github.head_ref }}
+ ref: ${{ github.event.pull_request.head.ref }}
+ repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Install cargo-hakari
uses: taiki-e/install-action@v2
diff --git a/.github/workflows/nightly-rust.yml b/.github/workflows/nightly-rust.yml
index e6afb6970daec..5219b4805c74d 100644
--- a/.github/workflows/nightly-rust.yml
+++ b/.github/workflows/nightly-rust.yml
@@ -19,7 +19,15 @@ jobs:
remove-haskell: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
+ root-reserve-mb: 2048
- uses: actions/checkout@v3
+ if: ${{ github.event_name == 'schedule' }}
+ with:
+ # For daily scheduled run, we use a fixed branch, so that we can apply patches to fix compile errors earlier.
+ # We can also ensure the regression is due to new rust instead of new RisingWave code.
+ ref: xxchan/latest-nightly-rust
+ - uses: actions/checkout@v3
+ if: ${{ !(github.event_name == 'schedule') }}
- name: Setup Rust toolchain
run: |
rustup override set nightly
diff --git a/.licenserc.yaml b/.licenserc.yaml
index e596f12143b13..c1745a4d1ad74 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -17,5 +17,6 @@ header:
- "**/*.d.ts"
- "src/sqlparser/**/*.rs"
- "java/connector-node/risingwave-source-cdc/src/main/java/com/risingwave/connector/cdc/debezium/internal/*.java"
+ - "src/meta/src/model_v2/migration/**/*.rs"
comment: on-failure
diff --git a/Cargo.lock b/Cargo.lock
index 1df7d4f81c014..123834525d751 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -49,13 +49,19 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
dependencies = [
"memchr",
]
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
[[package]]
name = "alloc-no-stdlib"
version = "2.0.4"
@@ -207,7 +213,7 @@ dependencies = [
"uuid",
"xz2",
"zerocopy",
- "zstd",
+ "zstd 0.12.4",
]
[[package]]
@@ -220,7 +226,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_json",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -237,9 +243,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "arrow-arith"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11"
+checksum = "bc1d4e368e87ad9ee64f28b9577a3834ce10fe2703a26b28417d485bbbdff956"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -252,9 +258,9 @@ dependencies = [
[[package]]
name = "arrow-array"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d"
+checksum = "d02efa7253ede102d45a4e802a129e83bcc3f49884cab795b1ac223918e4318d"
dependencies = [
"ahash 0.8.3",
"arrow-buffer",
@@ -268,9 +274,9 @@ dependencies = [
[[package]]
name = "arrow-buffer"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4843af4dd679c2f35b69c572874da8fde33be53eb549a5fb128e7a4b763510"
+checksum = "fda119225204141138cb0541c692fbfef0e875ba01bfdeaed09e9d354f9d6195"
dependencies = [
"bytes",
"half 2.3.1",
@@ -279,9 +285,9 @@ dependencies = [
[[package]]
name = "arrow-cast"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b"
+checksum = "1d825d51b9968868d50bc5af92388754056796dbc62a4e25307d588a1fc84dee"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -296,9 +302,9 @@ dependencies = [
[[package]]
name = "arrow-data"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188"
+checksum = "475a4c3699c8b4095ca61cecf15da6f67841847a5f5aac983ccb9a377d02f73a"
dependencies = [
"arrow-buffer",
"arrow-schema",
@@ -308,29 +314,29 @@ dependencies = [
[[package]]
name = "arrow-flight"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40372d37a860a742f248d4d7c137950cd793f1b46f2b99a5116c55efbe2699f"
+checksum = "cd938ea4a0e8d0db2b9f47ebba792f73f6188f4289707caeaf93a3be705e5ed5"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-cast",
"arrow-ipc",
"arrow-schema",
- "base64 0.21.3",
+ "base64 0.21.4",
"bytes",
"futures",
"paste",
- "prost",
+ "prost 0.12.1",
"tokio",
- "tonic",
+ "tonic 0.10.2",
]
[[package]]
name = "arrow-ipc"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f"
+checksum = "1248005c8ac549f869b7a840859d942bf62471479c1a2d82659d453eebcd166a"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -340,11 +346,26 @@ dependencies = [
"flatbuffers",
]
+[[package]]
+name = "arrow-ord"
+version = "47.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03b87aa408ea6a6300e49eb2eba0c032c88ed9dc19e0a9948489c55efdca71f4"
+dependencies = [
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-schema",
+ "arrow-select",
+ "half 2.3.1",
+ "num",
+]
+
[[package]]
name = "arrow-row"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38"
+checksum = "114a348ab581e7c9b6908fcab23cb39ff9f060eb19e72b13f8fb8eaa37f65d22"
dependencies = [
"ahash 0.8.3",
"arrow-array",
@@ -357,16 +378,17 @@ dependencies = [
[[package]]
name = "arrow-schema"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d"
+checksum = "5d1d179c117b158853e0101bfbed5615e86fe97ee356b4af901f1c5001e1ce4b"
[[package]]
name = "arrow-select"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4"
+checksum = "d5c71e003202e67e9db139e5278c79f5520bb79922261dfe140e4637ee8b6108"
dependencies = [
+ "ahash 0.8.3",
"arrow-array",
"arrow-buffer",
"arrow-data",
@@ -380,6 +402,16 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "async-channel"
version = "1.9.0"
@@ -404,6 +436,56 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "async-executor"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+dependencies = [
+ "async-lock",
+ "async-task",
+ "concurrent-queue",
+ "fastrand 1.9.0",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+ "tokio",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite",
+ "log",
+ "parking",
+ "polling",
+ "rustix 0.37.23",
+ "slab",
+ "socket2 0.4.9",
+ "waker-fn",
+]
+
[[package]]
name = "async-lock"
version = "2.8.0"
@@ -415,15 +497,14 @@ dependencies = [
[[package]]
name = "async-nats"
-version = "0.31.0"
+version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8257238e2a3629ee5618502a75d1b91f8017c24638c75349fc8d2d80cf1f7c4c"
+checksum = "0e45b67ea596bb94741ef15ba1d90b72c92bdc07553d8033734cb620a2b39f1c"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"bytes",
"futures",
"http",
- "itoa",
"memchr",
"nkeys",
"nuid",
@@ -431,6 +512,7 @@ dependencies = [
"rand",
"regex",
"ring",
+ "rustls 0.21.7",
"rustls-native-certs",
"rustls-pemfile",
"rustls-webpki 0.101.4",
@@ -455,7 +537,34 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-attributes",
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
]
[[package]]
@@ -477,7 +586,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -494,7 +603,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -512,6 +621,12 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+[[package]]
+name = "atomic-waker"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+
[[package]]
name = "auto_enums"
version = "0.8.2"
@@ -521,7 +636,7 @@ dependencies = [
"derive_utils",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -1051,9 +1166,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.3"
+version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "base64-simd"
@@ -1071,7 +1186,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c5b0a88aa36e9f095ee2e2b13fb8c5e4313e022783aedacc123328c0084916d"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
]
[[package]]
@@ -1225,6 +1340,21 @@ dependencies = [
"generic-array",
]
+[[package]]
+name = "blocking"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+dependencies = [
+ "async-channel",
+ "async-lock",
+ "async-task",
+ "atomic-waker",
+ "fastrand 1.9.0",
+ "futures-lite",
+ "log",
+]
+
[[package]]
name = "borsh"
version = "0.10.3"
@@ -1342,9 +1472,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@@ -1471,7 +1601,7 @@ checksum = "bc7cb2538d4ecc42b6c3b57a83094d8c69894e74468d18cd045a09fdea807358"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -1582,7 +1712,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -1644,9 +1774,9 @@ dependencies = [
[[package]]
name = "cmsketch"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467e460587e81453bf9aeb43cd534e9c5ad670042023bd6c3f377c23b76cc2f0"
+checksum = "93710598b87c37ea250ab17a36f9f79dbaf3bd20e55806cf09345103bc26d60e"
dependencies = [
"paste",
]
@@ -1686,7 +1816,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
dependencies = [
"bytes",
+ "futures-core",
"memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
]
[[package]]
@@ -1725,35 +1859,36 @@ dependencies = [
[[package]]
name = "console-api"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"
+checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"
dependencies = [
- "prost",
- "prost-types",
- "tonic",
+ "futures-core",
+ "prost 0.12.1",
+ "prost-types 0.12.1",
+ "tonic 0.10.2",
"tracing-core",
]
[[package]]
name = "console-subscriber"
-version = "0.1.10"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"
+checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e"
dependencies = [
"console-api",
"crossbeam-channel",
"crossbeam-utils",
- "futures",
+ "futures-task",
"hdrhistogram",
"humantime",
- "prost-types",
+ "prost-types 0.12.1",
"serde",
"serde_json",
"thread_local",
"tokio",
"tokio-stream",
- "tonic",
+ "tonic 0.10.2",
"tracing",
"tracing-core",
"tracing-subscriber",
@@ -1879,7 +2014,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2046,9 +2181,9 @@ dependencies = [
[[package]]
name = "csv"
-version = "1.2.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
dependencies = [
"csv-core",
"itoa",
@@ -2058,9 +2193,9 @@ dependencies = [
[[package]]
name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
dependencies = [
"memchr",
]
@@ -2072,7 +2207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b"
dependencies = [
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2099,7 +2234,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2126,7 +2261,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2143,7 +2278,7 @@ checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2215,7 +2350,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2248,7 +2383,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core 0.20.3",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2320,6 +2455,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "derive_builder"
version = "0.12.0"
@@ -2359,18 +2505,19 @@ checksum = "9abcad25e9720609ccb3dcdb795d845e37d8ce34183330a9f48b03a1a71c8e21"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
name = "dialoguer"
-version = "0.10.4"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
+checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
dependencies = [
"console",
"shell-words",
"tempfile",
+ "thiserror",
"zeroize",
]
@@ -2445,9 +2592,9 @@ dependencies = [
[[package]]
name = "duration-str"
-version = "0.5.1"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f037c488d179e21c87ef5fa9c331e8e62f5dddfa84618b41bb197da03edff1"
+checksum = "5e172e85f305d6a442b250bf40667ffcb91a24f52c9a1ca59e2fa991ac9b7790"
dependencies = [
"chrono",
"nom",
@@ -2535,7 +2682,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2575,7 +2722,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2588,7 +2735,7 @@ dependencies = [
"num-traits",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -2642,14 +2789,14 @@ dependencies = [
[[package]]
name = "etcd-client"
-version = "0.11.1"
-source = "git+https://github.com/risingwavelabs/etcd-client.git?rev=d55550a#d55550a182f2119e39e64858771468e1b26f6777"
+version = "0.12.1"
+source = "git+https://github.com/risingwavelabs/etcd-client.git?rev=4e84d40#4e84d40a84b35718d814cc2afccc9274c9d78e1e"
dependencies = [
"http",
- "prost",
+ "prost 0.12.1",
"tokio",
"tokio-stream",
- "tonic",
+ "tonic 0.10.2",
"tonic-build",
"tower",
"tower-service",
@@ -2871,7 +3018,7 @@ dependencies = [
[[package]]
name = "foyer"
version = "0.1.0"
-source = "git+https://github.com/mrcroxx/foyer?rev=41b1d39#41b1d3934cc92976737a9296273b4c5bee6422a0"
+source = "git+https://github.com/mrcroxx/foyer?rev=438eec8#438eec87e90c7a80cb53a06b711c6ea1ad7a0f41"
dependencies = [
"foyer-common",
"foyer-intrusive",
@@ -2882,21 +3029,21 @@ dependencies = [
[[package]]
name = "foyer-common"
version = "0.1.0"
-source = "git+https://github.com/mrcroxx/foyer?rev=41b1d39#41b1d3934cc92976737a9296273b4c5bee6422a0"
+source = "git+https://github.com/mrcroxx/foyer?rev=438eec8#438eec87e90c7a80cb53a06b711c6ea1ad7a0f41"
dependencies = [
"bytes",
"foyer-workspace-hack",
+ "madsim-tokio",
"parking_lot 0.12.1",
"paste",
"rand",
- "tokio",
"tracing",
]
[[package]]
name = "foyer-intrusive"
version = "0.1.0"
-source = "git+https://github.com/mrcroxx/foyer?rev=41b1d39#41b1d3934cc92976737a9296273b4c5bee6422a0"
+source = "git+https://github.com/mrcroxx/foyer?rev=438eec8#438eec87e90c7a80cb53a06b711c6ea1ad7a0f41"
dependencies = [
"bytes",
"cmsketch",
@@ -2913,11 +3060,10 @@ dependencies = [
[[package]]
name = "foyer-storage"
version = "0.1.0"
-source = "git+https://github.com/mrcroxx/foyer?rev=41b1d39#41b1d3934cc92976737a9296273b4c5bee6422a0"
+source = "git+https://github.com/mrcroxx/foyer?rev=438eec8#438eec87e90c7a80cb53a06b711c6ea1ad7a0f41"
dependencies = [
"anyhow",
"async-channel",
- "async-trait",
"bitflags 2.4.0",
"bitmaps",
"bytes",
@@ -2928,6 +3074,7 @@ dependencies = [
"futures",
"itertools 0.11.0",
"libc",
+ "madsim-tokio",
"memoffset",
"nix 0.27.1",
"parking_lot 0.12.1",
@@ -2935,7 +3082,6 @@ dependencies = [
"prometheus",
"rand",
"thiserror",
- "tokio",
"tracing",
"twox-hash",
]
@@ -2943,7 +3089,7 @@ dependencies = [
[[package]]
name = "foyer-workspace-hack"
version = "0.1.0"
-source = "git+https://github.com/mrcroxx/foyer?rev=41b1d39#41b1d3934cc92976737a9296273b4c5bee6422a0"
+source = "git+https://github.com/mrcroxx/foyer?rev=438eec8#438eec87e90c7a80cb53a06b711c6ea1ad7a0f41"
dependencies = [
"crossbeam-utils",
"either",
@@ -2954,7 +3100,6 @@ dependencies = [
"hyper",
"itertools 0.10.5",
"libc",
- "lock_api",
"memchr",
"parking_lot 0.12.1",
"parking_lot_core 0.9.8",
@@ -2962,9 +3107,9 @@ dependencies = [
"quote",
"rand",
"regex",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
- "syn 2.0.33",
+ "regex-automata 0.4.1",
+ "regex-syntax 0.8.0",
+ "syn 2.0.37",
"tokio",
"tracing",
"tracing-core",
@@ -3001,7 +3146,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e"
dependencies = [
"frunk_proc_macro_helpers",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -3013,7 +3158,7 @@ dependencies = [
"frunk_core",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -3025,7 +3170,7 @@ dependencies = [
"frunk_core",
"frunk_proc_macro_helpers",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -3146,6 +3291,21 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
[[package]]
name = "futures-macro"
version = "0.3.28"
@@ -3154,7 +3314,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -3249,6 +3409,18 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+[[package]]
+name = "gloo-timers"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
[[package]]
name = "google-cloud-auth"
version = "0.12.0"
@@ -3256,7 +3428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "931bedb2264cb00f914b0a6a5c304e34865c34306632d3932e0951a073e4a67d"
dependencies = [
"async-trait",
- "base64 0.21.3",
+ "base64 0.21.4",
"google-cloud-metadata",
"google-cloud-token",
"home",
@@ -3282,7 +3454,7 @@ dependencies = [
"thiserror",
"tokio",
"tokio-retry",
- "tonic",
+ "tonic 0.9.2",
"tower",
"tracing",
]
@@ -3293,9 +3465,9 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5453af21ac0cc1f3b2cfb5b687c174e701c10ec2d5c286aff7ca8cbbf08d31b4"
dependencies = [
- "prost",
- "prost-types",
- "tonic",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
+ "tonic 0.9.2",
]
[[package]]
@@ -3321,7 +3493,7 @@ dependencies = [
"google-cloud-gax",
"google-cloud-googleapis",
"google-cloud-token",
- "prost-types",
+ "prost-types 0.11.9",
"thiserror",
"tokio",
"tokio-util",
@@ -3682,7 +3854,7 @@ dependencies = [
[[package]]
name = "icelake"
version = "0.0.10"
-source = "git+https://github.com/icelake-io/icelake?rev=166a36b1a40a64086db09a0e0f2ed6791cec548b#166a36b1a40a64086db09a0e0f2ed6791cec548b"
+source = "git+https://github.com/icelake-io/icelake?rev=16dab0e36ab337e58ee8002d828def2d212fa116#16dab0e36ab337e58ee8002d828def2d212fa116"
dependencies = [
"anyhow",
"apache-avro 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3690,6 +3862,7 @@ dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-cast",
+ "arrow-ord",
"arrow-row",
"arrow-schema",
"arrow-select",
@@ -3705,7 +3878,7 @@ dependencies = [
"log",
"murmur3",
"once_cell",
- "opendal",
+ "opendal 0.40.0",
"ordered-float 3.9.1",
"parquet",
"regex",
@@ -3714,7 +3887,7 @@ dependencies = [
"serde",
"serde_bytes",
"serde_json",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"tokio",
"toml 0.7.8",
"url",
@@ -3797,6 +3970,17 @@ dependencies = [
"str_stack",
]
+[[package]]
+name = "inherent"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "inquire"
version = "0.6.2"
@@ -3856,12 +4040,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "iter-chunks"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7abddfc4e19bc38f3922e41b341fedb4e1470e922f024c4e5ae5922f56c7593"
-
[[package]]
name = "itertools"
version = "0.10.5"
@@ -3959,7 +4137,7 @@ version = "8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"pem 1.1.1",
"ring",
"serde",
@@ -3976,6 +4154,15 @@ dependencies = [
"duct",
]
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -4161,6 +4348,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
[[package]]
name = "linux-raw-sys"
version = "0.4.5"
@@ -4189,6 +4382,9 @@ name = "log"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+dependencies = [
+ "value-bag",
+]
[[package]]
name = "loom"
@@ -4312,21 +4508,21 @@ dependencies = [
[[package]]
name = "madsim-etcd-client"
-version = "0.3.0+0.11.1"
+version = "0.4.0+0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26d21c8d69c25db9d461ab7dfa4b09bd982687546c8ca2c43d743533a8f1c3f"
+checksum = "02b4b5de48bb7f3f7eae0bca62b3ed0b7d714b1b273d7347329b92c3a2eef113"
dependencies = [
"etcd-client",
"futures-util",
"http",
"madsim",
"serde",
- "serde_with 2.3.3",
+ "serde_with 3.4.0",
"spin 0.9.8",
"thiserror",
"tokio",
- "toml 0.7.8",
- "tonic",
+ "toml 0.8.2",
+ "tonic 0.10.2",
"tracing",
]
@@ -4344,8 +4540,9 @@ dependencies = [
[[package]]
name = "madsim-rdkafka"
-version = "0.2.22"
-source = "git+https://github.com/madsim-rs/madsim.git?rev=fedb1e3#fedb1e3a0a8758650c9e15076941c999150bdb31"
+version = "0.3.0+0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00f9ab2d0545a55e4f209fc72c180a7e7b45a4e7baee7b4994c4628a877c5525"
dependencies = [
"async-channel",
"async-trait",
@@ -4378,29 +4575,31 @@ dependencies = [
[[package]]
name = "madsim-tonic"
-version = "0.3.1+0.9.2"
+version = "0.4.0+0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66177cce816367f8358a4dc482eabff8f979cf8a1d3288d3aa8dd822fb327c69"
+checksum = "3b4d847e67d6f8319d7c5393121556e2a987f5b744967a0f9b84e502020239d3"
dependencies = [
"async-stream",
"chrono",
"futures-util",
"madsim",
- "tonic",
+ "tokio",
+ "tonic 0.10.2",
+ "tower",
"tracing",
]
[[package]]
name = "madsim-tonic-build"
-version = "0.3.1+0.9.2"
+version = "0.4.2+0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f6b2947243e5ae6a37c7992da07cf3ed60ebeb6a3d2c1e95574a2a2697b0c0"
+checksum = "4a2ad2776ba20221ccbe4e136e2fa0f7ab90eebd608373177f3e74a198a288ec"
dependencies = [
- "prettyplease",
+ "prettyplease 0.2.15",
"proc-macro2",
- "prost-build",
+ "prost-build 0.12.1",
"quote",
- "syn 1.0.109",
+ "syn 2.0.37",
"tonic-build",
]
@@ -4558,6 +4757,15 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "model_migration"
+version = "0.1.0"
+dependencies = [
+ "async-std",
+ "sea-orm-migration",
+ "uuid",
+]
+
[[package]]
name = "moka"
version = "0.12.0"
@@ -4593,6 +4801,12 @@ name = "multimap"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
+[[package]]
+name = "multimap"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631"
dependencies = [
"serde",
]
@@ -4616,7 +4830,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
"termcolor",
"thiserror",
]
@@ -4660,7 +4874,7 @@ version = "0.30.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"bigdecimal",
"bindgen",
"bitflags 2.4.0",
@@ -4824,11 +5038,10 @@ dependencies = [
[[package]]
name = "nuid"
-version = "0.3.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c1bb65186718d348306bf1afdeb20d9ab45b2ab80fb793c0fdcf59ffbb4f38"
+checksum = "fc895af95856f929163a0aa20c26a78d26bfdc839f51b9d5aa7a5b79e52b7e83"
dependencies = [
- "lazy_static",
"rand",
]
@@ -5033,7 +5246,40 @@ dependencies = [
"async-compat",
"async-trait",
"backon",
- "base64 0.21.3",
+ "base64 0.21.4",
+ "bytes",
+ "chrono",
+ "flagset",
+ "futures",
+ "http",
+ "hyper",
+ "log",
+ "md-5",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "percent-encoding",
+ "pin-project",
+ "quick-xml 0.29.0",
+ "reqsign",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tokio",
+ "uuid",
+]
+
+[[package]]
+name = "opendal"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddba7299bab261d3ae2f37617fb7f45b19ed872752bb4e22cf93a69d979366c5"
+dependencies = [
+ "anyhow",
+ "async-compat",
+ "async-trait",
+ "backon",
+ "base64 0.21.4",
"bytes",
"chrono",
"flagset",
@@ -5046,6 +5292,7 @@ dependencies = [
"parking_lot 0.12.1",
"percent-encoding",
"pin-project",
+ "prometheus",
"quick-xml 0.29.0",
"reqsign",
"reqwest",
@@ -5106,7 +5353,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -5160,10 +5407,10 @@ dependencies = [
"opentelemetry-semantic-conventions",
"opentelemetry_api",
"opentelemetry_sdk",
- "prost",
+ "prost 0.11.9",
"thiserror",
"tokio",
- "tonic",
+ "tonic 0.9.2",
]
[[package]]
@@ -5174,8 +5421,8 @@ checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
dependencies = [
"opentelemetry_api",
"opentelemetry_sdk",
- "prost",
- "tonic",
+ "prost 0.11.9",
+ "tonic 0.9.2",
]
[[package]]
@@ -5264,6 +5511,30 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "ouroboros"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "outref"
version = "0.5.1"
@@ -5288,6 +5559,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d"
+[[package]]
+name = "parking"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+
[[package]]
name = "parking_lot"
version = "0.11.2"
@@ -5341,9 +5618,9 @@ dependencies = [
[[package]]
name = "parquet"
-version = "46.0.0"
+version = "47.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa"
+checksum = "0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d"
dependencies = [
"ahash 0.8.3",
"arrow-array",
@@ -5353,7 +5630,7 @@ dependencies = [
"arrow-ipc",
"arrow-schema",
"arrow-select",
- "base64 0.21.3",
+ "base64 0.21.4",
"brotli",
"bytes",
"chrono",
@@ -5369,7 +5646,7 @@ dependencies = [
"thrift",
"tokio",
"twox-hash",
- "zstd",
+ "zstd 0.12.4",
]
[[package]]
@@ -5395,7 +5672,7 @@ dependencies = [
"regex",
"regex-syntax 0.7.5",
"structmeta",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -5437,7 +5714,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"serde",
]
@@ -5449,8 +5726,8 @@ checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24"
dependencies = [
"heck 0.4.1",
"itertools 0.10.5",
- "prost",
- "prost-types",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
]
[[package]]
@@ -5474,7 +5751,7 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"serde",
]
@@ -5591,7 +5868,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -5668,12 +5945,28 @@ dependencies = [
]
[[package]]
-name = "portable-atomic"
-version = "1.4.3"
+name = "polling"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
-
-[[package]]
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+
+[[package]]
name = "postgres"
version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5696,7 +5989,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -5705,7 +5998,7 @@ version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"byteorder",
"bytes",
"fallible-iterator",
@@ -5734,9 +6027,9 @@ dependencies = [
[[package]]
name = "pprof"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a"
+checksum = "ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb"
dependencies = [
"backtrace",
"cfg-if",
@@ -5831,6 +6124,16 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "prettyplease"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.37",
+]
+
[[package]]
name = "priority-queue"
version = "1.3.2"
@@ -5857,7 +6160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
]
[[package]]
@@ -5909,7 +6212,7 @@ dependencies = [
"byteorder",
"hex",
"lazy_static",
- "rustix 0.36.15",
+ "rustix 0.36.16",
]
[[package]]
@@ -5922,7 +6225,7 @@ dependencies = [
"byteorder",
"hex",
"lazy_static",
- "rustix 0.36.15",
+ "rustix 0.36.16",
]
[[package]]
@@ -5944,13 +6247,13 @@ dependencies = [
[[package]]
name = "prometheus-http-query"
-version = "0.6.6"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7970fd6e91b5cb87e9a093657572a896d133879ced7752d2c7635beae29eaba0"
+checksum = "8e7c6186f0b66203811641c88ca4e5817182caa7553868359bafa5b17d97f37f"
dependencies = [
+ "mime",
"reqwest",
"serde",
- "serde_json",
"time",
"url",
]
@@ -5962,7 +6265,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
dependencies = [
"bytes",
- "prost-derive",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.1",
]
[[package]]
@@ -5976,17 +6289,39 @@ dependencies = [
"itertools 0.10.5",
"lazy_static",
"log",
- "multimap",
+ "multimap 0.8.3",
"petgraph",
- "prettyplease",
- "prost",
- "prost-types",
+ "prettyplease 0.1.25",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
"regex",
"syn 1.0.109",
"tempfile",
"which",
]
+[[package]]
+name = "prost-build"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac"
+dependencies = [
+ "bytes",
+ "heck 0.4.1",
+ "itertools 0.11.0",
+ "log",
+ "multimap 0.8.3",
+ "once_cell",
+ "petgraph",
+ "prettyplease 0.2.15",
+ "prost 0.12.1",
+ "prost-types 0.12.1",
+ "regex",
+ "syn 2.0.37",
+ "tempfile",
+ "which",
+]
+
[[package]]
name = "prost-derive"
version = "0.11.9"
@@ -6000,25 +6335,37 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "prost-derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
+dependencies = [
+ "anyhow",
+ "itertools 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "prost-helpers"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
- "workspace-hack",
+ "syn 2.0.37",
]
[[package]]
name = "prost-reflect"
-version = "0.11.5"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b823de344848e011658ac981009100818b322421676740546f8b52ed5249428"
+checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3"
dependencies = [
"once_cell",
- "prost",
- "prost-types",
+ "prost 0.12.1",
+ "prost-types 0.12.1",
]
[[package]]
@@ -6027,7 +6374,16 @@ version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
dependencies = [
- "prost",
+ "prost 0.11.9",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+dependencies = [
+ "prost 0.12.1",
]
[[package]]
@@ -6111,9 +6467,9 @@ dependencies = [
"oauth2",
"openidconnect",
"pem 1.1.1",
- "prost",
- "prost-build",
- "prost-derive",
+ "prost 0.11.9",
+ "prost-build 0.11.9",
+ "prost-derive 0.11.9",
"rand",
"regex",
"serde",
@@ -6259,8 +6615,9 @@ dependencies = [
[[package]]
name = "rdkafka-sys"
-version = "4.3.0+1.9.2"
-source = "git+https://github.com/MaterializeInc/rust-rdkafka?rev=8ea07c4#8ea07c4d2b96636ff093e670bc921892aee0d56a"
+version = "4.6.0+2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad63c279fca41a27c231c450a2d2ad18288032e9cbb159ad16c9d96eba35aaaf"
dependencies = [
"cmake",
"libc",
@@ -6278,12 +6635,19 @@ version = "0.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
dependencies = [
+ "async-std",
+ "async-trait",
+ "bytes",
"combine",
+ "futures-util",
"itoa",
"percent-encoding",
+ "pin-project-lite",
"ryu",
"sha1_smol",
"socket2 0.4.9",
+ "tokio",
+ "tokio-util",
"url",
]
@@ -6307,14 +6671,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.5"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.1",
+ "regex-syntax 0.8.0",
]
[[package]]
@@ -6328,13 +6692,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.8"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.0",
]
[[package]]
@@ -6349,6 +6713,12 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+[[package]]
+name = "regex-syntax"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d"
+
[[package]]
name = "rend"
version = "0.4.0"
@@ -6366,7 +6736,7 @@ checksum = "3228e570df74d69d3d3236a71371f1edd748a3e4eb728ea1f29d403bc10fc727"
dependencies = [
"anyhow",
"async-trait",
- "base64 0.21.3",
+ "base64 0.21.4",
"chrono",
"form_urlencoded",
"hex",
@@ -6395,7 +6765,7 @@ version = "0.11.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"bytes",
"encoding_rs",
"futures-core",
@@ -6478,7 +6848,7 @@ dependencies = [
"reqwest",
"serde",
"serde_json",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"serde_yaml",
"tempfile",
"tracing",
@@ -6509,7 +6879,7 @@ dependencies = [
"bytes",
"itertools 0.11.0",
"parking_lot 0.12.1",
- "prost",
+ "prost 0.12.1",
"risingwave_common",
"risingwave_hummock_sdk",
"risingwave_object_store",
@@ -6527,7 +6897,6 @@ dependencies = [
"anyhow",
"assert_matches",
"async-recursion",
- "async-stream",
"async-trait",
"criterion",
"either",
@@ -6546,6 +6915,7 @@ dependencies = [
"risingwave_common",
"risingwave_connector",
"risingwave_expr",
+ "risingwave_expr_impl",
"risingwave_hummock_sdk",
"risingwave_pb",
"risingwave_rpc_client",
@@ -6560,7 +6930,6 @@ dependencies = [
"tokio-metrics",
"tokio-stream",
"tracing",
- "uuid",
"workspace-hack",
]
@@ -6591,7 +6960,7 @@ dependencies = [
"risingwave_storage",
"serde",
"tokio-stream",
- "toml 0.7.8",
+ "toml 0.8.2",
"tracing",
"tracing-subscriber",
"workspace-hack",
@@ -6608,8 +6977,9 @@ dependencies = [
"risingwave_compactor",
"risingwave_compute",
"risingwave_ctl",
+ "risingwave_expr_impl",
"risingwave_frontend",
- "risingwave_meta",
+ "risingwave_meta_node",
"risingwave_rt",
"task_stats_alloc",
"tikv-jemallocator",
@@ -6633,8 +7003,9 @@ dependencies = [
"risingwave_compactor",
"risingwave_compute",
"risingwave_ctl",
+ "risingwave_expr_impl",
"risingwave_frontend",
- "risingwave_meta",
+ "risingwave_meta_node",
"risingwave_rt",
"shell-words",
"strum 0.25.0",
@@ -6656,9 +7027,11 @@ dependencies = [
"arc-swap",
"arrow-array",
"arrow-buffer",
+ "arrow-cast",
"arrow-schema",
"async-trait",
"auto_enums",
+ "auto_impl",
"bitflags 2.4.0",
"byteorder",
"bytes",
@@ -6705,7 +7078,7 @@ dependencies = [
"pretty_assertions",
"procfs 0.15.1",
"prometheus",
- "prost",
+ "prost 0.12.1",
"rand",
"regex",
"reqwest",
@@ -6718,7 +7091,7 @@ dependencies = [
"serde_bytes",
"serde_default",
"serde_json",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"smallbitset",
"speedate",
"static_assertions",
@@ -6727,9 +7100,8 @@ dependencies = [
"sysinfo",
"tempfile",
"thiserror",
- "tikv-jemalloc-ctl",
"tinyvec",
- "toml 0.7.8",
+ "toml 0.8.2",
"tower-layer",
"tower-service",
"tracing",
@@ -6741,6 +7113,19 @@ dependencies = [
"workspace-hack",
]
+[[package]]
+name = "risingwave_common_heap_profiling"
+version = "1.3.0-alpha"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "madsim-tokio",
+ "parking_lot 0.12.1",
+ "risingwave_common",
+ "tikv-jemalloc-ctl",
+ "tracing",
+]
+
[[package]]
name = "risingwave_common_proc_macro"
version = "1.3.0-alpha"
@@ -6750,7 +7135,6 @@ dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
- "workspace-hack",
]
[[package]]
@@ -6789,6 +7173,7 @@ dependencies = [
"risingwave_hummock_sdk",
"risingwave_hummock_test",
"risingwave_meta",
+ "risingwave_meta_node",
"risingwave_object_store",
"risingwave_pb",
"risingwave_rpc_client",
@@ -6802,22 +7187,20 @@ dependencies = [
name = "risingwave_compactor"
version = "1.3.0-alpha"
dependencies = [
- "anyhow",
"async-trait",
"await-tree",
"clap",
"madsim-tokio",
"madsim-tonic",
"parking_lot 0.12.1",
- "prometheus",
"risingwave_common",
+ "risingwave_common_heap_profiling",
"risingwave_common_service",
"risingwave_object_store",
"risingwave_pb",
"risingwave_rpc_client",
"risingwave_storage",
"serde",
- "serde_json",
"tracing",
"workspace-hack",
]
@@ -6844,9 +7227,11 @@ dependencies = [
"rand",
"risingwave_batch",
"risingwave_common",
+ "risingwave_common_heap_profiling",
"risingwave_common_service",
"risingwave_connector",
"risingwave_hummock_sdk",
+ "risingwave_jni_core",
"risingwave_pb",
"risingwave_rpc_client",
"risingwave_source",
@@ -6880,8 +7265,7 @@ dependencies = [
"aws-sdk-s3",
"aws-smithy-http",
"aws-types",
- "base64 0.21.3",
- "bincode 1.3.3",
+ "base64 0.21.4",
"byteorder",
"bytes",
"chrono",
@@ -6889,6 +7273,7 @@ dependencies = [
"criterion",
"csv",
"duration-str",
+ "easy-ext",
"enum-as-inner",
"futures",
"futures-async-stream",
@@ -6904,25 +7289,24 @@ dependencies = [
"jsonschema-transpiler",
"madsim-rdkafka",
"madsim-tokio",
- "madsim-tonic",
"maplit",
"moka",
"mysql_async",
"mysql_common",
"nexmark",
- "nkeys",
"num-bigint",
- "opendal",
"parking_lot 0.12.1",
"paste",
"prometheus",
- "prost",
- "prost-build",
+ "prost 0.12.1",
+ "prost-build 0.12.1",
"prost-reflect",
- "prost-types",
+ "prost-types 0.12.1",
"protobuf-native",
"pulsar",
"rand",
+ "redis",
+ "regex",
"reqwest",
"risingwave_common",
"risingwave_jni_core",
@@ -6932,15 +7316,20 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"simd-json",
+ "strum 0.25.0",
+ "strum_macros 0.25.2",
"tempfile",
"thiserror",
"time",
"tokio-retry",
"tokio-stream",
"tokio-util",
+ "tonic 0.9.2",
"tracing",
+ "tracing-futures",
+ "tracing-test",
"url",
"urlencoding",
"workspace-hack",
@@ -6999,46 +7388,66 @@ dependencies = [
name = "risingwave_expr"
version = "1.3.0-alpha"
dependencies = [
- "aho-corasick",
"anyhow",
"arrow-array",
"arrow-schema",
"async-trait",
- "auto_enums",
+ "auto_impl",
"await-tree",
"cfg-or-panic",
"chrono",
- "chrono-tz",
- "criterion",
"ctor",
"downcast-rs",
"easy-ext",
"either",
"expect-test",
- "fancy-regex",
- "futures",
"futures-async-stream",
"futures-util",
- "hex",
"itertools 0.11.0",
"madsim-tokio",
- "md5",
"num-traits",
"parse-display",
"paste",
- "regex",
"risingwave_common",
"risingwave_expr_macro",
"risingwave_pb",
"risingwave_udf",
+ "smallvec",
+ "static_assertions",
+ "thiserror",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "risingwave_expr_impl"
+version = "1.3.0-alpha"
+dependencies = [
+ "aho-corasick",
+ "anyhow",
+ "async-trait",
+ "auto_enums",
+ "chrono",
+ "criterion",
+ "expect-test",
+ "fancy-regex",
+ "futures-async-stream",
+ "futures-util",
+ "hex",
+ "itertools 0.11.0",
+ "madsim-tokio",
+ "md5",
+ "num-traits",
+ "regex",
+ "risingwave_common",
+ "risingwave_expr",
+ "risingwave_pb",
"rust_decimal",
"self_cell",
"serde",
"serde_json",
"sha1",
"sha2",
- "smallvec",
- "static_assertions",
"thiserror",
"tracing",
"workspace-hack",
@@ -7051,7 +7460,7 @@ dependencies = [
"itertools 0.11.0",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -7082,7 +7491,6 @@ dependencies = [
"madsim-tonic",
"maplit",
"md5",
- "more-asserts",
"num-integer",
"parking_lot 0.12.1",
"parse-display",
@@ -7100,6 +7508,7 @@ dependencies = [
"risingwave_common_service",
"risingwave_connector",
"risingwave_expr",
+ "risingwave_expr_impl",
"risingwave_pb",
"risingwave_rpc_client",
"risingwave_source",
@@ -7180,7 +7589,7 @@ dependencies = [
"madsim-tokio",
"mockall",
"parking_lot 0.12.1",
- "prost",
+ "prost 0.12.1",
"risingwave_common",
"risingwave_hummock_sdk",
"risingwave_pb",
@@ -7192,7 +7601,8 @@ dependencies = [
name = "risingwave_java_binding"
version = "0.1.0"
dependencies = [
- "prost",
+ "jni",
+ "prost 0.12.1",
"risingwave_common",
"risingwave_expr",
"risingwave_jni_core",
@@ -7206,11 +7616,13 @@ name = "risingwave_jni_core"
version = "0.1.0"
dependencies = [
"bytes",
+ "cfg-or-panic",
"futures",
"itertools 0.11.0",
"jni",
"madsim-tokio",
- "prost",
+ "paste",
+ "prost 0.12.1",
"risingwave_common",
"risingwave_expr",
"risingwave_hummock_sdk",
@@ -7253,18 +7665,18 @@ dependencies = [
"maplit",
"memcomparable",
"mime_guess",
+ "model_migration",
"num-integer",
"num-traits",
"parking_lot 0.12.1",
"prometheus",
"prometheus-http-query",
- "prost",
+ "prost 0.12.1",
"rand",
- "regex",
"reqwest",
"risingwave_backup",
"risingwave_common",
- "risingwave_common_service",
+ "risingwave_common_heap_profiling",
"risingwave_connector",
"risingwave_hummock_sdk",
"risingwave_object_store",
@@ -7273,12 +7685,10 @@ dependencies = [
"risingwave_sqlparser",
"risingwave_test_runner",
"scopeguard",
+ "sea-orm",
"serde",
"serde_json",
- "sqlx",
- "static_assertions",
"sync-point",
- "tempfile",
"thiserror",
"tokio-retry",
"tokio-stream",
@@ -7290,6 +7700,56 @@ dependencies = [
"workspace-hack",
]
+[[package]]
+name = "risingwave_meta_node"
+version = "1.3.0-alpha"
+dependencies = [
+ "anyhow",
+ "clap",
+ "either",
+ "futures",
+ "itertools 0.11.0",
+ "madsim-etcd-client",
+ "madsim-tokio",
+ "madsim-tonic",
+ "model_migration",
+ "prometheus-http-query",
+ "regex",
+ "risingwave_common",
+ "risingwave_common_heap_profiling",
+ "risingwave_common_service",
+ "risingwave_meta",
+ "risingwave_meta_service",
+ "risingwave_pb",
+ "risingwave_rpc_client",
+ "sea-orm",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "risingwave_meta_service"
+version = "1.3.0-alpha"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "either",
+ "futures",
+ "itertools 0.11.0",
+ "madsim-tokio",
+ "madsim-tonic",
+ "regex",
+ "risingwave_common",
+ "risingwave_connector",
+ "risingwave_meta",
+ "risingwave_pb",
+ "sea-orm",
+ "sync-point",
+ "tokio-stream",
+ "tracing",
+ "workspace-hack",
+]
+
[[package]]
name = "risingwave_object_store"
version = "1.3.0-alpha"
@@ -7309,7 +7769,7 @@ dependencies = [
"itertools 0.11.0",
"madsim-aws-sdk-s3",
"madsim-tokio",
- "opendal",
+ "opendal 0.39.0",
"prometheus",
"risingwave_common",
"spin 0.9.8",
@@ -7328,9 +7788,10 @@ dependencies = [
"madsim-tonic-build",
"pbjson",
"pbjson-build",
- "prost",
+ "prost 0.12.1",
"prost-helpers",
"serde",
+ "strum 0.25.0",
"walkdir",
"workspace-hack",
]
@@ -7345,10 +7806,11 @@ dependencies = [
"libtest-mimic",
"madsim-tokio",
"paste",
+ "risingwave_expr_impl",
"risingwave_frontend",
"risingwave_sqlparser",
"serde",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"serde_yaml",
"tempfile",
"walkdir",
@@ -7403,7 +7865,6 @@ name = "risingwave_rt"
version = "1.3.0-alpha"
dependencies = [
"await-tree",
- "chrono",
"console",
"console-subscriber",
"either",
@@ -7415,7 +7876,6 @@ dependencies = [
"opentelemetry-semantic-conventions",
"parking_lot 0.12.1",
"pprof",
- "prometheus",
"risingwave_common",
"risingwave_variables",
"rlimit",
@@ -7455,8 +7915,9 @@ dependencies = [
"risingwave_connector",
"risingwave_ctl",
"risingwave_e2e_extended_mode_test",
+ "risingwave_expr_impl",
"risingwave_frontend",
- "risingwave_meta",
+ "risingwave_meta_node",
"risingwave_pb",
"risingwave_rpc_client",
"risingwave_sqlparser",
@@ -7468,6 +7929,7 @@ dependencies = [
"tempfile",
"tikv-jemallocator",
"tokio-postgres",
+ "tokio-stream",
"tracing",
"tracing-subscriber",
]
@@ -7479,7 +7941,6 @@ dependencies = [
"anyhow",
"assert_matches",
"criterion",
- "easy-ext",
"futures",
"futures-async-stream",
"itertools 0.11.0",
@@ -7516,7 +7977,7 @@ dependencies = [
"madsim-tokio",
"risingwave_sqlparser",
"serde",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"serde_yaml",
"walkdir",
"workspace-hack",
@@ -7538,6 +7999,7 @@ dependencies = [
"regex",
"risingwave_common",
"risingwave_expr",
+ "risingwave_expr_impl",
"risingwave_frontend",
"risingwave_pb",
"risingwave_sqlparser",
@@ -7560,10 +8022,10 @@ dependencies = [
"regex",
"risingwave_rt",
"serde",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"tokio-postgres",
"tokio-stream",
- "toml 0.7.8",
+ "toml 0.8.2",
"tracing",
"workspace-hack",
]
@@ -7572,7 +8034,6 @@ dependencies = [
name = "risingwave_storage"
version = "1.3.0-alpha"
dependencies = [
- "anyhow",
"arc-swap",
"async-trait",
"auto_enums",
@@ -7596,6 +8057,7 @@ dependencies = [
"lz4",
"mach2",
"madsim-tokio",
+ "madsim-tonic",
"memcomparable",
"moka",
"more-asserts",
@@ -7604,7 +8066,7 @@ dependencies = [
"parking_lot 0.12.1",
"procfs 0.15.1",
"prometheus",
- "prost",
+ "prost 0.12.1",
"rand",
"risingwave_backup",
"risingwave_common",
@@ -7629,7 +8091,7 @@ dependencies = [
"workspace-hack",
"xorf",
"xxhash-rust",
- "zstd",
+ "zstd 0.13.0",
]
[[package]]
@@ -7644,7 +8106,6 @@ dependencies = [
"await-tree",
"bytes",
"criterion",
- "dyn-clone",
"educe",
"either",
"enum-as-inner",
@@ -7653,7 +8114,6 @@ dependencies = [
"futures-async-stream",
"governor",
"hytra",
- "iter-chunks",
"itertools 0.11.0",
"local_stats_alloc",
"lru 0.7.6",
@@ -7661,18 +8121,16 @@ dependencies = [
"madsim-tonic",
"maplit",
"memcomparable",
- "multimap",
- "num-traits",
+ "multimap 0.9.0",
"parking_lot 0.12.1",
- "parse-display",
"pin-project",
"prometheus",
- "prost",
+ "prost 0.12.1",
"rand",
"risingwave_common",
"risingwave_connector",
"risingwave_expr",
- "risingwave_frontend",
+ "risingwave_expr_impl",
"risingwave_hummock_sdk",
"risingwave_hummock_test",
"risingwave_pb",
@@ -7683,7 +8141,6 @@ dependencies = [
"serde_json",
"serde_yaml",
"smallvec",
- "spin 0.9.8",
"static_assertions",
"task_stats_alloc",
"thiserror",
@@ -7842,9 +8299,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.36.15"
+version = "0.36.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
+checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab"
dependencies = [
"bitflags 1.3.2",
"errno",
@@ -7854,6 +8311,20 @@ dependencies = [
"windows-sys 0.45.0",
]
+[[package]]
+name = "rustix"
+version = "0.37.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "rustix"
version = "0.38.11"
@@ -7909,7 +8380,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
]
[[package]]
@@ -8021,6 +8492,165 @@ dependencies = [
"untrusted",
]
+[[package]]
+name = "sea-bae"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bd3534a9978d0aa7edd2808dc1f8f31c4d0ecd31ddf71d997b3c98e9f3c9114"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "sea-orm"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61f6c7daef05dde3476d97001e11fca7a52b655aa3bf4fd610ab2da1176a2ed5"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "bigdecimal",
+ "chrono",
+ "futures",
+ "log",
+ "ouroboros",
+ "rust_decimal",
+ "sea-orm-macros",
+ "sea-query",
+ "sea-query-binder",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "strum 0.25.0",
+ "thiserror",
+ "time",
+ "tracing",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "sea-orm-cli"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e3f0ff2fa5672e2e7314d107c6498a18e469beeb340a0ed84e3075fce73c2cd"
+dependencies = [
+ "chrono",
+ "clap",
+ "dotenvy",
+ "glob",
+ "regex",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
+[[package]]
+name = "sea-orm-macros"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd90e73d5f5b184bad525767da29fbfec132b4e62ebd6f60d2f2737ec6468f62"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "sea-bae",
+ "syn 2.0.37",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sea-orm-migration"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21f673fcefb3a7e7b89a12b6c0e854ec0be14367635ac3435369c8ad7f11e09e"
+dependencies = [
+ "async-trait",
+ "clap",
+ "dotenvy",
+ "futures",
+ "sea-orm",
+ "sea-orm-cli",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sea-query"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c05a5bf6403834be253489bbe95fa9b1e5486bc843b61f60d26b5c9c1e244b"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "derivative",
+ "inherent",
+ "ordered-float 3.9.1",
+ "rust_decimal",
+ "sea-query-derive",
+ "serde_json",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-binder"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "rust_decimal",
+ "sea-query",
+ "serde_json",
+ "sqlx",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd78f2e0ee8e537e9195d1049b752e0433e2cac125426bccb7b5c3e508096117"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "thiserror",
+]
+
+[[package]]
+name = "sea-schema"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cd9561232bd1b82ea748b581f15909d11de0db6563ddcf28c5d908aee8282f1"
+dependencies = [
+ "futures",
+ "sea-query",
+ "sea-schema-derive",
+]
+
+[[package]]
+name = "sea-schema-derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f686050f76bffc4f635cda8aea6df5548666b830b52387e8bc7de11056d11e"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "seahash"
version = "4.1.0"
@@ -8131,7 +8761,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8193,7 +8823,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8229,34 +8859,18 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "serde",
- "serde_json",
- "serde_with_macros 2.3.3",
- "time",
-]
-
-[[package]]
-name = "serde_with"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
"chrono",
"hex",
"indexmap 1.9.3",
"indexmap 2.0.0",
"serde",
"serde_json",
- "serde_with_macros 3.3.0",
+ "serde_with_macros 3.4.0",
"time",
]
@@ -8274,26 +8888,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "2.3.3"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
dependencies = [
"darling 0.20.3",
"proc-macro2",
"quote",
- "syn 2.0.33",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
-dependencies = [
- "darling 0.20.3",
- "proc-macro2",
- "quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8331,7 +8933,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8447,10 +9049,11 @@ dependencies = [
[[package]]
name = "simd-json"
-version = "0.10.6"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de7f1293f0e4e11d52e588766fe9de8caa2857ff63809d40de83245452ca7c5c"
+checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec"
dependencies = [
+ "getrandom",
"halfbrown",
"lexical-core",
"serde",
@@ -8467,9 +9070,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
[[package]]
name = "similar"
-version = "2.2.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
[[package]]
name = "simple_asn1"
@@ -8546,9 +9149,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
dependencies = [
"serde",
]
@@ -8670,6 +9273,7 @@ checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53"
dependencies = [
"ahash 0.8.3",
"atoi",
+ "bigdecimal",
"byteorder",
"bytes",
"chrono",
@@ -8688,19 +9292,23 @@ dependencies = [
"indexmap 2.0.0",
"log",
"memchr",
+ "native-tls",
"once_cell",
"paste",
"percent-encoding",
+ "rust_decimal",
"serde",
"serde_json",
"sha2",
"smallvec",
"sqlformat",
"thiserror",
+ "time",
"tokio",
"tokio-stream",
"tracing",
"url",
+ "uuid",
]
[[package]]
@@ -8749,7 +9357,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482"
dependencies = [
"atoi",
- "base64 0.21.3",
+ "base64 0.21.4",
+ "bigdecimal",
"bitflags 2.4.0",
"byteorder",
"bytes",
@@ -8774,6 +9383,7 @@ dependencies = [
"percent-encoding",
"rand",
"rsa",
+ "rust_decimal",
"serde",
"sha1",
"sha2",
@@ -8781,7 +9391,9 @@ dependencies = [
"sqlx-core",
"stringprep",
"thiserror",
+ "time",
"tracing",
+ "uuid",
"whoami",
]
@@ -8792,7 +9404,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e"
dependencies = [
"atoi",
- "base64 0.21.3",
+ "base64 0.21.4",
+ "bigdecimal",
"bitflags 2.4.0",
"byteorder",
"chrono",
@@ -8811,8 +9424,10 @@ dependencies = [
"log",
"md-5",
"memchr",
+ "num-bigint",
"once_cell",
"rand",
+ "rust_decimal",
"serde",
"serde_json",
"sha1",
@@ -8821,7 +9436,9 @@ dependencies = [
"sqlx-core",
"stringprep",
"thiserror",
+ "time",
"tracing",
+ "uuid",
"whoami",
]
@@ -8844,8 +9461,10 @@ dependencies = [
"percent-encoding",
"serde",
"sqlx-core",
+ "time",
"tracing",
"url",
+ "uuid",
]
[[package]]
@@ -8892,7 +9511,7 @@ dependencies = [
"proc-macro2",
"quote",
"structmeta-derive",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8903,7 +9522,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -8944,7 +9563,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -9009,9 +9628,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.33"
+version = "2.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
dependencies = [
"proc-macro2",
"quote",
@@ -9113,7 +9732,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -9287,7 +9906,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -9422,7 +10041,19 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.20.2",
]
[[package]]
@@ -9447,6 +10078,19 @@ dependencies = [
"winnow",
]
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tonic"
version = "0.9.2"
@@ -9456,7 +10100,7 @@ dependencies = [
"async-stream",
"async-trait",
"axum",
- "base64 0.21.3",
+ "base64 0.21.4",
"bytes",
"flate2",
"futures-core",
@@ -9468,7 +10112,7 @@ dependencies = [
"hyper-timeout",
"percent-encoding",
"pin-project",
- "prost",
+ "prost 0.11.9",
"rustls-pemfile",
"tokio",
"tokio-rustls 0.24.1",
@@ -9480,17 +10124,44 @@ dependencies = [
"webpki-roots 0.23.1",
]
+[[package]]
+name = "tonic"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.21.4",
+ "bytes",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.12.1",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
[[package]]
name = "tonic-build"
-version = "0.9.2"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
dependencies = [
- "prettyplease",
+ "prettyplease 0.2.15",
"proc-macro2",
- "prost-build",
+ "prost-build 0.12.1",
"quote",
- "syn 1.0.109",
+ "syn 2.0.37",
]
[[package]]
@@ -9571,7 +10242,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -9820,9 +10491,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
dependencies = [
"getrandom",
"rand",
@@ -9835,6 +10506,12 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+[[package]]
+name = "value-bag"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
+
[[package]]
name = "value-trait"
version = "0.6.1"
@@ -9891,6 +10568,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
[[package]]
name = "walkdir"
version = "2.4.0"
@@ -9937,7 +10620,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
"wasm-bindgen-shared",
]
@@ -9971,7 +10654,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -10007,9 +10690,9 @@ dependencies = [
[[package]]
name = "webpki"
-version = "0.22.1"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
+checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f"
dependencies = [
"ring",
"untrusted",
@@ -10261,11 +10944,12 @@ dependencies = [
"ahash 0.8.3",
"allocator-api2",
"anyhow",
+ "async-std",
"auto_enums",
"aws-credential-types",
"aws-sdk-s3",
"aws-smithy-client",
- "base64 0.21.3",
+ "base64 0.21.4",
"bit-vec",
"bitflags 2.4.0",
"byteorder",
@@ -10294,10 +10978,10 @@ dependencies = [
"futures-util",
"hashbrown 0.12.3",
"hashbrown 0.14.0",
- "heck 0.4.1",
"hyper",
"indexmap 1.9.3",
"itertools 0.10.5",
+ "itertools 0.11.0",
"jni",
"lazy_static",
"lexical-core",
@@ -10313,7 +10997,6 @@ dependencies = [
"madsim-tokio",
"md-5",
"mio",
- "multimap",
"nom",
"num-bigint",
"num-integer",
@@ -10321,6 +11004,7 @@ dependencies = [
"num-traits",
"opentelemetry_api",
"opentelemetry_sdk",
+ "ordered-float 3.9.1",
"parking_lot 0.12.1",
"parking_lot_core 0.9.8",
"petgraph",
@@ -10329,31 +11013,40 @@ dependencies = [
"postgres-types",
"proc-macro2",
"prometheus",
- "prost",
+ "prost 0.11.9",
+ "prost 0.12.1",
+ "prost-types 0.12.1",
"rand",
"rand_chacha",
"rand_core",
+ "redis",
"regex",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.1",
+ "regex-syntax 0.8.0",
"reqwest",
"ring",
"rust_decimal",
+ "rustls 0.21.7",
"scopeguard",
+ "sea-orm",
+ "sea-query",
+ "sea-query-binder",
"serde",
"serde_json",
- "serde_with 3.3.0",
+ "serde_with 3.4.0",
"sha1",
"sha2",
"signature",
"smallvec",
+ "sqlx",
"sqlx-core",
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
+ "strum 0.25.0",
"subtle",
"syn 1.0.109",
- "syn 2.0.33",
+ "syn 2.0.37",
"time",
"time-macros",
"tinyvec",
@@ -10362,8 +11055,9 @@ dependencies = [
"tokio-stream",
"tokio-util",
"toml_datetime",
- "toml_edit",
- "tonic",
+ "toml_edit 0.19.15",
+ "tonic 0.10.2",
+ "tonic 0.9.2",
"tower",
"tracing",
"tracing-core",
@@ -10392,9 +11086,9 @@ checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
[[package]]
name = "xorf"
-version = "0.8.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57901b00e3f8e14f4d20b8955bf8087ecb545cfe2ed8741c2a2dbc89847a1a29"
+checksum = "7d36478bcf71152a2f9f6cf9bc48273333f32780c769ef90e13d464ab778db5f"
dependencies = [
"libm",
"rand",
@@ -10448,7 +11142,7 @@ checksum = "56097d5b91d711293a42be9289403896b68654625021732067eac7a4ca388a1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.33",
+ "syn 2.0.37",
]
[[package]]
@@ -10463,7 +11157,16 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
dependencies = [
- "zstd-safe",
+ "zstd-safe 6.0.6",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
+dependencies = [
+ "zstd-safe 7.0.0",
]
[[package]]
@@ -10476,6 +11179,15 @@ dependencies = [
"zstd-sys",
]
+[[package]]
+name = "zstd-safe"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
+dependencies = [
+ "zstd-sys",
+]
+
[[package]]
name = "zstd-sys"
version = "2.0.8+zstd.1.5.5"
diff --git a/Cargo.toml b/Cargo.toml
index fe6a516e2dada..ef09221b818a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,16 +7,21 @@ members = [
"src/cmd_all",
"src/common",
"src/common/common_service",
+ "src/common/heap_profiling",
"src/compute",
"src/connector",
"src/ctl",
- "src/expr",
+ "src/expr/core",
+ "src/expr/impl",
"src/expr/macro",
"src/frontend",
"src/frontend/planner_test",
"src/java_binding",
"src/jni_core",
"src/meta",
+ "src/meta/node",
+ "src/meta/service",
+ "src/meta/src/model_v2/migration",
"src/object_store",
"src/prost",
"src/prost/helpers",
@@ -91,10 +96,10 @@ aws-smithy-http = "0.55"
aws-smithy-types = "0.55"
aws-endpoint = "0.55"
aws-types = "0.55"
-etcd-client = { package = "madsim-etcd-client", version = "0.3" }
+etcd-client = { package = "madsim-etcd-client", version = "0.4" }
futures-async-stream = "0.2"
hytra = "0.1"
-rdkafka = { package = "madsim-rdkafka", git = "https://github.com/madsim-rs/madsim.git", rev = "fedb1e3", features = [
+rdkafka = { package = "madsim-rdkafka", version = "0.3.0", features = [
"cmake-build",
] }
hashbrown = { version = "0.14.0", features = [
@@ -103,14 +108,18 @@ hashbrown = { version = "0.14.0", features = [
"nightly",
] }
criterion = { version = "0.5", features = ["async_futures"] }
-tonic = { package = "madsim-tonic", version = "0.3.1" }
-tonic-build = { package = "madsim-tonic-build", version = "0.3.1" }
-icelake = { git = "https://github.com/icelake-io/icelake", rev = "166a36b1a40a64086db09a0e0f2ed6791cec548b" }
-arrow-array = "46"
-arrow-schema = "46"
-arrow-buffer = "46"
-arrow-flight = "46"
-arrow-select = "46"
+tonic = { package = "madsim-tonic", version = "0.4.0" }
+tonic-build = { package = "madsim-tonic-build", version = "0.4.2" }
+prost = { version = "0.12" }
+icelake = { git = "https://github.com/icelake-io/icelake", rev = "16dab0e36ab337e58ee8002d828def2d212fa116" }
+arrow-array = "47"
+arrow-cast = "47"
+arrow-schema = "47"
+arrow-buffer = "47"
+arrow-flight = "47"
+arrow-select = "47"
+arrow-ord = "47"
+tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [
"profiling",
"stats",
@@ -121,16 +130,20 @@ risingwave_batch = { path = "./src/batch" }
risingwave_cmd = { path = "./src/cmd" }
risingwave_common = { path = "./src/common" }
risingwave_common_service = { path = "./src/common/common_service" }
+risingwave_common_heap_profiling = { path = "./src/common/heap_profiling" }
risingwave_compactor = { path = "./src/storage/compactor" }
risingwave_compute = { path = "./src/compute" }
risingwave_ctl = { path = "./src/ctl" }
risingwave_connector = { path = "./src/connector" }
-risingwave_expr = { path = "./src/expr" }
+risingwave_expr = { path = "./src/expr/core" }
+risingwave_expr_impl = { path = "./src/expr/impl" }
risingwave_frontend = { path = "./src/frontend" }
risingwave_hummock_sdk = { path = "./src/storage/hummock_sdk" }
risingwave_hummock_test = { path = "./src/storage/hummock_test" }
risingwave_hummock_trace = { path = "./src/storage/hummock_trace" }
risingwave_meta = { path = "./src/meta" }
+risingwave_meta_service = { path = "./src/meta/service" }
+risingwave_meta_node = { path = "./src/meta/node" }
risingwave_object_store = { path = "./src/object_store" }
risingwave_pb = { path = "./src/prost" }
risingwave_rpc_client = { path = "./src/rpc_client" }
@@ -224,4 +237,4 @@ tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e
tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" }
tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" }
# patch: unlimit 4MB message size for grpc client
-etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "d55550a" }
+etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "4e84d40" }
diff --git a/Makefile.toml b/Makefile.toml
index 3f10deb424465..86e9cea136bb5 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -24,6 +24,7 @@ env_scripts = [
#!@duckscript
# only duckscript can modify env variables in cargo-make
+# duckscript doc: https://github.com/sagiegurari/duckscript/blob/master/docs/sdk.md
set_env ENABLE_TELEMETRY "false"
@@ -70,6 +71,26 @@ else
set_env BUILD_HUMMOCK_TRACE_CMD ""
end
+is_ci = get_env RISINGWAVE_CI
+is_not_ci = not ${is_ci}
+
+if ${is_not_ci}
+ query_log_path = get_env RW_QUERY_LOG_PATH
+ no_query_log_path = not ${query_log_path}
+
+ if ${no_query_log_path}
+ set_env RW_QUERY_LOG_PATH "${PREFIX_LOG}"
+ fi
+
+ rust_log = get_env RUST_LOG
+ no_rust_log = not ${rust_log}
+
+ if ${no_rust_log}
+ set_env RUST_LOG "pgwire_query_log=info"
+ else
+ set_env RUST_LOG "pgwire_query_log=info,${rust_log}"
+ end
+end
''',
]
@@ -385,6 +406,7 @@ condition = { env_set = [
"ENABLE_BUILD_DASHBOARD",
], files_modified = { input = [
"./dashboard/**/*.js",
+ "./dashboard/**/*.ts*",
"./dashboard/package.json",
"./dashboard/next.config.js",
], output = [
@@ -440,6 +462,12 @@ cargo build -p risingwave_cmd_all \
[tasks.clean]
private = true
category = "RiseDev - Build"
+description = "Clean all build targets"
+dependencies = ["clean-rust", "clean-java"]
+
+[tasks.clean-rust]
+private = true
+category = "RiseDev - Build"
description = "Clean Rust targets"
condition = { env_set = ["ENABLE_BUILD_RUST"] }
script = '''
@@ -448,6 +476,25 @@ set -e
cargo clean
'''
+[tasks.clean-java]
+private = true
+category = "RiseDev - Build"
+description = "Clean Rust targets"
+condition = { env_set = ["ENABLE_RW_CONNECTOR", "ENABLE_BUILD_RW_CONNECTOR"] }
+script = '''
+#!/usr/bin/env bash
+set -e
+
+if command -v mvn &> /dev/null; then
+ MAVEN_PATH="$(command -v mvn)"
+else
+ MAVEN_PATH="${PREFIX_BIN}/maven/bin/mvn"
+fi
+
+cd "${JAVA_DIR}"
+"${MAVEN_PATH}" clean
+'''
+
[tasks.build-docs]
private = true
category = "RiseDev - Build"
@@ -855,7 +902,7 @@ TARGET_PATH="${JAVA_DIR}/connector-node/assembly/target/${ARTIFACT}"
echo "Building connector node..."
cd "${JAVA_DIR}"
-"${MAVEN_PATH}" --batch-mode --update-snapshots package -Dmaven.test.skip
+"${MAVEN_PATH}" --batch-mode --update-snapshots package -Dmaven.test.skip -Dno-build-rust
rm -rf ${PREFIX_BIN}/connector-node
mkdir -p "${PREFIX_BIN}/connector-node"
@@ -1270,7 +1317,6 @@ dependencies = ["k", "l", "check-logs", "wait-processes-exit"]
description = "Kill cluster, dump logs and check logs"
[tasks.wait-processes-exit]
-private = true
category = "Misc"
description = "Wait for RisingWave processes to exit"
script = """
@@ -1292,9 +1338,12 @@ echo "All processes has exited."
[tasks.slt]
category = "RiseDev - SQLLogicTest"
-install_crate = { version = "0.17.0", crate_name = "sqllogictest-bin", binary = "sqllogictest", test_arg = [
+install_crate = { version = "0.17.1", crate_name = "sqllogictest-bin", binary = "sqllogictest", test_arg = [
"--help",
], install_command = "binstall" }
+dependencies = ["check-risedev-env-file"]
+env_files = ["${PREFIX_CONFIG}/risedev-env"]
+env = { SLT_HOST = "${RW_FRONTEND_LISTEN_ADDRESS}", SLT_PORT = "${RW_FRONTEND_PORT}", SLT_DB = "dev" }
command = "sqllogictest"
args = ["${@}"]
description = "🌟 Run SQLLogicTest"
@@ -1397,3 +1446,15 @@ cargo run -p risingwave_common --bin example-config >> src/config/example.toml
category = "RiseDev - Backwards Compatibility Test"
description = "Run backwards compatibility test"
script = "./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.
+[tasks.show-env]
+private = true
+description = "Show cargo-make runtime environment variables"
+script = """
+#!@duckscript
+# https://github.com/sagiegurari/cargo-make/issues/889
+vars = dump_variables
+echo ${vars}
+"""
diff --git a/README.md b/README.md
index d63369b0200a6..c1878a2717159 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
-[![Slack](https://badgen.net/badge/Slack/Join%20RisingWave/0abd59?icon=slack)](https://join.slack.com/t/risingwave-community/shared_invite/zt-120rft0mr-d8uGk3d~NZiZAQWPnElOfw)
+[![Slack](https://badgen.net/badge/Slack/Join%20RisingWave/0abd59?icon=slack)](https://risingwave.com/slack)
[![Build status](https://badge.buildkite.com/9394d2bca0f87e2e97aa78b25f765c92d4207c0b65e7f6648f.svg)](https://buildkite.com/risingwavelabs/main)
[![codecov](https://codecov.io/gh/risingwavelabs/risingwave/branch/main/graph/badge.svg?token=EB44K9K38B)](https://codecov.io/gh/risingwavelabs/risingwave)
@@ -45,7 +45,7 @@ To learn about how to use RisingWave, refer to [RisingWave User Documentation](h
## Community
-Looking for help, discussions, collaboration opportunities, or a casual afternoon chat with our fellow engineers and community members? Join our [Slack workspace](https://join.slack.com/t/risingwave-community/shared_invite/zt-120rft0mr-d8uGk3d~NZiZAQWPnElOfw)!
+Looking for help, discussions, collaboration opportunities, or a casual afternoon chat with our fellow engineers and community members? Join our [Slack workspace](https://risingwave.com/slack)!
## License
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index ddef3984d3bd4..6fe7cfbfdeca2 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -87,6 +87,7 @@ services:
- db
- elasticsearch
- clickhouse-server
+ - pulsar
volumes:
- ..:/risingwave
@@ -182,3 +183,19 @@ services:
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_INTERNAL:PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9093,PLAINTEXT_INTERNAL://localhost:29093
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+
+ pulsar:
+ container_name: pulsar
+ image: apachepulsar/pulsar:latest
+ command: bin/pulsar standalone
+ ports:
+ - "6650:6650"
+ - "6651:8080"
+ expose:
+ - "8080"
+ - "6650"
+ healthcheck:
+ test: [ "CMD-SHELL", "bin/pulsar-admin brokers healthcheck"]
+ interval: 5s
+ timeout: 5s
+ retries: 5
diff --git a/ci/scripts/backfill-test.sh b/ci/scripts/backfill-test.sh
index 039e8bee94865..c0b95da958fed 100755
--- a/ci/scripts/backfill-test.sh
+++ b/ci/scripts/backfill-test.sh
@@ -30,13 +30,6 @@ git config --global --add safe.directory /risingwave
download_and_prepare_rw "$profile" common
-echo "--- e2e, ci-backfill, build"
-cargo make ci-start ci-backfill
-
################ TESTS
-echo "--- e2e, ci-backfill, run backfill test"
./ci/scripts/run-backfill-tests.sh
-
-echo "--- Kill cluster"
-cargo make kill
diff --git a/ci/scripts/check.sh b/ci/scripts/check.sh
index fe0b79dcf30ef..2d194c40e2e99 100755
--- a/ci/scripts/check.sh
+++ b/ci/scripts/check.sh
@@ -42,7 +42,7 @@ sccache --show-stats
sccache --zero-stats
echo "--- Run doctest"
-cargo test --doc
+RUSTDOCFLAGS="-Clink-arg=-fuse-ld=lld" cargo test --doc
echo "--- Show sccache stats"
sccache --show-stats
diff --git a/ci/scripts/cron-fuzz-test.sh b/ci/scripts/cron-fuzz-test.sh
index f12e3063a5a3b..c58f074decdf1 100755
--- a/ci/scripts/cron-fuzz-test.sh
+++ b/ci/scripts/cron-fuzz-test.sh
@@ -4,8 +4,13 @@
set -euo pipefail
source ci/scripts/common.sh
-export RUN_SQLSMITH=0
-export RUN_SQLSMITH_FRONTEND=1
+
+# NOTE(kwannoel): Disabled because there's some breakage after #12485,
+# see https://github.com/risingwavelabs/risingwave/issues/12577.
+# Frontend is relatively stable, e2e fuzz test will cover the same cases also,
+# so we can just disable it.
+export RUN_SQLSMITH_FRONTEND=0
+export RUN_SQLSMITH=1
export SQLSMITH_COUNT=1000
export TEST_NUM=100
source ci/scripts/run-fuzz-test.sh
diff --git a/ci/scripts/deterministic-recovery-test.sh b/ci/scripts/deterministic-recovery-test.sh
index 0d3a7b3fabed4..6514fe1f7c0c3 100755
--- a/ci/scripts/deterministic-recovery-test.sh
+++ b/ci/scripts/deterministic-recovery-test.sh
@@ -9,11 +9,19 @@ echo "--- Download artifacts"
download-and-decompress-artifact risingwave_simulation .
chmod +x ./risingwave_simulation
-export RUST_LOG="info,risingwave_meta::barrier::recovery=debug"
+export RUST_LOG="info,\
+risingwave_meta::barrier::recovery=debug,\
+risingwave_meta::rpc::ddl_controller=debug,\
+risingwave_meta::barrier::mod=debug,\
+risingwave_simulation=debug"
export LOGDIR=.risingwave/log
mkdir -p $LOGDIR
+# FIXME(kwannoel): Why is this failing?
+# echo "--- deterministic simulation e2e, ci-3cn-2fe-3meta, recovery, background_ddl"
+# seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kill --kill-rate=${KILL_RATE} ./e2e_test/background_ddl/sim/basic.slt 2> $LOGDIR/recovery-ddl-{}.log && rm $LOGDIR/recovery-ddl-{}.log'
+
echo "--- deterministic simulation e2e, ci-3cn-2fe-3meta, recovery, ddl"
seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kill --kill-rate=${KILL_RATE} ./e2e_test/ddl/\*\*/\*.slt 2> $LOGDIR/recovery-ddl-{}.log && rm $LOGDIR/recovery-ddl-{}.log'
diff --git a/ci/scripts/e2e-iceberg-sink-test.sh b/ci/scripts/e2e-iceberg-sink-test.sh
index 41f1ee2a80f26..1a12225ab5435 100755
--- a/ci/scripts/e2e-iceberg-sink-test.sh
+++ b/ci/scripts/e2e-iceberg-sink-test.sh
@@ -5,6 +5,9 @@ set -euo pipefail
source ci/scripts/common.sh
+# prepare environment
+export CONNECTOR_LIBS_PATH="./connector-node/libs"
+
while getopts 'p:' opt; do
case ${opt} in
p )
diff --git a/ci/scripts/e2e-iceberg-sink-v2-test.sh b/ci/scripts/e2e-iceberg-sink-v2-test.sh
index 83c0d187d6b3b..0e8054a4946af 100755
--- a/ci/scripts/e2e-iceberg-sink-v2-test.sh
+++ b/ci/scripts/e2e-iceberg-sink-v2-test.sh
@@ -38,7 +38,10 @@ bash ./start_spark_connect_server.sh
# Don't remove the `--quiet` option since poetry has a bug when printing output, see
# https://github.com/python-poetry/poetry/issues/3412
"$HOME"/.local/bin/poetry update --quiet
-"$HOME"/.local/bin/poetry run python main.py
+"$HOME"/.local/bin/poetry run python main.py -t ./test_case/no_partition_append_only.toml
+"$HOME"/.local/bin/poetry run python main.py -t ./test_case/no_partition_upsert.toml
+"$HOME"/.local/bin/poetry run python main.py -t ./test_case/partition_append_only.toml
+"$HOME"/.local/bin/poetry run python main.py -t ./test_case/partition_upsert.toml
echo "--- Kill cluster"
diff --git a/ci/scripts/e2e-kafka-sink-test.sh b/ci/scripts/e2e-kafka-sink-test.sh
index 85aad20749d61..06ef185f46e8b 100755
--- a/ci/scripts/e2e-kafka-sink-test.sh
+++ b/ci/scripts/e2e-kafka-sink-test.sh
@@ -5,6 +5,7 @@ set -euo pipefail
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-append-only --create > /dev/null 2>&1
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert --create > /dev/null 2>&1
+./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert-schema --create > /dev/null 2>&1
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-debezium --create > /dev/null 2>&1
sqllogictest -p 4566 -d dev 'e2e_test/sink/kafka/create_sink.slt'
@@ -28,6 +29,15 @@ if [ $? -ne 0 ]; then
exit 1
fi
+# test upsert kafka sink with schema
+echo "testing upsert kafka sink with schema"
+diff ./e2e_test/sink/kafka/upsert_schema1.result \
+<((./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert-schema --from-beginning --property print.key=true --max-messages 10 | sort) 2> /dev/null)
+if [ $? -ne 0 ]; then
+ echo "The output for upsert sink with schema is not as expected."
+ exit 1
+fi
+
# test debezium kafka sink
echo "testing debezium kafka sink"
(./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-debezium --property print.key=true --from-beginning --max-messages 10 | sort) > ./e2e_test/sink/kafka/debezium1.tmp.result 2> /dev/null
@@ -62,6 +72,15 @@ if [ $? -ne 0 ]; then
exit 1
fi
+# test upsert kafka sink with schema after update
+echo "testing upsert kafka sink with schema after updating data"
+diff ./e2e_test/sink/kafka/upsert_schema2.result \
+<((./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert-schema --from-beginning --property print.key=true --max-messages 11 | sort) 2> /dev/null)
+if [ $? -ne 0 ]; then
+ echo "The output for upsert sink with schema is not as expected."
+ exit 1
+fi
+
# test debezium kafka sink after update
echo "testing debezium kafka sink after updating data"
(./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-debezium --property print.key=true --from-beginning --max-messages 11 | sort) > ./e2e_test/sink/kafka/debezium2.tmp.result 2> /dev/null
@@ -87,6 +106,15 @@ if [ $? -ne 0 ]; then
exit 1
fi
+# test upsert kafka sink with schema after delete
+echo "testing upsert kafka sink with schema after deleting data"
+diff ./e2e_test/sink/kafka/upsert_schema3.result \
+<((./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert-schema --from-beginning --property print.key=true --max-messages 12 | sort) 2> /dev/null)
+if [ $? -ne 0 ]; then
+ echo "The output for upsert sink with schema is not as expected."
+ exit 1
+fi
+
# test debezium kafka sink after delete
echo "testing debezium kafka sink after deleting data"
(./.risingwave/bin/kafka/bin/kafka-console-consumer.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-debezium --property print.key=true --from-beginning --max-messages 13 | sort) > ./e2e_test/sink/kafka/debezium3.tmp.result 2> /dev/null
@@ -103,3 +131,10 @@ sqllogictest -p 4566 -d dev 'e2e_test/sink/kafka/drop_sink.slt'
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-append-only --delete > /dev/null 2>&1
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-upsert --delete > /dev/null 2>&1
./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-debezium --delete > /dev/null 2>&1
+
+# test different encoding
+echo "testing protobuf"
+cp src/connector/src/test_data/proto_recursive/recursive.pb ./proto-recursive
+./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-append-only-protobuf --create > /dev/null 2>&1
+sqllogictest -p 4566 -d dev 'e2e_test/sink/kafka/protobuf.slt'
+./.risingwave/bin/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:29092 --topic test-rw-sink-append-only-protobuf --delete > /dev/null 2>&1
diff --git a/ci/scripts/e2e-pulsar-sink-test.sh b/ci/scripts/e2e-pulsar-sink-test.sh
new file mode 100755
index 0000000000000..a2a0edb550f33
--- /dev/null
+++ b/ci/scripts/e2e-pulsar-sink-test.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+source ci/scripts/common.sh
+
+while getopts 'p:' opt; do
+ case ${opt} in
+ p )
+ profile=$OPTARG
+ ;;
+ \? )
+ echo "Invalid Option: -$OPTARG" 1>&2
+ exit 1
+ ;;
+ : )
+ echo "Invalid option: $OPTARG requires an argument" 1>&2
+ ;;
+ esac
+done
+shift $((OPTIND -1))
+
+download_and_prepare_rw "$profile" source
+
+echo "--- starting risingwave cluster"
+cargo make ci-start ci-pulsar-test
+sleep 1
+
+echo "--- waiting until pulsar is healthy"
+HTTP_CODE=404
+MAX_RETRY=20
+while [[ $HTTP_CODE -ne 200 && MAX_RETRY -gt 0 ]]
+do
+ HTTP_CODE=$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' http://pulsar:8080/admin/v2/clusters)
+ ((MAX_RETRY--))
+ sleep 5
+done
+
+# Exits as soon as any line fails.
+set -euo pipefail
+
+echo "--- testing pulsar sink"
+sqllogictest -p 4566 -d dev './e2e_test/sink/pulsar_sink.slt'
+
+sleep 1
+
+echo "--- Kill cluster"
+cargo make ci-kill
\ No newline at end of file
diff --git a/ci/scripts/pr-fuzz-test.sh b/ci/scripts/pr-fuzz-test.sh
index bbf8471864e9e..66923c4fb8a71 100755
--- a/ci/scripts/pr-fuzz-test.sh
+++ b/ci/scripts/pr-fuzz-test.sh
@@ -5,35 +5,15 @@ set -euo pipefail
source ci/scripts/common.sh
-set +e
-# Set features, depending on our workflow
-# If sqlsmith files are modified, we run tests with sqlsmith enabled.
-MATCHES="ci/scripts/cron-fuzz-test.sh\
-\|ci/scripts/pr-fuzz-test.sh\
-\|ci/scripts/run-fuzz-test.sh\
-\|src/tests/sqlsmith"
-NOT_MATCHES="\.md"
-CHANGED=$(git diff --name-only origin/main | grep -v "$NOT_MATCHES" | grep "$MATCHES")
-set -e
-# Always run sqlsmith frontend tests
-export RUN_SQLSMITH_FRONTEND=1
+# NOTE(kwannoel): Disabled because there's some breakage after #12485,
+# see https://github.com/risingwavelabs/risingwave/issues/12577.
+# Frontend is relatively stable, e2e fuzz test will cover the same cases also,
+# so we can just disable it.
+export RUN_SQLSMITH_FRONTEND=0
export RUN_SQLSMITH=1
export SQLSMITH_COUNT=100
-
-# Run e2e tests if changes to sqlsmith source files detected.
-# NOTE(kwannoel): Keep this here in-case we ever want to revert.
-#if [[ -n "$CHANGED" ]]; then
-# echo "--- Checking whether to run all sqlsmith tests"
-# echo "origin/main SHA: $(git rev-parse origin/main)"
-# echo "Changes to Sqlsmith source files detected:"
-# echo "$CHANGED"
-# export RUN_SQLSMITH=1
-# export SQLSMITH_COUNT=100
-# export TEST_NUM=32
-# echo "Enabled Sqlsmith tests."
-#else
-# export RUN_SQLSMITH=0
-#fi
+export TEST_NUM=32
+echo "Enabled Sqlsmith tests."
source ci/scripts/run-fuzz-test.sh
diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh
index 9852d48e0ba50..08e5794f173cd 100755
--- a/ci/scripts/release.sh
+++ b/ci/scripts/release.sh
@@ -11,7 +11,7 @@ if [ "${BUILDKITE_SOURCE}" != "schedule" ] && [ "${BUILDKITE_SOURCE}" != "webhoo
fi
echo "--- Install java and maven"
-yum install -y java-11-openjdk wget python3 cyrus-sasl-devel
+yum install -y java-11-openjdk java-11-openjdk-devel wget python3 cyrus-sasl-devel
pip3 install toml-cli
wget https://ci-deps-dist.s3.amazonaws.com/apache-maven-3.9.3-bin.tar.gz && tar -zxvf apache-maven-3.9.3-bin.tar.gz
export PATH="${REPO_ROOT}/apache-maven-3.9.3/bin:$PATH"
@@ -64,6 +64,10 @@ elif [[ -n "${BINARY_NAME+x}" ]]; then
aws s3 cp risingwave-${BINARY_NAME}-x86_64-unknown-linux.tar.gz s3://risingwave-nightly-pre-built-binary
fi
+echo "--- Build connector node"
+cd ${REPO_ROOT}/java && mvn -B package -Dmaven.test.skip=true -Dno-build-rust
+cd ${REPO_ROOT} && mv ${REPO_ROOT}/java/connector-node/assembly/target/risingwave-connector-1.0.0.tar.gz risingwave-connector-"${BUILDKITE_TAG}".tar.gz
+
if [[ -n "${BUILDKITE_TAG}" ]]; then
echo "--- Install gh cli"
yum install -y dnf
@@ -87,8 +91,6 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then
gh release upload "${BUILDKITE_TAG}" risectl-"${BUILDKITE_TAG}"-x86_64-unknown-linux.tar.gz
echo "--- Release build and upload risingwave connector node jar asset"
- cd ${REPO_ROOT}/java && mvn -B package -Dmaven.test.skip=true -Djava.binding.release=true
- cd connector-node/assembly/target && mv risingwave-connector-1.0.0.tar.gz risingwave-connector-"${BUILDKITE_TAG}".tar.gz
gh release upload "${BUILDKITE_TAG}" risingwave-connector-"${BUILDKITE_TAG}".tar.gz
fi
diff --git a/ci/scripts/run-backfill-tests.sh b/ci/scripts/run-backfill-tests.sh
index 6c02442a06255..d0d5eafb3c917 100755
--- a/ci/scripts/run-backfill-tests.sh
+++ b/ci/scripts/run-backfill-tests.sh
@@ -1,23 +1,31 @@
#!/usr/bin/env bash
# Runs backfill tests.
-# NOTE(kwannoel):
-# The following scenario is adapted in madsim's integration tests as well.
-# But this script reproduces it more reliably (I'm not sure why.)
-# Hence keeping it in case we ever need to debug backfill again.
# USAGE:
-# Start a rw cluster then run this script.
# ```sh
-# ./risedev d
+# cargo make ci-start ci-backfill
# ./ci/scripts/run-backfill-tests.sh
# ```
+# Example progress:
+# dev=> select * from rw_catalog.rw_ddl_progress;
+# ddl_id | ddl_statement | progress | initialized_at
+#--------+------------------------------------------------+----------+-------------------------------
+# 1002 | CREATE MATERIALIZED VIEW m1 AS SELECT * FROM t | 56.12% | 2023-09-27 06:37:06.636+00:00
+#(1 row)
set -euo pipefail
PARENT_PATH=$(dirname "${BASH_SOURCE[0]}")
+TEST_DIR=$PWD/e2e_test
+BACKGROUND_DDL_DIR=$TEST_DIR/background_ddl
+COMMON_DIR=$BACKGROUND_DDL_DIR/common
+
+CLUSTER_PROFILE='ci-1cn-1fe-with-recovery'
+export RUST_LOG="risingwave_meta=debug"
+
run_sql_file() {
psql -h localhost -p 4566 -d dev -U root -f "$@"
}
@@ -30,15 +38,405 @@ flush() {
run_sql "FLUSH;"
}
-run_sql_file "$PARENT_PATH"/sql/backfill/create_base_table.sql
+cancel_stream_jobs() {
+ ID=$(run_sql "select ddl_id from rw_catalog.rw_ddl_progress;" | tail -3 | head -1 | grep -E -o "[0-9]*")
+ echo "CANCELLING STREAM_JOB: $ID"
+ run_sql "CANCEL JOBS $ID;" .risingwave/log/compute-node.log 2>&1 &
+}
+
+# Test snapshot and upstream read.
+test_snapshot_and_upstream_read() {
+ echo "--- e2e, ci-backfill, test_snapshot_and_upstream_read"
+ cargo make ci-start ci-backfill
+
+ run_sql_file "$PARENT_PATH"/sql/backfill/create_base_table.sql
+
+ # Provide snapshot
+ run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql
+
+ # Provide updates ...
+ run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql &
+
+ # ... and concurrently create mv.
+ run_sql_file "$PARENT_PATH"/sql/backfill/create_mv.sql &
+
+ wait
+
+ run_sql_file "$PARENT_PATH"/sql/backfill/select.sql deletes.log 2>&1 &
+
+ ./risedev psql -c "CREATE MATERIALIZED VIEW m1 as select * from tomb;"
+ echo "--- Kill cluster"
+ kill_cluster
+ wait
+}
+
+test_backfill_restart_cn_recovery() {
+ echo "--- e2e, $CLUSTER_PROFILE, test_background_restart_cn_recovery"
+ cargo make ci-start $CLUSTER_PROFILE
+
+ # Test before recovery
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/create_table.slt"
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/create_bg_mv.slt"
+ sleep 1
+ OLD_PROGRESS=$(run_sql "SHOW JOBS;" | grep -E -o "[0-9]{1,2}\.[0-9]{1,2}")
+
+ # Restart 1 CN
+ restart_cn
+
+ # Give some time to recover.
+ sleep 3
+
+ # Test after recovery
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/validate_one_job.slt"
+
+ # Recover the mview progress
+ sleep 5
+
+ NEW_PROGRESS=$(run_sql "SHOW JOBS;" | grep -E -o "[0-9]{1,2}\.[0-9]{1,2}")
+
+ if [[ ${OLD_PROGRESS%.*} -le ${NEW_PROGRESS%.*} ]]; then
+ echo "OK: $OLD_PROGRESS smaller or equal to $NEW_PROGRESS"
+ else
+ echo "FAILED: $OLD_PROGRESS larger than $NEW_PROGRESS"
+ exit 1
+ fi
+
+ # Trigger a bootstrap recovery
+ pkill compute-node
+ kill_cluster
+ rename_logs_with_prefix "before-restart"
+ sleep 10
+ cargo make dev $CLUSTER_PROFILE
+
+ # Recover mview progress
+ sleep 5
+
+ OLD_PROGRESS=$NEW_PROGRESS
+ NEW_PROGRESS=$(run_sql "SHOW JOBS;" | grep -E -o "[0-9]{1,2}\.[0-9]{1,2}")
+
+ if [[ ${OLD_PROGRESS%.*} -le ${NEW_PROGRESS%.*} ]]; then
+ echo "OK: $OLD_PROGRESS smaller or equal to $NEW_PROGRESS"
+ else
+ echo "FAILED: $OLD_PROGRESS larger than $NEW_PROGRESS"
+ exit 1
+ fi
+
+ sleep 60
+
+ # Test after backfill finished
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/validate_backfilled_mv.slt"
+
+ # After cluster restart(s), backfilled mv should still be present.
+ restart_cluster
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/validate_backfilled_mv.slt"
+ restart_cluster
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/validate_backfilled_mv.slt"
+
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/drop_mv.slt"
+ sqllogictest -d dev -h localhost -p 4566 "$COMMON_DIR/drop_table.slt"
+
+ kill_cluster
+}
+
+main() {
+ set -euo pipefail
+ test_snapshot_and_upstream_read
+ test_backfill_tombstone
+ test_background_ddl_recovery
+ test_background_ddl_cancel
+ test_foreground_ddl_no_recover
+ test_foreground_ddl_cancel
+ test_foreground_index_cancel
+ test_foreground_sink_cancel
+ test_backfill_restart_cn_recovery
+}
-echo "Backfill tests complete"
+main
diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh
index e88704ca7a22f..8fb29ec5bd1a2 100755
--- a/ci/scripts/run-e2e-test.sh
+++ b/ci/scripts/run-e2e-test.sh
@@ -28,18 +28,25 @@ fi
cluster_start() {
if [[ $mode == "standalone" ]]; then
+ mkdir -p "$PREFIX_LOG"
+ cargo make clean-data
+ cargo make pre-start-dev
start_standalone "$PREFIX_LOG"/standalone.log &
- cargo make ci-start standalone-minio-etcd-compactor
+ cargo make dev standalone-minio-etcd
else
cargo make ci-start "$mode"
fi
}
cluster_stop() {
- if [[ $mode == "standalone" ]]; then
+ if [[ $mode == "standalone" ]]
+ then
stop_standalone
+ # Don't check standalone logs, they will exceed the limit.
+ cargo make kill
+ else
+ cargo make ci-kill
fi
- cargo make ci-kill
}
download_and_prepare_rw "$profile" common
@@ -65,11 +72,7 @@ echo "--- e2e, $mode, batch"
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
cluster_start
sqllogictest -p 4566 -d dev './e2e_test/ddl/**/*.slt' --junit "batch-ddl-${profile}"
-if [[ $mode != "standalone" ]]; then
- sqllogictest -p 4566 -d dev './e2e_test/background_ddl/**/*.slt' --junit "batch-ddl-${profile}"
-else
- echo "Skipping background_ddl test for $mode"
-fi
+sqllogictest -p 4566 -d dev './e2e_test/background_ddl/basic.slt' --junit "batch-ddl-${profile}"
sqllogictest -p 4566 -d dev './e2e_test/visibility_mode/*.slt' --junit "batch-${profile}"
sqllogictest -p 4566 -d dev './e2e_test/database/prepare.slt'
sqllogictest -p 4566 -d test './e2e_test/database/test.slt'
@@ -184,6 +187,13 @@ if [[ "$mode" == "standalone" ]]; then
run_sql() {
psql -h localhost -p 4566 -d dev -U root -c "$@"
}
+ compactor_is_online() {
+ set +e
+ grep -q "risingwave_cmd_all::standalone: starting compactor-node thread" "${PREFIX_LOG}/standalone.log"
+ local EXIT_CODE=$?
+ set -e
+ return $EXIT_CODE
+ }
echo "--- e2e, standalone, cluster-persistence-test"
cluster_start
@@ -214,6 +224,43 @@ if [[ "$mode" == "standalone" ]]; then
echo "--- Kill cluster"
cluster_stop
+ wait
+
+ # Test that we can optionally include nodes in standalone mode.
+ echo "--- e2e, standalone, cluster-opts-test"
+
+ echo "test standalone without compactor"
+ mkdir -p "$PREFIX_LOG"
+ cargo make clean-data
+ cargo make pre-start-dev
+ start_standalone_without_compactor "$PREFIX_LOG"/standalone.log &
+ cargo make dev standalone-minio-etcd-compactor
+ wait_standalone
+ if compactor_is_online
+ then
+ echo "ERROR: Compactor should not be online."
+ exit 1
+ fi
+ cluster_stop
+ echo "test standalone without compactor [TEST PASSED]"
+
+ wait
+
+ echo "test standalone with compactor"
+ mkdir -p "$PREFIX_LOG"
+ cargo make clean-data
+ cargo make pre-start-dev
+ start_standalone "$PREFIX_LOG"/standalone.log &
+ cargo make dev standalone-minio-etcd
+ wait_standalone
+ if ! compactor_is_online
+ then
+ echo "ERROR: Compactor should be online."
+ exit 1
+ fi
+ cluster_stop
+ echo "test standalone with compactor [TEST PASSED]"
+
# Make sure any remaining background task exits.
wait
fi
diff --git a/ci/scripts/run-micro-benchmarks.sh b/ci/scripts/run-micro-benchmarks.sh
index 13648d1661ab2..568c90de425ca 100755
--- a/ci/scripts/run-micro-benchmarks.sh
+++ b/ci/scripts/run-micro-benchmarks.sh
@@ -10,6 +10,12 @@ set -euo pipefail
# Make sure the added benchmark has a unique name.
BENCHMARKS="stream_hash_agg json_parser bench_block_iter bench_compactor bench_lru_cache bench_merge_iter"
+# Reference: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html
+get_instance_type() {
+ TOKEN=`curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"` \
+ && curl -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/instance-type
+}
+
# cargo criterion --bench stream_hash_agg --message-format=json
bench() {
BENCHMARK_NAME=$1
@@ -34,6 +40,17 @@ bench() {
}
main() {
+ # FIXME(kwannoel): This is a workaround
+ # Microbenchmarks need to be namespaced by instance types,
+ # the result upload endpoint needs to be parameterized by instance type as well to support this.
+ echo "--- Getting aws instance type"
+ local instance_type=$(get_instance_type)
+ echo "instance_type: $instance_type"
+ if [[ $instance_type != "m6i.4xlarge" ]]; then
+ echo "Only m6i.4xlarge is supported, skipping microbenchmark"
+ exit 0
+ fi
+
# We need cargo criterion to generate machine-readable benchmark results from
# microbench.
echo "--- Installing cargo criterion"
diff --git a/ci/scripts/s3-source-test.sh b/ci/scripts/s3-source-test.sh
index 710ba63b6fd60..9fce76f000e31 100755
--- a/ci/scripts/s3-source-test.sh
+++ b/ci/scripts/s3-source-test.sh
@@ -30,7 +30,7 @@ cargo make ci-start ci-1cn-1fe
echo "--- Run test"
python3 -m pip install minio psycopg2-binary
-python3 e2e_test/s3/$script.py
+python3 e2e_test/s3/$script
echo "--- Kill cluster"
cargo make ci-kill
diff --git a/ci/scripts/sql/backfill/insert.sql b/ci/scripts/sql/backfill/insert.sql
index 18ed763429231..f25f8b09cb2b8 100644
--- a/ci/scripts/sql/backfill/insert.sql
+++ b/ci/scripts/sql/backfill/insert.sql
@@ -2,5 +2,5 @@ insert into t1
SELECT
generate_series,
'{"orders": {"id": 1, "price": "2.30", "customer_id": 2}}'::jsonb
-FROM generate_series(1, 200000);
+FROM generate_series(1, 50000);
FLUSH;
\ No newline at end of file
diff --git a/ci/scripts/standalone-utils.sh b/ci/scripts/standalone-utils.sh
index 4461331c28bfb..438f413ebe4dc 100755
--- a/ci/scripts/standalone-utils.sh
+++ b/ci/scripts/standalone-utils.sh
@@ -6,7 +6,9 @@ export RW_PREFIX=$PWD/.risingwave
export PREFIX_BIN=$RW_PREFIX/bin
export PREFIX_LOG=$RW_PREFIX/log
-start_standalone() {
+# NOTE(kwannoel): Compared to start_standalone below, we omitted the compactor-opts,
+# so it should not start.
+start_standalone_without_compactor() {
RUST_BACKTRACE=1 \
"$PREFIX_BIN"/risingwave/standalone \
--meta-opts=" \
@@ -24,7 +26,6 @@ start_standalone() {
--listen-addr 127.0.0.1:5688 \
--prometheus-listener-addr 127.0.0.1:1222 \
--advertise-addr 127.0.0.1:5688 \
- --metrics-level info \
--async-stack-trace verbose \
--connector-rpc-endpoint 127.0.0.1:50051 \
--parallelism 4 \
@@ -36,10 +37,49 @@ start_standalone() {
--advertise-addr 127.0.0.1:4566 \
--prometheus-listener-addr 127.0.0.1:2222 \
--health-check-listener-addr 127.0.0.1:6786 \
- --metrics-level info \
--meta-addr http://127.0.0.1:5690" >"$1" 2>&1
}
+# You can fill up this section by consulting
+# .risingwave/log/risedev.log, after calling ./risedev d full.
+# It is expected that minio, etcd will be started after this is called.
+start_standalone() {
+ RUST_BACKTRACE=1 \
+ "$PREFIX_BIN"/risingwave/standalone \
+ --meta-opts=" \
+ --listen-addr 127.0.0.1:5690 \
+ --advertise-addr 127.0.0.1:5690 \
+ --dashboard-host 127.0.0.1:5691 \
+ --prometheus-host 127.0.0.1:1250 \
+ --connector-rpc-endpoint 127.0.0.1:50051 \
+ --backend etcd \
+ --etcd-endpoints 127.0.0.1:2388 \
+ --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 \
+ --data-directory hummock_001 \
+ --dashboard-ui-path $RW_PREFIX/ui" \
+ --compute-opts=" \
+ --listen-addr 127.0.0.1:5688 \
+ --prometheus-listener-addr 127.0.0.1:1222 \
+ --advertise-addr 127.0.0.1:5688 \
+ --async-stack-trace verbose \
+ --connector-rpc-endpoint 127.0.0.1:50051 \
+ --parallelism 4 \
+ --total-memory-bytes 8589934592 \
+ --role both \
+ --meta-address http://127.0.0.1:5690" \
+ --frontend-opts=" \
+ --listen-addr 127.0.0.1:4566 \
+ --advertise-addr 127.0.0.1:4566 \
+ --prometheus-listener-addr 127.0.0.1:2222 \
+ --health-check-listener-addr 127.0.0.1:6786 \
+ --meta-addr http://127.0.0.1:5690" \
+ --compactor-opts=" \
+ --listen-addr 127.0.0.1:6660 \
+ --prometheus-listener-addr 127.0.0.1:1260 \
+ --advertise-addr 127.0.0.1:6660 \
+ --meta-address http://127.0.0.1:5690" >"$1" 2>&1
+}
+
stop_standalone() {
pkill standalone
}
diff --git a/ci/workflows/integration-tests.yml b/ci/workflows/integration-tests.yml
index 6c4851c0c669c..4bd0ec1a000b1 100644
--- a/ci/workflows/integration-tests.yml
+++ b/ci/workflows/integration-tests.yml
@@ -29,7 +29,7 @@ steps:
- "postgres-cdc"
- "mysql-sink"
- "postgres-sink"
- - "iceberg-sink"
+ # - "iceberg-sink"
- "debezium-mysql"
format:
- "json"
@@ -75,10 +75,10 @@ steps:
testcase: "postgres-sink"
format: "protobuf"
skip: true
- - with:
- testcase: "iceberg-sink"
- format: "protobuf"
- skip: true
+ # - with:
+ # testcase: "iceberg-sink"
+ # format: "protobuf"
+ # skip: true
- with:
testcase: "debezium-mysql"
format: "protobuf"
diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml
index 20a47373e0f1e..d8e78952c141f 100644
--- a/ci/workflows/main-cron.yml
+++ b/ci/workflows/main-cron.yml
@@ -99,7 +99,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 10
+ timeout_in_minutes: 12
retry: *auto-retry
- label: "end-to-end source test (release)"
@@ -245,25 +245,6 @@ steps:
timeout_in_minutes: 5
retry: *auto-retry
- - label: "connector node integration test Java {{matrix.java_version}}"
- command: "ci/scripts/connector-node-integration-test.sh -p ci-release -v {{matrix.java_version}}"
- depends_on:
- - "build"
- - "build-other"
- plugins:
- - docker-compose#v4.9.0:
- run: rw-build-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- - ./ci/plugins/upload-failure-logs
- matrix:
- setup:
- java_version:
- - "11"
- - "17"
- timeout_in_minutes: 10
- retry: *auto-retry
-
- label: "end-to-end iceberg sink test (release)"
command: "ci/scripts/e2e-iceberg-sink-test.sh -p ci-release"
depends_on:
@@ -289,7 +270,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 5
+ timeout_in_minutes: 10
retry: *auto-retry
- label: "e2e java-binding test (release)"
@@ -309,7 +290,7 @@ steps:
retry: *auto-retry
- label: "S3 source check on AWS (json parser)"
- command: "ci/scripts/s3-source-test.sh -p ci-release -s run"
+ command: "ci/scripts/s3-source-test.sh -p ci-release -s run.py"
depends_on: build
plugins:
- seek-oss/aws-sm#v2.3.1:
@@ -326,7 +307,7 @@ steps:
retry: *auto-retry
- label: "S3 source check on AWS (json parser)"
- command: "ci/scripts/s3-source-test.sh -p ci-release -s json_file"
+ command: "ci/scripts/s3-source-test.sh -p ci-release -s json_file.py"
depends_on: build
plugins:
- seek-oss/aws-sm#v2.3.1:
@@ -343,7 +324,41 @@ steps:
retry: *auto-retry
- label: "S3 source check on AWS (csv parser)"
- command: "ci/scripts/s3-source-test.sh -p ci-release -s run_csv"
+ command: "ci/scripts/s3-source-test.sh -p ci-release -s run_csv.py"
+ depends_on: build
+ plugins:
+ - seek-oss/aws-sm#v2.3.1:
+ env:
+ S3_SOURCE_TEST_CONF: ci_s3_source_test_aws
+ - docker-compose#v4.9.0:
+ run: rw-build-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ environment:
+ - S3_SOURCE_TEST_CONF
+ - ./ci/plugins/upload-failure-logs
+ timeout_in_minutes: 25
+ retry: *auto-retry
+
+ - label: "S3_v2 source check on AWS (json parser)"
+ command: "ci/scripts/s3-source-test.sh -p ci-release -s 'fs_source_v2.py json'"
+ depends_on: build
+ plugins:
+ - seek-oss/aws-sm#v2.3.1:
+ env:
+ S3_SOURCE_TEST_CONF: ci_s3_source_test_aws
+ - docker-compose#v4.9.0:
+ run: rw-build-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ environment:
+ - S3_SOURCE_TEST_CONF
+ - ./ci/plugins/upload-failure-logs
+ timeout_in_minutes: 25
+ retry: *auto-retry
+
+ - label: "S3_v2 source check on AWS (csv parser)"
+ command: "ci/scripts/s3-source-test.sh -p ci-release -s 'fs_source_v2.py csv_without_header'"
depends_on: build
plugins:
- seek-oss/aws-sm#v2.3.1:
@@ -463,7 +478,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 10
+ timeout_in_minutes: 20
retry: *auto-retry
- label: "e2e standalone binary test"
@@ -478,7 +493,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 21
+ timeout_in_minutes: 25
retry: *auto-retry
- label: "end-to-end test for opendal (parallel)"
@@ -495,46 +510,6 @@ steps:
timeout_in_minutes: 14
retry: *auto-retry
- - label: "end-to-end test (parallel, in-memory)"
- command: "ci/scripts/e2e-test-parallel-in-memory.sh -p ci-release"
- depends_on: "build"
- plugins:
- - docker-compose#v4.9.0:
- run: rw-build-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- - ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 12
- retry: *auto-retry
-
- - label: "end-to-end iceberg sink test"
- command: "ci/scripts/e2e-iceberg-sink-test.sh -p ci-release"
- depends_on:
- - "build"
- - "build-other"
- plugins:
- - docker-compose#v4.9.0:
- run: rw-build-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- - ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 5
- retry: *auto-retry
-
- - label: "end-to-end iceberg sink v2 test"
- command: "ci/scripts/e2e-iceberg-sink-v2-test.sh -p ci-release"
- depends_on:
- - "build"
- - "build-other"
- plugins:
- - docker-compose#v4.9.0:
- run: sink-test-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- - ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 10
- retry: *auto-retry
-
- label: "end-to-end clickhouse sink test"
command: "ci/scripts/e2e-clickhouse-sink-test.sh -p ci-release"
depends_on:
@@ -549,14 +524,14 @@ steps:
timeout_in_minutes: 10
retry: *auto-retry
- - label: "e2e java-binding test"
- command: "ci/scripts/java-binding-test.sh -p ci-release"
+ - label: "end-to-end pulsar sink test"
+ command: "ci/scripts/e2e-pulsar-sink-test.sh -p ci-release"
depends_on:
- "build"
- "build-other"
plugins:
- docker-compose#v4.9.0:
- run: rw-build-env
+ run: sink-test-env
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml
index c3b0bd2728556..985bd0be4b822 100644
--- a/ci/workflows/pull-request.yml
+++ b/ci/workflows/pull-request.yml
@@ -19,6 +19,7 @@ steps:
- label: "build"
command: "ci/scripts/build.sh -p ci-dev"
key: "build"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-build")
plugins:
- docker-compose#v4.9.0:
run: rw-build-env
@@ -30,6 +31,7 @@ steps:
- label: "build other components"
command: "ci/scripts/build-other.sh"
key: "build-other"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-build-other")
plugins:
- seek-oss/aws-sm#v2.3.1:
env:
@@ -40,12 +42,13 @@ steps:
mount-buildkite-agent: true
environment:
- GITHUB_TOKEN
- timeout_in_minutes: 12
+ timeout_in_minutes: 14
retry: *auto-retry
- label: "build (deterministic simulation)"
command: "ci/scripts/build-simulation.sh"
key: "build-simulation"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-build-simulation")
plugins:
- docker-compose#v4.9.0:
run: rw-build-env
@@ -57,6 +60,7 @@ steps:
- label: "docslt"
command: "ci/scripts/docslt.sh"
key: "docslt"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-docslt")
plugins:
- docker-compose#v4.9.0:
run: rw-build-env
@@ -67,6 +71,7 @@ steps:
- label: "end-to-end test"
command: "ci/scripts/e2e-test.sh -p ci-dev -m ci-3streaming-2serving-3fe"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-e2e-test")
depends_on:
- "build"
- "build-other"
@@ -82,6 +87,7 @@ steps:
- label: "end-to-end test (parallel)"
command: "ci/scripts/e2e-test-parallel.sh -p ci-dev"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-e2e-parallel-tests")
depends_on:
- "build"
- "docslt"
@@ -124,6 +130,7 @@ steps:
- label: "end-to-end source test"
command: "ci/scripts/e2e-source-test.sh -p ci-dev"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-e2e-source-tests")
depends_on:
- "build"
- "build-other"
@@ -138,6 +145,7 @@ steps:
- label: "end-to-end sink test"
command: "ci/scripts/e2e-sink-test.sh -p ci-dev"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-e2e-sink-tests")
depends_on:
- "build"
- "build-other"
@@ -201,6 +209,21 @@ steps:
timeout_in_minutes: 10
retry: *auto-retry
+ - label: "end-to-end pulsar sink test"
+ if: build.pull_request.labels includes "ci/run-e2e-pulsar-sink-tests"
+ command: "ci/scripts/e2e-pulsar-sink-test.sh -p ci-dev"
+ depends_on:
+ - "build"
+ - "build-other"
+ plugins:
+ - docker-compose#v4.9.0:
+ run: sink-test-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ - ./ci/plugins/upload-failure-logs
+ timeout_in_minutes: 10
+ retry: *auto-retry
+
- label: "end-to-end clickhouse sink test"
if: build.pull_request.labels includes "ci/run-e2e-clickhouse-sink-tests"
command: "ci/scripts/e2e-clickhouse-sink-test.sh -p ci-dev"
@@ -233,6 +256,7 @@ steps:
- label: "regress test"
command: "ci/scripts/regress-test.sh -p ci-dev"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-regress-test")
depends_on: "build"
plugins:
- docker-compose#v4.9.0:
@@ -248,6 +272,7 @@ steps:
# This ensures our `main-cron` workflow will be stable.
- label: "unit test"
command: "ci/scripts/pr-unit-test.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-unit-test")
plugins:
- ./ci/plugins/swapfile
- seek-oss/aws-sm#v2.3.1:
@@ -258,11 +283,12 @@ steps:
config: ci/docker-compose.yml
environment:
- CODECOV_TOKEN
- timeout_in_minutes: 18
+ timeout_in_minutes: 20
retry: *auto-retry
- label: "check"
command: "ci/scripts/check.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-check")
plugins:
- gencer/cache#v2.4.10:
id: cache
@@ -284,6 +310,7 @@ steps:
- label: "unit test (deterministic simulation)"
command: "ci/scripts/deterministic-unit-test.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-unit-test-deterministic-simulation")
plugins:
- docker-compose#v4.9.0:
run: rw-build-env
@@ -295,6 +322,7 @@ steps:
- label: "integration test (deterministic simulation)"
command: "TEST_NUM=5 ci/scripts/deterministic-it-test.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-integration-test-deterministic-simulation")
depends_on: "build-simulation"
plugins:
- docker-compose#v4.9.0:
@@ -306,6 +334,7 @@ steps:
- label: "end-to-end test (deterministic simulation)"
command: "TEST_NUM=16 ci/scripts/deterministic-e2e-test.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-e2e-test-deterministic-simulation")
depends_on: "build-simulation"
plugins:
- seek-oss/aws-sm#v2.3.1:
@@ -324,6 +353,7 @@ steps:
- label: "recovery test (deterministic simulation)"
command: "TEST_NUM=8 KILL_RATE=0.5 ci/scripts/deterministic-recovery-test.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-recovery-test-deterministic-simulation")
depends_on: "build-simulation"
plugins:
# - seek-oss/aws-sm#v2.3.1:
@@ -343,6 +373,7 @@ steps:
- label: "misc check"
command: "ci/scripts/misc-check.sh"
+ if: (!build.pull_request.labels includes "ci/skip-ci" || build.pull_request.labels includes "ci/run-misc-check")
plugins:
- docker-compose#v4.9.0:
run: rw-build-env
@@ -455,11 +486,11 @@ steps:
- "build"
plugins:
- docker-compose#v4.9.0:
- run: ci-flamegraph-env
+ run: rw-build-env
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 10
+ timeout_in_minutes: 30
- label: "e2e standalone binary test"
command: "ci/scripts/e2e-test.sh -p ci-dev -m standalone"
@@ -474,5 +505,59 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 25
+ timeout_in_minutes: 30
+ retry: *auto-retry
+
+ # FIXME(kwannoel): Let the github PR labeller label it, if sqlsmith source files has changes.
+ - label: "fuzz test"
+ command: "ci/scripts/pr-fuzz-test.sh -p ci-dev"
+ if: build.pull_request.labels includes "ci/run-sqlsmith-fuzzing-tests"
+ depends_on:
+ - "build"
+ - "build-simulation"
+ plugins:
+ - ./ci/plugins/swapfile
+ - docker-compose#v4.9.0:
+ run: rw-build-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ - ./ci/plugins/upload-failure-logs
+ timeout_in_minutes: 15
+ retry: *auto-retry
+
+ - label: "enable ci/skip-ci only in draft PRs"
+ if: build.pull_request.labels includes "ci/skip-ci" && !build.pull_request.draft
+ commands:
+ - echo "ci/skip-ci is only usable for draft Pull Requests"
+ - exit 1
+
+ - label: "micro benchmark"
+ command: "ci/scripts/run-micro-benchmarks.sh"
+ key: "run-micro-benchmarks"
+ if: build.pull_request.labels includes "ci/run-micro-benchmarks"
+ plugins:
+ - docker-compose#v4.9.0:
+ run: rw-build-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ timeout_in_minutes: 60
retry: *auto-retry
+
+ - label: "upload micro-benchmark"
+ if: build.pull_request.labels includes "ci/run-upload-micro-benchmark"
+ command:
+ - "BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER ci/scripts/upload-micro-bench-results.sh"
+ depends_on: "run-micro-benchmarks"
+ plugins:
+ - seek-oss/aws-sm#v2.3.1:
+ env:
+ BUILDKITE_TOKEN: buildkite_token
+ GITHUB_TOKEN: github-token
+ - docker-compose#v4.9.0:
+ run: rw-build-env
+ config: ci/docker-compose.yml
+ mount-buildkite-agent: true
+ environment:
+ - BUILDKITE_TOKEN
+ - GITHUB_TOKEN
+ timeout_in_minutes: 5
diff --git a/ci/workflows/sqlsmith-tests.yml b/ci/workflows/sqlsmith-tests.yml
deleted file mode 100644
index 201b3dd8bd20c..0000000000000
--- a/ci/workflows/sqlsmith-tests.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-auto-retry: &auto-retry
- automatic:
- # Agent terminated because the AWS EC2 spot instance killed by AWS.
- - signal_reason: agent_stop
- limit: 3
-
-steps:
- - label: "check ci image rebuild"
- plugins:
- - chronotc/monorepo-diff#v2.3.0:
- diff: "git diff --name-only origin/main"
- watch:
- - path: "ci/build-ci-image.sh"
- config:
- command: "ci/build-ci-image.sh"
- label: "ci build images"
- retry: *auto-retry
- - wait
-
- - label: "build"
- command: "ci/scripts/build.sh -p ci-dev"
- key: "build"
- plugins:
- - docker-compose#v4.9.0:
- run: rw-build-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- timeout_in_minutes: 15
- retry: *auto-retry
-
- - label: "fuzz test"
- command: "ci/scripts/pr-fuzz-test.sh -p ci-dev"
- depends_on:
- - "build"
- plugins:
- - ./ci/plugins/swapfile
- - docker-compose#v4.9.0:
- run: rw-build-env
- config: ci/docker-compose.yml
- mount-buildkite-agent: true
- - ./ci/plugins/upload-failure-logs
- timeout_in_minutes: 25
- retry: *auto-retry
diff --git a/dashboard/components/BackPressureTable.tsx b/dashboard/components/BackPressureTable.tsx
index 4b5e987a1b924..84ba13c3b849a 100644
--- a/dashboard/components/BackPressureTable.tsx
+++ b/dashboard/components/BackPressureTable.tsx
@@ -38,9 +38,9 @@ interface BackPressuresMetrics {
}
export default function BackPressureTable({
- selectedActorIds,
+ selectedFragmentIds,
}: {
- selectedActorIds: Set
+ selectedFragmentIds: Set
}) {
const [backPressuresMetrics, setBackPressuresMetrics] =
useState()
@@ -53,7 +53,7 @@ export default function BackPressureTable({
let metrics: BackPressuresMetrics = await getActorBackPressures()
metrics.outputBufferBlockingDuration = sortBy(
metrics.outputBufferBlockingDuration,
- (m) => m.metric.actor_id
+ (m) => (m.metric.fragment_id, m.metric.downstream_fragment_id)
)
setBackPressuresMetrics(metrics)
await new Promise((resolve) => setTimeout(resolve, 5000)) // refresh every 5 secs
@@ -74,25 +74,27 @@ export default function BackPressureTable({
return () => {}
}, [toast])
- const isSelected = (actorId: string) => selectedActorIds.has(actorId)
+ const isSelected = (fragmentId: string) => selectedFragmentIds.has(fragmentId)
const retVal = (
Back Pressures (Last 30 minutes)
- Actor ID |
- Instance |
- Block Rate |
+
+ Fragment IDs → Downstream |
+ Block Rate |
+
{backPressuresMetrics &&
backPressuresMetrics.outputBufferBlockingDuration
- .filter((m) => isSelected(m.metric.actor_id))
+ .filter((m) => isSelected(m.metric.fragment_id))
.map((m) => (
-
- {m.metric.actor_id} |
- {m.metric.instance} |
+
+ {`Fragment ${m.metric.fragment_id} -> ${m.metric.downstream_fragment_id}`} |
|
diff --git a/dashboard/components/FragmentGraph.tsx b/dashboard/components/FragmentGraph.tsx
index 9c62680d25fc8..aa85501dc66ca 100644
--- a/dashboard/components/FragmentGraph.tsx
+++ b/dashboard/components/FragmentGraph.tsx
@@ -117,7 +117,7 @@ export default function FragmentGraph({
extraInfo: string
}
>()
- const includedActorIds = new Set()
+ const includedFragmentIds = new Set()
for (const [fragmentId, fragmentRoot] of deps) {
const layoutRoot = treeLayoutFlip(fragmentRoot, {
dx: nodeMarginX,
@@ -137,7 +137,7 @@ export default function FragmentGraph({
height,
extraInfo: `Actor ${fragmentRoot.data.actor_ids?.join(", ")}` || "",
})
- fragmentRoot.data.actor_ids?.forEach((id) => includedActorIds.add(id))
+ includedFragmentIds.add(fragmentId)
}
const fragmentLayout = layout(
fragmentDependencyDag.map(({ width: _1, height: _2, id, ...data }) => {
@@ -169,7 +169,7 @@ export default function FragmentGraph({
svgWidth,
svgHeight,
links,
- includedActorIds,
+ includedFragmentIds,
}
}, [planNodeDependencies, fragmentDependency])
@@ -189,7 +189,7 @@ export default function FragmentGraph({
links,
fragmentLayout: fragmentDependencyDag,
layoutResult: planNodeDependencyDag,
- includedActorIds,
+ includedFragmentIds,
} = planNodeDependencyDagCallback()
useEffect(() => {
@@ -434,7 +434,7 @@ export default function FragmentGraph({
-
+
)
}
diff --git a/dashboard/components/metrics.tsx b/dashboard/components/metrics.tsx
index efa32175555eb..a933dbc7fd807 100644
--- a/dashboard/components/metrics.tsx
+++ b/dashboard/components/metrics.tsx
@@ -21,6 +21,11 @@ export interface MetricsSample {
}
export interface Metrics {
+ // Tags of this timeseries. Example: {"downstream_fragment_id":"15001","fragment_id":"15002"}
metric: { [key: string]: string }
+
+ // Example: [{"timestamp":1695041872.0,"value":0.3797035002929275},
+ // {"timestamp":1695041887.0,"value":0.5914327683152408},
+ // {"timestamp":1695041902.0,"value":0.8272212493499999}, ... ]
sample: MetricsSample[]
}
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index e9cb795252f6c..d21a177da60a4 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -25,7 +25,7 @@
"fabric": "^5.2.1",
"framer-motion": "^6.5.1",
"lodash": "^4.17.21",
- "next": "^13.4.12",
+ "next": "^13.5.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-flow-renderer": "10.3.16",
@@ -85,11 +85,12 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
- "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"dependencies": {
- "@babel/highlight": "^7.18.6"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
},
"engines": {
"node": ">=6.9.0"
@@ -135,12 +136,13 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
- "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+ "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"dependencies": {
- "@babel/types": "^7.19.0",
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"engines": {
@@ -190,31 +192,31 @@
}
},
"node_modules/@babel/helper-environment-visitor": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
- "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
- "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"dependencies": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-hoist-variables": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
- "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
"dependencies": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
},
"engines": {
"node": ">=6.9.0"
@@ -271,28 +273,28 @@
}
},
"node_modules/@babel/helper-split-export-declaration": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
- "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
"dependencies": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
- "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
- "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
"engines": {
"node": ">=6.9.0"
}
@@ -321,12 +323,12 @@
}
},
"node_modules/@babel/highlight": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
- "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.18.6",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
},
"engines": {
@@ -334,9 +336,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
- "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -383,31 +385,31 @@
}
},
"node_modules/@babel/template": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
- "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"dependencies": {
- "@babel/code-frame": "^7.18.6",
- "@babel/parser": "^7.18.10",
- "@babel/types": "^7.18.10"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
- "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
- "dependencies": {
- "@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.19.0",
- "@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
- "@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.19.0",
- "@babel/types": "^7.19.0",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+ "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+ "dependencies": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.0",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -416,12 +418,12 @@
}
},
"node_modules/@babel/types": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
- "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+ "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"dependencies": {
- "@babel/helper-string-parser": "^7.18.10",
- "@babel/helper-validator-identifier": "^7.18.6",
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -1882,12 +1884,12 @@
"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
- "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+ "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
"dependencies": {
- "@jridgewell/resolve-uri": "^3.0.3",
- "@jridgewell/sourcemap-codec": "^1.4.10"
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
}
},
"node_modules/@loadable/component": {
@@ -2034,9 +2036,9 @@
}
},
"node_modules/@next/env": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
- "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.4.tgz",
+ "integrity": "sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ=="
},
"node_modules/@next/eslint-plugin-next": {
"version": "13.4.12",
@@ -2068,9 +2070,9 @@
}
},
"node_modules/@next/swc-darwin-arm64": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
- "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.4.tgz",
+ "integrity": "sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==",
"cpu": [
"arm64"
],
@@ -2083,9 +2085,9 @@
}
},
"node_modules/@next/swc-darwin-x64": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
- "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz",
+ "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==",
"cpu": [
"x64"
],
@@ -2098,9 +2100,9 @@
}
},
"node_modules/@next/swc-linux-arm64-gnu": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
- "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz",
+ "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==",
"cpu": [
"arm64"
],
@@ -2113,9 +2115,9 @@
}
},
"node_modules/@next/swc-linux-arm64-musl": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
- "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz",
+ "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==",
"cpu": [
"arm64"
],
@@ -2128,9 +2130,9 @@
}
},
"node_modules/@next/swc-linux-x64-gnu": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
- "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz",
+ "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==",
"cpu": [
"x64"
],
@@ -2143,9 +2145,9 @@
}
},
"node_modules/@next/swc-linux-x64-musl": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
- "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz",
+ "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==",
"cpu": [
"x64"
],
@@ -2158,9 +2160,9 @@
}
},
"node_modules/@next/swc-win32-arm64-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
- "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz",
+ "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==",
"cpu": [
"arm64"
],
@@ -2173,9 +2175,9 @@
}
},
"node_modules/@next/swc-win32-ia32-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
- "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz",
+ "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==",
"cpu": [
"ia32"
],
@@ -2188,9 +2190,9 @@
}
},
"node_modules/@next/swc-win32-x64-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
- "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz",
+ "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==",
"cpu": [
"x64"
],
@@ -2333,9 +2335,9 @@
"dev": true
},
"node_modules/@swc/helpers": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
- "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
+ "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
"dependencies": {
"tslib": "^2.4.0"
}
@@ -8139,9 +8141,15 @@
"optional": true
},
"node_modules/nanoid": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
- "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -8171,39 +8179,37 @@
}
},
"node_modules/next": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
- "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/next/-/next-13.5.4.tgz",
+ "integrity": "sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==",
"dependencies": {
- "@next/env": "13.4.12",
- "@swc/helpers": "0.5.1",
+ "@next/env": "13.5.4",
+ "@swc/helpers": "0.5.2",
"busboy": "1.6.0",
"caniuse-lite": "^1.0.30001406",
- "postcss": "8.4.14",
+ "postcss": "8.4.31",
"styled-jsx": "5.1.1",
- "watchpack": "2.4.0",
- "zod": "3.21.4"
+ "watchpack": "2.4.0"
},
"bin": {
"next": "dist/bin/next"
},
"engines": {
- "node": ">=16.8.0"
+ "node": ">=16.14.0"
},
"optionalDependencies": {
- "@next/swc-darwin-arm64": "13.4.12",
- "@next/swc-darwin-x64": "13.4.12",
- "@next/swc-linux-arm64-gnu": "13.4.12",
- "@next/swc-linux-arm64-musl": "13.4.12",
- "@next/swc-linux-x64-gnu": "13.4.12",
- "@next/swc-linux-x64-musl": "13.4.12",
- "@next/swc-win32-arm64-msvc": "13.4.12",
- "@next/swc-win32-ia32-msvc": "13.4.12",
- "@next/swc-win32-x64-msvc": "13.4.12"
+ "@next/swc-darwin-arm64": "13.5.4",
+ "@next/swc-darwin-x64": "13.5.4",
+ "@next/swc-linux-arm64-gnu": "13.5.4",
+ "@next/swc-linux-arm64-musl": "13.5.4",
+ "@next/swc-linux-x64-gnu": "13.5.4",
+ "@next/swc-linux-x64-musl": "13.5.4",
+ "@next/swc-win32-arm64-msvc": "13.5.4",
+ "@next/swc-win32-ia32-msvc": "13.5.4",
+ "@next/swc-win32-x64-msvc": "13.5.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.1.0",
- "fibers": ">= 3.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.3.0"
@@ -8212,9 +8218,6 @@
"@opentelemetry/api": {
"optional": true
},
- "fibers": {
- "optional": true
- },
"sass": {
"optional": true
}
@@ -8672,9 +8675,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"funding": [
{
"type": "opencollective",
@@ -8683,10 +8686,14 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
"dependencies": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -10894,14 +10901,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/zod": {
- "version": "3.21.4",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
- "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
- "funding": {
- "url": "https://github.com/sponsors/colinhacks"
- }
- },
"node_modules/zustand": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/zustand/-/zustand-3.7.2.tgz",
@@ -10943,11 +10942,12 @@
}
},
"@babel/code-frame": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
- "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"requires": {
- "@babel/highlight": "^7.18.6"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
}
},
"@babel/compat-data": {
@@ -10980,12 +10980,13 @@
}
},
"@babel/generator": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
- "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+ "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"requires": {
- "@babel/types": "^7.19.0",
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"dependencies": {
@@ -11022,25 +11023,25 @@
}
},
"@babel/helper-environment-visitor": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
- "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
},
"@babel/helper-function-name": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
- "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"requires": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
}
},
"@babel/helper-hoist-variables": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
- "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
"requires": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
}
},
"@babel/helper-module-imports": {
@@ -11082,22 +11083,22 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
- "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
"requires": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
}
},
"@babel/helper-string-parser": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
- "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
},
"@babel/helper-validator-identifier": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
- "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
},
"@babel/helper-validator-option": {
"version": "7.18.6",
@@ -11117,19 +11118,19 @@
}
},
"@babel/highlight": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
- "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"requires": {
- "@babel/helper-validator-identifier": "^7.18.6",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
- "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
},
"@babel/plugin-syntax-jsx": {
"version": "7.18.6",
@@ -11158,39 +11159,39 @@
}
},
"@babel/template": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
- "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"requires": {
- "@babel/code-frame": "^7.18.6",
- "@babel/parser": "^7.18.10",
- "@babel/types": "^7.18.10"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
}
},
"@babel/traverse": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
- "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
- "requires": {
- "@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.19.0",
- "@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
- "@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.19.0",
- "@babel/types": "^7.19.0",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+ "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+ "requires": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.0",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
- "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+ "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"requires": {
- "@babel/helper-string-parser": "^7.18.10",
- "@babel/helper-validator-identifier": "^7.18.6",
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
}
},
@@ -12289,12 +12290,12 @@
"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
},
"@jridgewell/trace-mapping": {
- "version": "0.3.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
- "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+ "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
"requires": {
- "@jridgewell/resolve-uri": "^3.0.3",
- "@jridgewell/sourcemap-codec": "^1.4.10"
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
}
},
"@loadable/component": {
@@ -12418,9 +12419,9 @@
}
},
"@next/env": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
- "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.4.tgz",
+ "integrity": "sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ=="
},
"@next/eslint-plugin-next": {
"version": "13.4.12",
@@ -12448,57 +12449,57 @@
}
},
"@next/swc-darwin-arm64": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
- "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.4.tgz",
+ "integrity": "sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==",
"optional": true
},
"@next/swc-darwin-x64": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
- "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz",
+ "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==",
"optional": true
},
"@next/swc-linux-arm64-gnu": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
- "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz",
+ "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==",
"optional": true
},
"@next/swc-linux-arm64-musl": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
- "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz",
+ "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==",
"optional": true
},
"@next/swc-linux-x64-gnu": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
- "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz",
+ "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==",
"optional": true
},
"@next/swc-linux-x64-musl": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
- "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz",
+ "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==",
"optional": true
},
"@next/swc-win32-arm64-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
- "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz",
+ "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==",
"optional": true
},
"@next/swc-win32-ia32-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
- "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz",
+ "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==",
"optional": true
},
"@next/swc-win32-x64-msvc": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
- "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz",
+ "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==",
"optional": true
},
"@nodelib/fs.scandir": {
@@ -12613,9 +12614,9 @@
"dev": true
},
"@swc/helpers": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
- "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
+ "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
"requires": {
"tslib": "^2.4.0"
}
@@ -16990,9 +16991,9 @@
"optional": true
},
"nanoid": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
- "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
},
"natural-compare": {
"version": "1.4.0",
@@ -17013,27 +17014,26 @@
"dev": true
},
"next": {
- "version": "13.4.12",
- "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
- "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
- "requires": {
- "@next/env": "13.4.12",
- "@next/swc-darwin-arm64": "13.4.12",
- "@next/swc-darwin-x64": "13.4.12",
- "@next/swc-linux-arm64-gnu": "13.4.12",
- "@next/swc-linux-arm64-musl": "13.4.12",
- "@next/swc-linux-x64-gnu": "13.4.12",
- "@next/swc-linux-x64-musl": "13.4.12",
- "@next/swc-win32-arm64-msvc": "13.4.12",
- "@next/swc-win32-ia32-msvc": "13.4.12",
- "@next/swc-win32-x64-msvc": "13.4.12",
- "@swc/helpers": "0.5.1",
+ "version": "13.5.4",
+ "resolved": "https://registry.npmjs.org/next/-/next-13.5.4.tgz",
+ "integrity": "sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==",
+ "requires": {
+ "@next/env": "13.5.4",
+ "@next/swc-darwin-arm64": "13.5.4",
+ "@next/swc-darwin-x64": "13.5.4",
+ "@next/swc-linux-arm64-gnu": "13.5.4",
+ "@next/swc-linux-arm64-musl": "13.5.4",
+ "@next/swc-linux-x64-gnu": "13.5.4",
+ "@next/swc-linux-x64-musl": "13.5.4",
+ "@next/swc-win32-arm64-msvc": "13.5.4",
+ "@next/swc-win32-ia32-msvc": "13.5.4",
+ "@next/swc-win32-x64-msvc": "13.5.4",
+ "@swc/helpers": "0.5.2",
"busboy": "1.6.0",
"caniuse-lite": "^1.0.30001406",
- "postcss": "8.4.14",
+ "postcss": "8.4.31",
"styled-jsx": "5.1.1",
- "watchpack": "2.4.0",
- "zod": "3.21.4"
+ "watchpack": "2.4.0"
}
},
"node-fetch": {
@@ -17368,11 +17368,11 @@
}
},
"postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"requires": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
@@ -18942,11 +18942,6 @@
"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
"dev": true
},
- "zod": {
- "version": "3.21.4",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
- "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
- },
"zustand": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/zustand/-/zustand-3.7.2.tgz",
diff --git a/dashboard/package.json b/dashboard/package.json
index a0642de4380df..67d2ff0ef1715 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -31,7 +31,7 @@
"fabric": "^5.2.1",
"framer-motion": "^6.5.1",
"lodash": "^4.17.21",
- "next": "^13.4.12",
+ "next": "^13.5.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-flow-renderer": "10.3.16",
diff --git a/dashboard/pages/await_tree.tsx b/dashboard/pages/await_tree.tsx
index 8908e121deabd..3db6b6677274a 100644
--- a/dashboard/pages/await_tree.tsx
+++ b/dashboard/pages/await_tree.tsx
@@ -36,22 +36,32 @@ import { getClusterInfoComputeNode } from "./api/cluster"
import useFetch from "./api/fetch"
const SIDEBAR_WIDTH = 200
+const ALL_COMPUTE_NODES = ""
export default function AwaitTreeDump() {
const { response: computeNodes } = useFetch(getClusterInfoComputeNode)
- const [computeNodeId, setComputeNodeId] = useState()
- const [dump, setDump] = useState("")
+ const [computeNodeId, setComputeNodeId] = useState()
+ const [dump, setDump] = useState("")
useEffect(() => {
- if (computeNodes && !computeNodeId && computeNodes.length > 0) {
- setComputeNodeId(computeNodes[0].id)
+ if (computeNodes && !computeNodeId) {
+ setComputeNodeId(ALL_COMPUTE_NODES)
}
}, [computeNodes, computeNodeId])
const dumpTree = async () => {
- const title = `Await-Tree Dump of Compute Node ${computeNodeId}:`
- setDump(undefined)
+ if (computeNodeId === undefined) {
+ return
+ }
+
+ let title
+ if (computeNodeId === ALL_COMPUTE_NODES) {
+ title = "Await-Tree Dump of All Compute Nodes:"
+ } else {
+ title = `Await-Tree Dump of Compute Node ${computeNodeId}:`
+ }
+ setDump("Loading...")
let result
@@ -92,10 +102,13 @@ export default function AwaitTreeDump() {
Compute Nodes