Skip to content

Commit

Permalink
Merge branch 'main' into xxh/support-block-cursor
Browse files Browse the repository at this point in the history
  • Loading branch information
xxhZs committed Sep 24, 2024
2 parents ca927e8 + 29adeb9 commit a5ba069
Show file tree
Hide file tree
Showing 175 changed files with 1,934 additions and 1,708 deletions.
129 changes: 31 additions & 98 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev =
prost = { version = "0.13" }
prost-build = { version = "0.13" }
# branch rw_patch
icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "db4868f9a5de8ff8f6c04ec4c203bcbe59564cbe", features = [
icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "490e5af541edab0e9284ba19ddb56c8a16d1c36b", features = [
"prometheus",
] }
# branch dev
iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
opendal = "0.47"
opendal = "0.49"
# used only by arrow-udf-flight
arrow-flight = "52"
arrow-udf-js = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/backwards-compat-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ setup_old_cluster() {
set -e
echo "Failed to download ${OLD_VERSION} from github releases, build from source later during \`risedev d\`"
configure_rw "$OLD_VERSION" true
elif [[ $OLD_VERSION = '1.10.1' || $OLD_VERSION = '1.10.0' ]]; then
elif [[ $OLD_VERSION = '1.10.0' || $OLD_VERSION = '1.10.1' || $OLD_VERSION = '1.10.2' || $OLD_VERSION = '2.0.0' ]]; then
set -e
echo "1.10.x has older openssl version, build from source later during \`risedev d\`"
echo "1.10.x, 2.0.0 have dynamically linked openssl, build from source later during \`risedev d\`"
configure_rw "$OLD_VERSION" true
else
set -e
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then

echo "--- Release create"
set +e
response=$(gh api repos/risingwavelabs/risingwave/releases/tags/"${BUILDKITE_TAG}" 2>&1)
response=$(gh release view -R risingwavelabs/risingwave "${BUILDKITE_TAG}" 2>&1)
set -euo pipefail
if [[ $response == *"Not Found"* ]]; then
if [[ $response == *"not found"* ]]; then
echo "Tag ${BUILDKITE_TAG} does not exist. Creating release..."
gh release create "${BUILDKITE_TAG}" --notes "release ${BUILDKITE_TAG}" -d -p
else
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ steps:
retry: *auto-retry

- label: "S3 source and sink on parquet file"
key: "s3-v2-source-check-parquet-file"
key: "s3-source-and-sink-parquet-encode"
command: "ci/scripts/s3-source-test.sh -p ci-release -s fs_parquet_source_and_sink.py"
if: |
!(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
Expand Down
2 changes: 2 additions & 0 deletions clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ disallowed-methods = [
{ path = "speedate::DateTime::parse_bytes_with_config", reason = "Please use `parse_bytes_rfc3339_with_config` instead." },
{ path = "speedate::Date::parse_str", reason = "Please use `parse_str_rfc3339` instead." },
{ path = "speedate::Date::parse_bytes", reason = "Please use `parse_bytes_rfc3339` instead." },
{ path = "tonic::transport::Endpoint::connect", reason = "Please use `EndpointExt::monitored_connect` instead." },
{ path = "tonic::transport::Endpoint::connect_lazy", reason = "Please use `EndpointExt::monitored_connect_lazy` instead." },
]
disallowed-types = [
{ path = "num_traits::AsPrimitive", reason = "Please use `From` or `TryFrom` with `OrderedFloat` instead." },
Expand Down
2 changes: 1 addition & 1 deletion dashboard/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function Layout({ children }: { children: React.ReactNode }) {
</Section>
<Section>
<NavTitle>Streaming</NavTitle>
<NavButton href="/dependency_graph/">Relation Graph</NavButton>
<NavButton href="/relation_graph/">Relation Graph</NavButton>
<NavButton href="/fragment_graph/">Fragment Graph</NavButton>
</Section>
<Section>
Expand Down
Loading

0 comments on commit a5ba069

Please sign in to comment.