merge 202502bp into main#4486
Merged
Merged
Conversation
* support community edition export * fix * fix * fix * fix
* add schedule terminate service * fix * fix * review * review * review * fix stateful route
…_dependence fix(scheudle): fix cycle dependence
* fix * fix
…led_by_log_file_expired fix(task): detail task may failed by log file expired
…cular_dependency fix(flowable): fix circular dependency
* fix(taskframework): wrong status when task finished (#4465) * upgrade version to 1.2.6 * upgrade version to 1.2.6 * PullRequest: 18 merge 202502bp to 434 Merge branch tianke_434bp_merge_202502bp of git@code.alipay.com:oceanbase-cloud-platform/odc-mirror.git into dev/4.3.4 https://code.alipay.com/oceanbase-cloud-platform/odc-mirror/pull_requests/18?tab=diff Reviewed-by: 乐别 <yinuo.pyn@oceanbase.com> * upgrade sdk version to 1.2.3.1 * opt log info * opt log info * opt log info * opt task status * opt task status * opt task status * opt task status * opt task status * merge 202502bp to 434 * merge 202502bp to 434 * add log for status * add log for status * add log for status * fix the issue of read old result * remove log * remove log * remove duplicate dependency * remove duplicate dependency * fix conflict * fix conflict
# Conflicts: # pom.xml # server/odc-server/src/main/java/com/oceanbase/odc/server/web/controller/v2/ScheduleController.java # server/odc-service/src/main/java/com/oceanbase/odc/service/connection/database/DatabaseService.java # server/odc-service/src/main/java/com/oceanbase/odc/service/flow/FlowInstanceService.java # server/odc-service/src/main/java/com/oceanbase/odc/service/flow/factory/FlowResponseMapperFactory.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleExportService.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveDeleteJob.java # server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveRollbackJob.java # server/odc-service/src/main/java/com/oceanbase/odc/service/state/StatefulUuidStateIdGenerator.java
guowl3
requested review from
LioRoger,
LuckyPickleZZ,
MarkPotato777,
PeachThinking,
kiko-art and
zijiacj
as code owners
Collaborator
|
GLTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Conflicts:
pom.xml
server/odc-server/src/main/java/com/oceanbase/odc/server/web/controller/v2/ScheduleController.java
server/odc-service/src/main/java/com/oceanbase/odc/service/connection/database/DatabaseService.java
server/odc-service/src/main/java/com/oceanbase/odc/service/flow/FlowInstanceService.java
server/odc-service/src/main/java/com/oceanbase/odc/service/flow/factory/FlowResponseMapperFactory.java
server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java
server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleExportService.java
server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveDeleteJob.java
server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveRollbackJob.java
server/odc-service/src/main/java/com/oceanbase/odc/service/state/StatefulUuidStateIdGenerator.java