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.x into main #2151

Merged
merged 238 commits into from
Apr 3, 2024
Merged

merge from dev/4.2.x into main #2151

merged 238 commits into from
Apr 3, 2024

Conversation

yhilmare
Copy link
Contributor

@yhilmare yhilmare commented Apr 3, 2024

What type of PR is this?

type-builds

What this PR does / why we need it:

merge from dev/4.2.x into main

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

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


yhilmare and others added 30 commits January 8, 2024 19:20
* add: DB permission control API

* response to CR

* response to CR

* refine API URL

* response to CR

* response to CR
…on (#1364)

* implement OdcDBStructureComparator

* delete SchemaBrowserExtensionPoint

* response to review

* add AbstractDBObjectStructureComparator

* response to review
* permission framework adapt database permission and expire time

* fix typo

* fix: unit test error

* delete PermissionSchedules
…fication metadata (#1344)

* add migration script

* add i18n config

* change table name

* use drop index instead of drop key

* add DO and DTO

* response to CR

* use SpEL instead of map

* format code

* add table `notification_message_send_history`

* fix UT

* response to CR comments

* fix UT failed

* format code

* fix UT

* rename com.oceanbase.odc.notification.policy-metadata.all-events.name

* add index for rate limit query

* response to CR comments

* rename ALL_EVENTS.name
…ode implementation (#1342)

* Structural comparison task interface layer code implementation

* fix ut test

* response to review

* response to review
* add: apply DB permission ticket

* fix: migrate sql version conflict

* fix: migrate sql version conflict

* fix: migrate sql version conflict

* refine: use batch create

* fix: code conflict

* fix: batch create sql column field name

* fix: batch create sql column field name

* fix: add serialVersionUID declaration
* DBSchemaAccessor adapt to native oralce 11g

* fix OBOracleSchemaAccessorTest

* implement DBStatsAccessor for oracle

* add comment

* response to review

* upgrade db-browser version to 1.1.0
* fix issue #1337

* update submodule

* add api for partition plan

* add storage layer

* rename field

* rename class

* corrent i18n

* corrent i18n

* corrent method name

* fix several errors

* remove timeunit

* add more time unit

* rename script

* rename unique index

* move partition plan type to task plugin

* response to cr comments

* trigger git action

* response to cr comments

* response to cr comments
fix(flow):improve list API rt 

---------

Co-authored-by: ungreat <luyiang.lya@digital-engine.com>
* support ldap

* rename

* format

* REVIWE

---------

Co-authored-by: ungreat <luyiang.lya@digital-engine.com>
…#1377)

* add controller and service for notification

* add CRUD for notification policy and message

* update licenses

* fix UT failed

* rename api params

* fix api
…n and supports strings enclosed in single quotes (#1401)

Co-authored-by: IL MARE <yh263208@oceanbase.com>
…arent instance id (#1402)

* Reduce the amount of result set data

* REVIWE

* REVIWE

* REVIWE

* REVIWE

* REVIWE

---------

Co-authored-by: ungreat <luyiang.lya@digital-engine.com>
Co-authored-by: IL MARE <yh263208@oceanbase.com>
…clause (#1410)

* fix: masking failed when using nesting case-when

* refine
…mode in db-browser layer (#1395)

* implement get schema table index/constraints/options methods

* DBObjectEditor version-differentiated implementation for constarints\tableOptions\partition

* add check if support modify parition type

* modify parition type

* fix ddl to convert partitioned table to non-partitioned table

* add handleUpdatePartitionType for generateShadowTableUpdateObjectDDL

* optimize DBTableConstraintEditor#generateCreateObjectDDL code

* Change multi-line comments to single-line comments

* Unifiedly append  ";\n" for generateDropObjectDDL and generateCreateObjectDDL method

* append ";\n" in drop table ddl
* feat(deployment): add datetime output for ob-odc-web.std.log

* refine startup log output

* refine startup log output
* add service layer and plugin impl

* refactor plugin api

* response to cr comments

* remove useless comments
* add list user db permission view and update api

* add: db permision management service

* add: create ticket permission check

* fix: check db permission by resource role

* add: delete db permission when deleting or transferring  db

* add: delete expired db permission before list

* refine

* refine

* fix: ut

* fix: check DB permission

* add: DB permission check in SQL console

* add: DB permission check in pre-check node

* fix: migrate script version conflict

* fix: cock-up

* refine codes

* refine codes and fix some issues

* fix: cancel finished task

* fix some bugs

* fix some bugs

* refine permission check

* fix: partition plan DB permission check

* adapt: audit

* refine codes

* fix: extract schema from SQL consider current default schema

* refine: use '9999-12-31 23:59:59' to represent not expired

* fix: ut

* delete: useless codes

* fix: delete member revoke db permission

* response to CR

* delete useless codes

* response to CR: refact PermissionStatus enums

* response to CR

* response to CR: delete useless column definition for iam_permission

* refine

* response to CR

* change some code to create new github workflow
* Revert "fix(flow): reduce the result set size of the flow Instance query by parent instance id (#1402)"

This reverts commit 349f780.

* Revert "fix(flow):improve list API rt (#1383)"

This reverts commit db06895

* revert
* upgrade ob-loader-dumper to 2.4.8

* add config of sendConnectionAttributes

* exclude dbdiff

* fix UT failed

* move UT packages

* restore loader-dumper to 2.4.5

* test UT

* change logging.level.root

* change logging.level.root

* change logging.root.level

* change application.yml

* exclude some dependency

* clearProperty("logging.level")

---------

Co-authored-by: LuckyPickleZZ <liuyizhuo.lyz@gmail.com>
krihy and others added 22 commits March 29, 2024 11:45
…interrupted and status cannot be terminated (#2030)

* fix docker start

* fix destory to be destoryed

* fix log

* fix cron expresson

* format code

* add process predicate

* format code

* fix for pr comment

* add SilentExecutor

* fix pr for comment

* fix pr for comment

* fix runtime exception

* fix destory process

* fix jobs

* fix terminate

* format code

* format code

* add handleJobRetryingOrFailed

* fix exception

* duplicate destory method

* fix connect to other

* fix update destroyed

* fix predicate

* fix predicate

* fix execution destroyed

* predicate executor be destroyed

* format code

* fix connect timeout

* fix connect timeout

* format code
…2116)

* fix cannot update structure compare task failed status

* re push
* fix process mode

* add alarm in taskframework

* modify alarm

* format code

* fix for comment

* fix mr error

* format code
* fix process mode

* fix job rate limiter

* format code

* remvoe ununsed code

* remvoe ununsed code

* as beean

* add node count

* add node count

* fix unit test

* format code

* for pr comment

* optimize tryacquire

* format code

* add ResourceDetectUtil

* format code

* delete unused code
…hen task-framework be set disabled (#2119)

* add disableb handler

* handler job to failed

* format code

* remove @refresh scope in taskframework enabled

* set TaskFrameworkEnabledProperties as bean

* format code

* fix for comment
* remove delay map when session is expired

* optimize log printing

* fix security issue

* optimize log printing

* add ds permission check

* fix unit test error

* update submodule
* add label service interface

* add label service interface

* add label service interface

* after review and add unit test

* rename

* after review
* fix taskId in MDC take no affect

* rm log

* log level to debug

* jasypt read from config

* add predicate for isEncrypted

* format code
* docs: changelog for v4.2.4

* docs: changelog for v4.2.4

* docs: changelog for v4.2.4

* core doc set jessie as CODE OWNER

* responset to CR comment

* responset to CR comment

* more features for OSC

* refine notification part

* refine enhancement part
… time (#2141)

* query form database

* format code

* add rows  predicate

* add  log

* format code

* remove cache in find

* remove unnecessay code

* remove unnecessay code

* format code
* add findByIdNative

* remove unnecessay code
* docs: init fix info for v4.2.4

* initial en version

* initial en version

* format

* format

* format

* release date 04-02

* response to CR comment

* make markdown link to github issue

* make markdown link to github issue

* fix

* fix link

* response to CR comment

* response to CR comment

* response to CR comment

* add data archiving/cleaning related bug fix

* more issues

* more issue, en version

* refine en wording

* default env supports edit
…t SSRF (#2147)

* add host white url check for notification

* fix typo

* fix typo

* response to CR

* response to CR

* update config key
@yhilmare yhilmare added this to the ODC 4.2.4 milestone Apr 3, 2024
@yhilmare yhilmare requested a review from yizhouxw April 3, 2024 02:41
@yhilmare yhilmare self-assigned this Apr 3, 2024
@yhilmare yhilmare merged commit a51cf5e into main Apr 3, 2024
16 checks passed
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.