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

[Enhancement] Support disable table base compaction by time ranges (backport #50120) #51859

Open
wants to merge 7 commits into
base: branch-3.2
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2024

Why I'm doing:

What I'm doing:

Fixes #issue

create table t(k int, v int) properties('base_compaction_forbidden_time_ranges'='* 8-18 * * *');

alter table t set ('base_compaction_forbidden_time_ranges'='* 7-20 * * *');

alter table t set ('base_compaction_forbidden_time_ranges'='');

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 #50120 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

Fixes #issue

create table t(k int, v int) properties('base_compaction_forbidden_time_ranges'='* 8-18 * * *');

alter table t set ('base_compaction_forbidden_time_ranges'='* 7-20 * * *');

alter table t set ('base_compaction_forbidden_time_ranges'='');

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

…50120)

Signed-off-by: meegoo <[email protected]>
(cherry picked from commit 1c8e4b9)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/alter/AlterJobExecutor.java
#	fe/fe-core/src/main/java/com/starrocks/alter/SchemaChangeHandler.java
#	fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
#	fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java
#	fe/fe-core/src/main/java/com/starrocks/common/util/PropertyAnalyzer.java
#	fe/fe-core/src/main/java/com/starrocks/journal/JournalEntity.java
#	fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java
#	fe/fe-core/src/main/java/com/starrocks/persist/OperationType.java
#	fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
#	fe/fe-core/src/main/java/com/starrocks/server/OlapTableFactory.java
#	fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseVisitor.java
#	fe/fe-core/src/test/java/com/starrocks/persist/OperationTypeTest.java
#	gensrc/thrift/AgentService.thrift
@mergify mergify bot added the conflicts label Oct 13, 2024
Copy link
Contributor Author

mergify bot commented Oct 13, 2024

Cherry-pick of 1c8e4b9 has failed:

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

You are currently cherry-picking commit 1c8e4b9cfb.
  (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_common.h
	modified:   be/src/agent/agent_server.cpp
	modified:   be/src/agent/agent_task.cpp
	modified:   be/src/agent/agent_task.h
	modified:   be/src/storage/CMakeLists.txt
	modified:   be/src/storage/compaction_manager.cpp
	modified:   be/src/storage/compaction_manager.h
	new file:   be/src/storage/task/engine_compaction_control_task.cpp
	new file:   be/src/storage/task/engine_compaction_control_task.h
	modified:   be/test/storage/compaction_manager_test.cpp
	modified:   fe/fe-core/pom.xml
	new file:   fe/fe-core/src/main/java/com/starrocks/lake/compaction/CompactionControlScheduler.java
	modified:   fe/fe-core/src/main/java/com/starrocks/leader/LeaderImpl.java
	modified:   fe/fe-core/src/main/java/com/starrocks/task/AgentBatchTask.java
	new file:   fe/fe-core/src/main/java/com/starrocks/task/CompactionControlTask.java
	modified:   gensrc/thrift/Types.thrift
	new file:   test/sql/test_compaction_cron/R/test_compaction_cron
	new file:   test/sql/test_compaction_cron/T/test_compaction_cron

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/AlterJobExecutor.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/SchemaChangeHandler.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/common/util/PropertyAnalyzer.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/journal/JournalEntity.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/persist/OperationType.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/OlapTableFactory.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseVisitor.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/persist/OperationTypeTest.java
	both modified:   gensrc/thrift/AgentService.thrift

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 Oct 13, 2024

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

auto-merge was automatically disabled October 13, 2024 23:06

Pull request was closed

@meegoo meegoo reopened this Oct 13, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 13, 2024 23:08
Signed-off-by: meegoo <[email protected]>
Signed-off-by: meegoo <[email protected]>
Signed-off-by: meegoo <[email protected]>
@meegoo meegoo disabled auto-merge October 14, 2024 00:49
Signed-off-by: meegoo <[email protected]>
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 14, 2024 05:58
@meegoo meegoo disabled auto-merge October 14, 2024 06:15
Signed-off-by: meegoo <[email protected]>
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 14, 2024 07:43
@meegoo meegoo disabled auto-merge October 14, 2024 07:47
Signed-off-by: meegoo <[email protected]>
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 14, 2024 08:32
Copy link

sonarcloud bot commented Oct 14, 2024

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