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

WIP: feat(merge): merge main to feat/424_taskframework #1310

Closed
wants to merge 113 commits into from

Conversation

krihy
Copy link
Collaborator

@krihy krihy commented Dec 27, 2023

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.:


ungreat and others added 30 commits November 27, 2023 17:18
…g_add_odc_monitor

# Conflicts:
#	server/odc-server/src/main/resources/log4j2.xml
#	server/odc-service/src/main/java/com/oceanbase/odc/service/systemconfig/DbConfigChangeMatcher.java
* add DataX dependency

* add datax.jar

* use Hikari to replace Druid

* currently remove ThroughputMonitor

* use plugins to replace accessor

* fix pattern

* clean up files

* remove redundant params

* format code

* remove decrease count

* resolve conflicts

* fix file pattern

* fix sorted  bug

* log summary in finally block

* fix UT failures

* change file regex

* use ScheduledExecutorService instead of 'new Thread'

* call datax by process

* fix a bug

* fix UT

* remove unused variable

* support configure jvm params for datax

* response to CR comments

---------

Co-authored-by: IL MARE <[email protected]>
* fix there is no min,hor,sec in date

* fix issue #937

* fix type error

* fix unit test error
* fix: not clear inactive connection

* fix: create connectionConfig by built-in admin user in bastion

* refine

* fix: ut

* fix ut and refine

* fix

* fix: H2 SQL syntax error
* add ServletConfiguration to set properties of filters

* set dispatcherServlet property

---------

Co-authored-by: IL MARE <[email protected]>
…iple sqls during sql interception stage and pre-check stage (#976)

* stash

* adapt oboracle

* adapt SqlSplitter

* fix

* refacto

* adapt

* fix ut cases

* adapt to iterator

* add log

* efficiency opt

* code format

* fix

* refactor ut

* delete unused method

* update submodule

* response to comments

* fix

* bugfix

* fix

* Revert "fix"

This reverts commit 6aa6eba.

* adapt

* fix

* fix NPE

* delete config

* response to comments

---------

Co-authored-by: IL MARE <[email protected]>
… names (#1011)

* fix: horizontal unauthorized

* code format

* fix ut

---------

Co-authored-by: IL MARE <[email protected]>
…ole (#1019)

* fix: permission

* delete useless codes
…ponse (#1039)

* fix: parse response

* fix: ut

* fix: ut
…roject (#968)

* fix: block internal database when auto-sync

* code foramt

* fix: allow transfer blocked databases
* update submodule

* refactor rule applying

* init default rule applyings

* update submodule

* stash

* stash

* fix typo

* delete config

* delete unused code

* add ut case

* add ut cases
* fix drop check rule

* fix sql check's npe

* add inteceptor order

* fix failed to locate issue line

* fix unit test error
#1053)

* fix mysql1479 get partition

* delete empty line
ungreat and others added 28 commits December 19, 2023 14:35
* add bilk save for nodes

* add test cases

* make bind flow element batch

* create instance node on building topo

* fix unit test

* merge yiang's code

* add several repo

* use batch to insert entity

* add batchUpdate into OdcJpaRepository

* use batchCreate method

* self test fix

* make shortUniqueId transient

---------

Co-authored-by: ungreat <[email protected]>
* fix: apply project task print log error

* fix: execution deadline time display failed
… ob-mysql (#1253)

* adapt to the dialect type of frond end donot include ODP sharding mysql

* response to review
…1266)

* close resource

* format

* review

* update submodule

---------

Co-authored-by: yh263208 <[email protected]>
#1227)

* upgrade mock version

* upgrade mock version

* optimize log printing

* make driver compatible to ojdbc 8

* add npe

* add data mock compress method

* optimize log printing

* remove useless comments

* fix issue #189

* supports mysql80

* add concurrent config

* fix internation

* control front end's mock limit

* add max output size limit

* refact err msg

* change version and remove useless code

* supports lowercase env

* upgrade submodule

* increase max count of mock data
* supports get log for DLM job.

* supports get log for DLM job.

* supports get log for DLM job.

* supports get log for DLM job.

* supports get log for DLM job.

* update path pattern

* code format

* Remove redundant code

* destroy thread pool after task finished.

* check task parameters when update schedule task.

* init cluster name.

* fix NPE when variables are not exist.

* Verify whether the data source is a cluster instance

* Supports configuring connection timeout.

* Supports configuring sharding strategy.

* modify default sharding strategy.

* Remove redundant code

* fix create dlm job failed in MySql mode.

* Fix edit limit config and description not taking effect

* fix interrupt task failed.

* check job status before update.

* fix restart job failed.

* fix restart job failed.

* fix restart job failed.

* fix restart job failed.

* format

* update submodule commit id

* do not check cluster name when create job.

* support configuring scan batch size.

* merge 4.2.x to current branch.

* change default sharding strategy.

* code format

* response comments

* fix sharding strategy configuration didn't work.

* upgrade sdk version

* fix ut

* fix description of key

* update default sharding strategy.
* fix mock data charset error

* optimize code
* add change log

* fix type err

* response to cr comments

* update submodule

* update changelog

* add odp to changelog

* update changelog

* add change log.

* response to cr comments

* response to cr comments

* response to cr comments

* response to cr comments

* add eng change log

* update change log

* fix type error

* remove dot

* remove lfs

---------

Co-authored-by: tinker <[email protected]>
…ace (#1274)

while use spring security configure straightly, the CsrfFilter refer invalid session strategy firstly of AccessDeniedHandler in CsrfFilter.

new the CsrfFiler manual, make csrf token lifecytle decouple from session manage, to avoid CsrfToken error while logout from private space
* set columns for result set export task

* use url.toURI() instead of url.getFile()

* rename method

* set schema for connectionInfo

* fix result export failed

* create dir if not exists

* rename MySQLWriterPluginParameter#Connection

* fix failed to mask data for mysql result set export task
* fix failed to rewrite sql for mysql

* fix not skip header for export

* only add as for native mysql

* sql format always requires header

* fix an error

* fix no content for table name in Chinese

* avoid NPE
* adjust sql console rule default values

* fix
* upgrade sdk version to 1.0.8

* upgrade sdk version to 1.0.8
…ion (#1294)

* refact max data count of mocking

* update submodule

* upgrade ob-data-mocker's version

* delete unused properties
merge dev/4.2.x into main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants