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

[BugFix] Fix duplicate entries in be_logs; Add reset_delvec in script; Add BE id in error message when query failed (backport #51204) #51349

Merged
merged 1 commit into from
Sep 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 24, 2024

Why I'm doing:

Their are duplicate entries when using be_logs with '.*' parttern.
There is no be ID in error message when query failed.

What I'm doing:

Fix regex match bug in greplog;
Add BE id in error message;
Add a tool to fix corrupted metadata causing "no delete vector found" error;

Fixes #51190

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

Bugfix cherry-pick branch check:

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

This is an automatic backport of pull request #51204 done by [Mergify](https://mergify.com). ## Why I'm doing:

Their are duplicate entries when using be_logs with '.*' parttern.
There is no be ID in error message when query failed.

What I'm doing:

Fix regex match bug in greplog;
Add BE id in error message;
Add a tool to fix corrupted metadata causing "no delete vector found" error;

Fixes #51190

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

@mergify mergify bot added the conflicts label Sep 24, 2024
Copy link
Contributor Author

mergify bot commented Sep 24, 2024

Cherry-pick of 52c55f9 has failed:

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

You are currently cherry-picking commit 52c55f9c2b.
  (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/common/greplog.h
	modified:   be/src/exec/pipeline/pipeline_driver_executor.cpp
	modified:   be/src/exec/schema_scanner/schema_be_logs_scanner.cpp
	modified:   be/src/http/action/greplog_action.cpp
	modified:   be/src/script/script.cpp
	modified:   be/src/service/backend_options.cpp
	modified:   be/src/service/service_be/starrocks_be.cpp
	modified:   test/sql/test_array_fn/R/test_array_fn
	modified:   test/sql/test_decimal/R/test_decimal_overflow
	modified:   test/sql/test_function/R/test_time_slice
	modified:   test/sql/test_generate_series/R/test_generate_series
	modified:   test/sql/test_trino_dialect/R/test_trino_dialect
	modified:   test/sql/test_udf/R/test_jvm_udf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   be/src/common/greplog.cpp
	both modified:   be/src/service/backend_options.h
	both modified:   be/test/storage/tablet_updates_test.cpp
	deleted by us:   test/sql/test_array_fn/R/test_array_sortby
	deleted by us:   test/sql/test_dict_mapping_function/R/test_dict_mapping_function
	deleted by us:   test/sql/test_dictionary/R/test_dictionary
	deleted by us:   test/sql/test_external_file/R/test_orc_predicates
	deleted by us:   test/sql/test_group_execution/R/test_group_execution_join
	deleted by us:   test/sql/test_inverted_index/R/test_inverted_index
	both modified:   test/sql/test_json/R/to_json
	both modified:   test/sql/test_string_functions/R/test_string_functions

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

Copy link
Contributor Author

mergify bot commented Sep 24, 2024

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

@decster decster reopened this Sep 24, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 24, 2024 16:59
@decster decster force-pushed the mergify/bp/branch-3.1/pr-51204 branch from cd1470b to 0f66517 Compare September 24, 2024 17:03
…; Add BE id in error message when query failed (#51204)

Signed-off-by: Binglin Chang <[email protected]>
(cherry picked from commit 52c55f9)
@decster decster force-pushed the mergify/bp/branch-3.1/pr-51204 branch from 0f66517 to 3efcc62 Compare September 24, 2024 17:23
@wanpengfei-git wanpengfei-git merged commit 334ed99 into branch-3.1 Sep 24, 2024
31 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.1/pr-51204 branch September 24, 2024 17:51
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.

2 participants