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 dev-1.2.0 into master #2901

Merged
merged 16 commits into from
Aug 19, 2022
Merged

Conversation

casionone
Copy link
Contributor

Merge dev-1.2.0 into master

aiceflower and others added 16 commits August 15, 2022 22:51
* SQL script update for 1.2.0

* update linkis.es.cluster configuration default value
* Fixed the console configuration not working
* Change the ES datasource parameters to be consistent with others
…ed version (apache#2821)

* optimize:datasource support query info api  with published version parameters
* optimeze es cluster url: support http:// prefix

* optimize code
* add ES version conf

Co-authored-by: casionone <[email protected]>
* update ES and Presto dml sql

* little ajdust dml default value

Co-authored-by: casionone <[email protected]>
* update README

* adjust url
* add dead-linki-checker action
# Conflicts:
#	.github/workflows/dead-link-checker.yaml
#	README_CN.md
Copy link
Contributor

@liuyou2 liuyou2 left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link

codecov bot commented Aug 19, 2022

Codecov Report

Merging #2901 (40b6e20) into master (123a297) will increase coverage by 0.01%.
The diff coverage is 5.40%.

@@             Coverage Diff              @@
##             master    #2901      +/-   ##
============================================
+ Coverage     14.66%   14.68%   +0.01%     
+ Complexity     1165     1162       -3     
============================================
  Files           740      741       +1     
  Lines         23263    23205      -58     
  Branches       3452     3436      -16     
============================================
- Hits           3412     3408       -4     
+ Misses        19390    19334      -56     
- Partials        461      463       +2     
Impacted Files Coverage Δ
...lugin/jdbc/exception/JDBCDatasourceException.scala 0.00% <0.00%> (ø)
...eplugin/jdbc/executer/JDBCEngineConnExecutor.scala 2.46% <0.00%> (-0.12%) ⬇️
...manager/core/restful/DataSourceCoreRestfulApi.java 88.74% <0.00%> (-4.44%) ⬇️
...r/core/service/impl/DataSourceInfoServiceImpl.java 45.45% <0.00%> (-1.88%) ⬇️
...ugin/jdbc/executer/JDBCMultiDatasourceParser.scala 51.64% <33.33%> (+1.64%) ⬆️
.../org/apache/linkis/common/conf/Configuration.scala 53.33% <100.00%> (ø)
...a/org/apache/linkis/scheduler/queue/Consumer.scala 85.71% <0.00%> (-14.29%) ⬇️
...ngineplugin/spark/cs/CSSparkPreExecutionHook.scala 7.69% <0.00%> (-0.65%) ⬇️
...org/apache/linkis/common/utils/VariableUtils.scala 59.19% <0.00%> (-0.58%) ⬇️
...s/manager/engineplugin/jdbc/ConnectionManager.java 41.23% <0.00%> (-0.48%) ⬇️
... and 2 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@peacewong peacewong merged commit 56f23cc into apache:master Aug 19, 2022
@casionone casionone deleted the master-for-merge branch September 3, 2022 06:47
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.

4 participants