Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Doc] Remove cloud ingest (backport #54895) #54966

Merged
merged 2 commits into from
Jan 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2025

We have duplicate content in the https://docs.starrocks.io/docs/loading/cloud_storage_load/ page and the pages under https://docs.starrocks.io/docs/loading/objectstorage/

Goal:

  • Move the Tencent, Alicloud, and other sections from cloud_storage_load.md to the `objectstorage dir
  • remove /cloud_storage_load from English and Chinese docs
  • add redirects from cloud_storage_load to docs/loading/objectstorage

Redirects

An interesting feature added in this PR are redirects. By adding an entry to the docusaurus.config.js we can redirect from old URLs to new ones. We should only use this when making an important change (like if there are external blogs that point to a page). Here is the section from the config that redirects the old cloud_storage_load page to the objectstorage page:

  plugins: [
    [
      '@docusaurus/plugin-client-redirects',
      {
        redirects: [
          // /docs/oldDoc -> /docs/newDoc
          {
            from: '/docs/loading/cloud_storage_load/',
            to: '/docs/loading/objectstorage/'
          },
        ],
      },
    ],
  ],

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

(cherry picked from commit 5efdbcf)

# Conflicts:
#	docs/en/loading/cloud_storage_load.md
#	docs/zh/loading/cloud_storage_load.md
@mergify mergify bot added the conflicts label Jan 10, 2025
Copy link
Contributor Author

mergify bot commented Jan 10, 2025

Cherry-pick of 5efdbcf has failed:

On branch mergify/bp/branch-3.2/pr-54895
Your branch is up to date with 'origin/branch-3.2'.

You are currently cherry-picking commit 5efdbcf7e9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/docusaurus/docusaurus.config.js
	modified:   docs/docusaurus/sidebars.json
	modified:   docs/en/loading/Etl_in_loading.md
	modified:   docs/en/loading/Load_to_Primary_Key_tables.md
	new file:   docs/en/loading/alibaba.md
	new file:   docs/en/loading/huawei.md
	new file:   docs/en/loading/s3_compatible.md
	new file:   docs/en/loading/tencent.md
	modified:   docs/zh/loading/Etl_in_loading.md
	modified:   docs/zh/loading/Load_to_Primary_Key_tables.md
	modified:   docs/zh/loading/Loading_intro.md
	new file:   docs/zh/loading/alibaba.md
	new file:   docs/zh/loading/huawei.md
	new file:   docs/zh/loading/s3_compatible.md
	new file:   docs/zh/loading/tencent.md
	modified:   docs/zh/sql-reference/sql-statements/cluster-management/nodes_processes/ALTER_SYSTEM.md
	modified:   docs/zh/sql-reference/sql-statements/loading_unloading/BROKER_LOAD.md
	modified:   docs/zh/sql-reference/sql-statements/loading_unloading/SHOW_LOAD.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: docs/en/loading/cloud_storage_load.md
	deleted by them: docs/zh/loading/cloud_storage_load.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jan 10, 2025
24 tasks
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Jan 10, 2025
@mergify mergify bot closed this Jan 10, 2025
Copy link
Contributor Author

mergify bot commented Jan 10, 2025

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

Signed-off-by: DanRoscigno <[email protected]>
@DanRoscigno DanRoscigno reopened this Jan 10, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 10, 2025 15:55
@wanpengfei-git wanpengfei-git merged commit 7f9b9b2 into branch-3.2 Jan 10, 2025
31 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-54895 branch January 10, 2025 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge conflicts documentation Improvements or additions to documentation version:3.2.15
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants