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

merge from dev/4.2.1 to main #469

Merged
merged 74 commits into from
Oct 10, 2023
Merged

merge from dev/4.2.1 to main #469

merged 74 commits into from
Oct 10, 2023

Conversation

yhilmare
Copy link
Contributor

What type of PR is this?

What this PR does / why we need it:

merge from dev/4.2.1 to main

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Additional documentation e.g., usage docs, etc.:


krihy and others added 30 commits August 28, 2023 17:02
* reactor oms client

* oms replaced by OceanBase Migration Service (OMS) in ErrorMessages.properties
* [Feature]: support ODP Sharding MySQL and MySQL (#34)

* support ODP Sharding MySQL and MySQL

* modify mysql odc_version_diff_config

* Partition plan adaptation to database management. (#54)

* commit test.

* Partition plan adaptation to database management

* response comment

* response comment

* init flow instance id

* delete confirm node and fix api request parameter.

* update mapper to latest version.

* refine(workflow): add new workflow for building artifact and refine config (#61)

* refine: workflow

* response to CR

* rollback build_release

* refine

* fix(workflow): build rpm failed when execute build_artifact.yaml (#72)

* refine

* fix: build rpm execute failed

* refine

---------

Co-authored-by: zhangxiao <140503120+PeachThinking@users.noreply.github.com>
Co-authored-by: guowl3 <70270140+guowl3@users.noreply.github.com>
Co-authored-by: gaoda.xy <gaoda.xy@oceanbase.com>
* refactor(workflow): add mvn install step for dev

* refactor(workflow): add mvn install step for dev
* reactor oms client

* 1.add osc expired time when exceed oscTaskExpiredAfterSeconds
2.release oms project before start next schedule task
3.set current schedule task id quartz data map
and reschedule job before start next

* oms replaced by OceanBase Migration Service (OMS) in ErrorMessages.properties

* add OmsDataCheckInconsistent in ErrorCodes

* rename method name ContinueHandleProjectStepResult

* 1.start and update schedule trigger by trigger data map

* 1.format code

* 1.optimize update trigger data map

* 1.rename method parameter to triggerDataMap
…ables (#89)

* add .env config file

* 1. fix: read test properties from .env file and system properties

* fix .env not exits,add check properties not empty
* reactor oms client

* 1.add osc expired time when exceed oscTaskExpiredAfterSeconds
2.release oms project before start next schedule task
3.set current schedule task id quartz data map
and reschedule job before start next

* refactor osc swap table

* oms replaced by OceanBase Migration Service (OMS) in ErrorMessages.properties

* add OmsDataCheckInconsistent in ErrorCodes

* rename method name ContinueHandleProjectStepResult

* 1.start and update schedule trigger by trigger data map

* 1.format code
* support type for export

* save export objects when create flow task

* fix get empty result
* fix generate dml slowly

* response CR: refactor method to static
#101)

* 1.fix oracle table name wrapped by quote

* fix npe by get origin table

* drop new table when start task failed

* checkTaskCronExpression has not initlized
* refactor generate new and renamed table

* 1.fix add white list oracle current connection config user to uppercase

* format code

* fix name uppercase

* fix oracle  rename table
* fix alter type generate create ddl

* fix create table ddl

* fix new oracle table upper case

* 1. fix new oracle constraint name too lang

* 1.constraint suffix with char A
* refactor(unit-test): refact unit-test cases

* refactor(unit-test): refact unit-test cases

* refactor(unit-test): refact unit test cases

* Revert "fix(unit-test): read properties from .env and system environment variables (#89)"

This reverts commit 7bc60b5

* refactor(unit-test): rename properties

* refactor(unit-test): rename properties

* refactor(unit-test): rename properties

* refactor(unit-test): refact unit test cases

* refactor(unit-test): rerun github actions
… a ticket (#140)

* fix: external approval

* response to CR

* refine

* response to CR

* fix: cancel external approval

* test
…ons (#133)

* fix(db-session): fix can not get latest query sql when list all sessions

* refactor(OdcDBSession): rename variable

* Revert "refactor(OdcDBSession): rename variable"

This reverts commit 05bfecb

* refactor(OdcDBSession): rename variable
…table create ddl (#135)

* create CreateWalkerOBParserReplaceStatementListener extends alter ddl

* 1.add test case

* 1.format code
guowl3 and others added 18 commits September 15, 2023 15:53
* Fix the issue of the Adapter result being overwritten.

* fix get sys tenant password
* fix(sql-execute): fix failed to print dbms output

* refactor(client): update submodule
…olumn (#364)

* 1.foreign key unsupported
2.check table column is consistent

* 1.check table column is different

* format code
* remove profile annotation

* add DesktopOrganizationResourceMigrator for clientMode

* format code
* 1.foreign key unsupported
2.check table column is consistent

* 1.check table column is different

* format code

* 1.osc support OB_CE
* optimize sync database

* update submodule

* response to comments
* docs(changelog): add changelog for ODC 4.2.1

* docs(changelog): response to cr comments
* fix validate condition timeout.

* response comments.
build: remove nvs temp files before nvs use for avoid operation require interaction

build: remove nvs temp files before nvs use for avoid operation require interaction

refine

build: use nvs link instead of nvs use for keep version
Copy link
Contributor

@yizhouxw yizhouxw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@yhilmare yhilmare merged commit a0eccfd into main Oct 10, 2023
11 checks passed
yhilmare added a commit that referenced this pull request Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

9 participants