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

[Refactor] check and handle the error status for functions (#31463) (backport #31466) #49527

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2024

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

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #31466 done by [Mergify](https://mergify.com). 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

…31466)

Signed-off-by: srlch <[email protected]>
(cherry picked from commit 24c5088)

# Conflicts:
#	be/src/service/service_be/starrocks_be.cpp
#	be/src/storage/column_expr_predicate.cpp
#	be/src/storage/data_dir.cpp
#	be/src/storage/merge_iterator.cpp
#	be/src/storage/persistent_index.cpp
#	be/src/storage/persistent_index_compaction_manager.cpp
#	be/src/storage/primary_index.cpp
#	be/src/storage/rowset_column_update_state.cpp
#	be/src/storage/rowset_update_state.cpp
#	be/src/storage/snapshot_manager.cpp
#	be/src/storage/tablet_updates.cpp
#	be/src/util/thrift_rpc_helper.cpp
Copy link
Contributor Author

mergify bot commented Aug 7, 2024

Cherry-pick of 24c5088 has failed:

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

You are currently cherry-picking commit 24c5088a5e.
  (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:   be/src/agent/agent_task.cpp
	modified:   be/src/agent/task_worker_pool.cpp
	modified:   be/src/agent/utils.cpp
	modified:   be/src/exec/json_scanner.cpp
	modified:   be/src/exec/local_file_writer.cpp
	modified:   be/src/exec/tablet_sink.cpp
	modified:   be/src/http/action/stream_load.cpp
	modified:   be/src/http/action/transaction_stream_load.cpp
	modified:   be/src/http/action/update_config_action.cpp
	modified:   be/src/runtime/routine_load/data_consumer_group.cpp
	modified:   be/src/runtime/routine_load/data_consumer_pool.cpp
	modified:   be/src/runtime/routine_load/routine_load_task_executor.cpp
	modified:   be/src/runtime/stream_load/stream_load_context.h
	modified:   be/src/runtime/stream_load/stream_load_pipe.cpp
	modified:   be/src/runtime/stream_load/transaction_mgr.cpp
	modified:   be/src/runtime/stream_load/transaction_mgr.h
	modified:   be/src/service/backend_base.cpp
	modified:   be/src/service/service_be/http_service.cpp
	modified:   be/src/storage/binlog_builder.cpp
	modified:   be/src/storage/binlog_file_writer.cpp
	modified:   be/src/storage/binlog_manager.cpp
	modified:   be/src/storage/column_predicate_rewriter.cpp
	modified:   be/src/storage/compaction.cpp
	modified:   be/src/storage/olap_server.cpp
	modified:   be/src/storage/persistent_index.h
	modified:   be/src/storage/publish_version_manager.cpp
	modified:   be/src/storage/publish_version_manager.h
	modified:   be/src/storage/rowset/bloom_filter_index_reader.cpp
	modified:   be/src/storage/rowset/bloom_filter_index_writer.cpp
	modified:   be/src/storage/rowset/indexed_column_reader.cpp
	modified:   be/src/storage/rowset/rowset.cpp
	modified:   be/src/storage/rowset/rowset.h
	modified:   be/src/storage/rowset/rowset_writer.cpp
	modified:   be/src/storage/rowset/segment_rewriter.cpp
	modified:   be/src/storage/rowset_merger.cpp
	modified:   be/src/storage/seek_tuple.cpp
	modified:   be/src/storage/storage_engine.cpp
	modified:   be/src/storage/tablet.cpp
	modified:   be/src/storage/tablet_manager.cpp
	modified:   be/src/storage/tablet_meta_manager.cpp
	modified:   be/src/storage/tablet_schema.cpp
	modified:   be/src/storage/task/engine_clone_task.cpp
	modified:   be/src/storage/version_graph.cpp
	modified:   be/src/storage/vertical_compaction_task.cpp
	modified:   be/src/tools/meta_tool.cpp
	modified:   be/src/util/defer_op.h
	modified:   be/src/util/failpoint/fail_point.cpp
	modified:   be/src/util/json_converter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/service/service_be/starrocks_be.cpp
	both modified:   be/src/storage/column_expr_predicate.cpp
	both modified:   be/src/storage/data_dir.cpp
	both modified:   be/src/storage/merge_iterator.cpp
	both modified:   be/src/storage/persistent_index.cpp
	both modified:   be/src/storage/persistent_index_compaction_manager.cpp
	both modified:   be/src/storage/primary_index.cpp
	both modified:   be/src/storage/rowset_column_update_state.cpp
	both modified:   be/src/storage/rowset_update_state.cpp
	both modified:   be/src/storage/snapshot_manager.cpp
	both modified:   be/src/storage/tablet_updates.cpp
	both modified:   be/src/util/thrift_rpc_helper.cpp

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 added the conflicts label Aug 7, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) August 7, 2024 11:38
@mergify mergify bot closed this Aug 7, 2024
auto-merge was automatically disabled August 7, 2024 11:39

Pull request was closed

Copy link
Contributor Author

mergify bot commented Aug 7, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-31466 branch August 7, 2024 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant