merge main into 4.3.x #4079
Merged
merge main into 4.3.x #4079
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…failed if statefulroute enabled (#3257)
…name for oracle mode (#3254) * convert to upper case for oracle * fix typo * use lower case for mysql mode * list directory instead of looking up by name
* fix statefulroute * fix statefulroute
…d after clicking manual execution in odc431 (#3279) * Turn off the manual execution button display * add enum PRE_EXECUTION for FlowStatus * remove enum PRE_EXECUTION for FlowStatus
* support configure sharding strategy. * upgrade version to 1.1.4.bp2
…406_into_main # Conflicts: # pom.xml # server/odc-service/src/main/java/com/oceanbase/odc/service/dlm/model/DataDeleteParameters.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/flowtask/DataArchivePreprocessor.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/flowtask/DataDeletePreprocessor.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataDeleteJob.java
merge 202406 into main
…406_into_202407bp # Conflicts: # pom.xml # server/odc-service/src/main/java/com/oceanbase/odc/service/dlm/model/DataDeleteParameters.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/flowtask/DataDeletePreprocessor.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataDeleteJob.java
merge from 202406 into 202407bp
* fix(schedule): list task by creator invalid (#3752) * fix(schedule): optimize the logic for listing schedules and scheduling task (#3769) * opt list schedule & schedue task * bugfix * opt list schedule task * opt list schedule task * opt list schedule task * fix list is empty * support filter by json filed * simply code * simply code * rsp comments * rsp comments * feat(object-storage): use s3 sdk for google cloud storage (#3785) * security(object-storage): add user id into object key (#3786) * fix(dlm): do not print logs if the data source is uninitialized (#3819) * fix(schedule): customize description generator according to different environments (#3815) * Customize description generator according to different environments * code format * fix(dlm): opt error message when editing the limit configuration (#3817) * opt error message * add i18 * rsp comments * feat(schedule):support list schedule filter by datasource name (#3855) * fix(schedule): allowed to filter by datasource name #3859 * fix(schedule): list datasources with attributes (#3862) * support list schedule filter by datasource name. * list datasource with attributes * fix(schedule): schedule can be edited while subtasks are still in progress (#3891) * bugfix * bugfix * fix(database-change): delete with check schedule task status (#3899) * fix:delete schedule with check schedule task status * response comment. * code format --------- Co-authored-by: kiko <[email protected]> Co-authored-by: LuckyLeo <[email protected]>
* fix duplicate sessionId * fix
* fix * fix * fix * fix * fix * change to data.sql * change to data.sql * change to data.sql
* default disable actuator * default disable actuator * default disable actuator
* default disable actuator * default disable actuator
merge dev/4.3.2 into main
# Conflicts: # server/odc-server/src/main/java/com/oceanbase/odc/agent/runtime/TaskMonitor.java # server/odc-server/src/main/resources/data.sql # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleTaskService.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/factory/ScheduleResponseMapperFactory.java
guowl3
requested review from
Jane201510,
JessieWuJiexi,
LioRoger,
MarkPotato777 and
LuckyPickleZZ
as code owners
guowl3
requested review from
CHLK,
zijiacj,
kiko-art and
PeachThinking
as code owners
LuckyPickleZZ
previously approved these changes
Dec 20, 2024
guowl3
dismissed stale reviews from LuckyPickleZZ, kiko-art, PeachThinking, and LioRoger
via
41c895c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Additional documentation e.g., usage docs, etc.: