Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into xxchan/with-ordinality
Browse files Browse the repository at this point in the history
  • Loading branch information
xxchan committed Sep 13, 2023
2 parents e7c3cd8 + 3c1f52f commit 1ca8237
Show file tree
Hide file tree
Showing 1,704 changed files with 81,042 additions and 36,017 deletions.
2 changes: 1 addition & 1 deletion .cargo/audit.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ignore = [
# We depends on `chrono`, but not `time`, and `chrono` is not affected by `RUSTSEC-2020-0071`
# (see https://github.com/time-rs/time/issues/293#issuecomment-946382614).
#
#
# `chrono` also suffers from a similar vulnerability ([`RUSTSEC-2020-0159`](https://rustsec.org/advisories/RUSTSEC-2020-0159),
# but it's already patched in `0.4.20` by rewriting vulnerable C function in Rust).
"RUSTSEC-2020-0071",
Expand Down
23 changes: 4 additions & 19 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ rustflags = [
]

[target.aarch64-apple-darwin]
runner = "scripts/coredump/sign-and-run"
rustflags = [
# neon is enabled by default
"-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
Expand All @@ -37,23 +38,7 @@ rustflags = [
# uncomment the following two lines to enable `TaskLocalAlloc`
# "--cfg",
# "enable_task_local_alloc",
# lints
# TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
"-Funused_must_use",
"-Aclippy::uninlined_format_args",
"-Wclippy::dbg_macro",
"-Wclippy::disallowed_methods",
"-Wclippy::disallowed_types",
"-Wclippy::doc_markdown",
"-Wclippy::explicit_into_iter_loop",
"-Wclippy::explicit_iter_loop",
"-Wclippy::inconsistent_struct_constructor",
"-Wclippy::unused_async",
"-Wclippy::map_flatten",
"-Wclippy::no_effect_underscore_binding",
"-Wclippy::await_holding_lock",
"-Wrustdoc::broken_intra_doc_links",
"-Wfuture_incompatible",
"-Wnonstandard_style",
"-Wrust_2018_idioms",
]

[unstable]
lints = true
5 changes: 4 additions & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@ e7b7842826035b645bc4feddf5ef315d0935e35e
055107da6b969d31cd6aca396f4d9ed209845391

# test: split input/output for planner test (#9902)
f8266748dcb70541da944664552c1944ff8362e4
f8266748dcb70541da944664552c1944ff8362e4

# feat(risedev): add check for trailing spaces in `risedev check` (#11294)
f2a3fd021059e680b35b24c63cff5f8dbe9f9d5f
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ body:
description: Steps to reproduce the behavior, including the SQLs you run and/or the operations you have done to trigger the bug.
placeholder: |
First create the tables/sources and materialized views with
```sql
CREATE TABLE ...
CREATE MATERIALIZED VIEW ...
```
Then the bug is triggered after ...
- type: textarea
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: |
I expected to see this happen: *explanation*
Instead, this happened: *explanation*
- type: textarea
attributes:
Expand Down Expand Up @@ -58,4 +58,4 @@ body:
attributes:
label: Additional context
description: Add any other context about the problem here. e.g., the full log files.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/design-rfc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ body:
label: Q&A
description: Here's where the doc readers can leave the questions and suggestions
placeholder: |
* Why do you need ...
* Why do you need ...
* What will happen if ...
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ updates:
open-pull-requests-limit: 10
# Disable auto rebase to reduce cost. Use `@dependabot rebase` manually instead.
rebase-strategy: "disabled"

# Create a group of dependencies to be updated together in one pull request
groups:
arrow:
patterns:
- "arrow*"
aws:
patterns:
- "aws*"
7 changes: 0 additions & 7 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,5 @@ labels:
- label: "type/deprecate"
title: "^deprecate.*"

# If it's removed, or ticked.
- label: "user-facing-changes"
negate: true
body: 'My PR contains user-facing changes'
- label: "user-facing-changes"
body: '- \[x\] My PR contains user-facing changes'

- label: "breaking-change"
body: '- \[x\] My PR contains breaking changes'
27 changes: 5 additions & 22 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,17 @@ Please explain **IN DETAIL** what the changes are in this PR and why they are ne

## Documentation

- [ ] My PR contains user-facing changes.
- [ ] My PR needs documentation updates. (Please use the **Release note** section below to summarize the impact on users)

<!--
## Release note

You can ignore or delete the section below if your PR does not contain user-facing changes.
If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

Otherwise, please write a release note below.
-->

<details><summary>Click here for Documentation</summary>

### Types of user-facing changes

Please keep the types that apply to your changes, and remove the others.

- Installation and deployment
- Connector (sources & sinks)
- SQL commands, functions, and operators
- RisingWave cluster configuration changes
- Other (please specify in the release note below)

### Release note

<!--
Please create a release note for your changes.
Please create a release note for your changes.
Discuss technical details in the "What's changed" section, and
Discuss technical details in the "What's changed" section, and
focus on the impact on users in the release note.
You should also mention the environment or conditions where the impact may occur.
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/auto-create-docs-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: PR Documentation Checker

on:
pull_request:
types:
- closed
- labeled

jobs:
check_pr_description:
runs-on: ubuntu-latest

steps:
- name: Check if PR is merged
id: check_merged
run: echo "merged=$(echo ${{ github.event.pull_request.merged }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT

- name: Retrieve PR information
uses: 8BitJonny/[email protected]
id: PR
with:
sha: ${{ github.event.pull_request.head.sha }}

- name: Check if documentation update is needed
id: check_documentation_update
if: steps.PR.outputs.pr_found == 'true'
run: |
if [[ $PR_BODY == *"- [x] My PR needs documentation updates."* ]]; then
echo "documentation_update=true" >> $GITHUB_OUTPUT
elif [[ $PR_LABEL == *"user-facing-changes"* ]]; then
echo "documentation_update=true" >> $GITHUB_OUTPUT
else
echo "documentation_update=false" >> $GITHUB_OUTPUT
fi
env:
PR_BODY: ${{ steps.PR.outputs.pr_body }}
PR_LABEL: ${{ steps.PR.outputs.pr_labels }}

- name: Create issue in other repository
if: steps.check_merged.outputs.merged == 'true' && steps.check_documentation_update.outputs.documentation_update == 'true'
run: |
ISSUE_CONTENT="This issue tracks the documentation update needed for the merged PR #$PR_ID.\n\nSource PR URL: $PR_URL\nSource PR Merged At: $PR_MERGED_AT"
curl -X POST \
-H "Authorization: Bearer ${{ secrets.ACCESS_TOKEN }}" \
-d "{\"title\": \"Document: $PR_TITLE\",\"body\": \"$ISSUE_CONTENT\"}" \
"https://api.github.com/repos/risingwavelabs/risingwave-docs/issues"
env:
PR_ID: ${{ steps.PR.outputs.number }}
PR_URL: ${{ steps.PR.outputs.pr_url }}
PR_TITLE: ${{ steps.PR.outputs.pr_title }}
PR_BODY: ${{ steps.PR.outputs.pr_body }}
PR_CREATED_AT: ${{ steps.PR.outputs.pr_created_at }}
PR_MERGED_AT: ${{ steps.PR.outputs.pr_merged_at }}
PR_CLOSED_AT: ${{ steps.PR.outputs.pr_closed_at }}
PR_LABEL: ${{ steps.PR.outputs.pr_labels }}

- name: print_output_variables
run: |
echo "Merged: ${{ steps.check_merged.outputs.merged }}"
echo "PR ID: ${{ steps.PR.outputs.number }}"
echo "PR URL: ${{ steps.PR.outputs.pr_url }}"
echo "PR Title: ${{ steps.PR.outputs.pr_title }}"
echo "PR Created At: ${{ steps.PR.outputs.pr_created_at }}"
echo "PR Merged At: ${{ steps.PR.outputs.pr_merged_at }}"
echo "PR Closed At: ${{ steps.PR.outputs.pr_closed_at }}"
echo "PR Labels: ${{ steps.PR.outputs.pr_labels }}"
echo "Documentation Update: ${{ steps.check_documentation_update.outputs.documentation_update }}"
23 changes: 12 additions & 11 deletions .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ on:
pull_request:
branches:
- main
types: ["closed"]
types: ["closed", "labeled"]

jobs:
release_pull_request_0_19:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v0.19') && github.event.pull_request.merged == true"
release_pull_request_1_1:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.1') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
Expand All @@ -16,13 +16,14 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'v0.19.0-rc'
pr_branch: 'v1.1-rc'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch v0.19.0-rc', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.1-rc', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
release_pull_request_1_0:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.0') && github.event.pull_request.merged == true"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_2:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.2') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
Expand All @@ -31,9 +32,9 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'v1.0-rc'
pr_branch: 'v1.2-rc'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.0-rc', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.2-rc', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

4 changes: 2 additions & 2 deletions .github/workflows/connector-node-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
if: steps.filter.outputs.java == 'true' || steps.filter.outputs.proto == 'true'
run: |
set -ex
RISINGWAVE_ROOT=${PWD}
echo "--- build connector node"
cd ${RISINGWAVE_ROOT}/java
# run unit test
Expand Down
37 changes: 25 additions & 12 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
branches:
- main

env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"
RUSTDOCFLAGS: "--cfg docsrs --markdown-css rust.css --markdown-no-toc --index-page /home/runner/work/risingwave/risingwave/docs/rustdoc/index.md -Zunstable-options"

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -18,24 +23,32 @@ jobs:
uses: mozilla-actions/[email protected]
with:
version: "v0.5.2"
- name: Docs
- name: build rustdocs
run: |
RUSTDOCFLAGS="--markdown-css rust.css --markdown-no-toc --index-page docs/rustdoc/index.md -Zunstable-options" cargo doc --workspace --no-deps --document-private-items
cargo doc --workspace --no-deps --document-private-items
cp docs/rustdoc/rust.css target/doc/rust.css
env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"
- name: Fix file permissions
shell: sh
mkdir artifact
cp -R target/doc/* artifact
- name: Install cargo-docset
uses: taiki-e/install-action@v2
with:
tool: cargo-docset
- name: build docsets
run: |
chmod -c -R +rX "target/doc" |
while read line; do
echo "::warning title=Invalid file permissions automatically fixed::$line"
done
cargo docset --no-clean --docset-name RisingWave
tar -czf risingwave.docset.tgz target/docset/risingwave.docset
echo "<entry>
<version>$(date -u +%Y-%m-%dT%H:%M:%SZ)</version>
<url>https://risingwavelabs.github.io/risingwave/risingwave.docset.tgz</url>
</entry>" > RisingWave.xml
cp -t artifact "risingwave.docset.tgz" "RisingWave.xml"
- name: Upload artifacts
uses: actions/upload-pages-artifact@v1
with:
path: target/doc
path: artifact

deploy:
needs: build
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/hakari_fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Hakari Fix

on:
pull_request:
types: ["opened", "synchronize"]
paths: ["Cargo.lock", "**/Cargo.toml"]

jobs:
hakari-fix:
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Install cargo-hakari
uses: taiki-e/install-action@v2
with:
tool: cargo-hakari

- name: Hakari generate
run: cargo hakari generate

- name: Show diff
run: git diff

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Fix "cargo-hakari"
2 changes: 1 addition & 1 deletion .github/workflows/license_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main
- "forks/*"
pull_request:
branches:
branches:
- main
- "v*.*.*-rc"
merge_group:
Expand Down
Loading

0 comments on commit 1ca8237

Please sign in to comment.