This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 034aa20b0a [fix](regression)when using regression-conf-custom.groovy,
properties in regression-conf.groovy are missing #14458
034aa20b0a is described below
commit 034aa20b0aaba53fef8ceca5a75fa65188d93bc9
Author: minghong <minghong.z...@163.com>
AuthorDate: Tue Nov 22 08:44:50 2022 +0800
[fix](regression)when using regression-conf-custom.groovy, properties in
regression-conf.groovy are missing #14458
---
.../groovy/org/apache/doris/regression/Config.groovy | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index 06656fff54..c334ae97f2 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -123,16 +123,12 @@ class Config {
def systemProperties =
Maps.newLinkedHashMap(System.getProperties())
configSlurper.setBinding(systemProperties)
ConfigObject configObj = configSlurper.parse(new
File(confFilePath).toURI().toURL())
- config = Config.fromConfigObject(configObj)
- }
- String customConfFilePath = confFile.getParentFile().getPath() +
"/regression-conf-custom.groovy"
- File custFile = new File(customConfFilePath)
- if (custFile.exists() && custFile.isFile()) {
- log.info("Load custom config file
${customConfFilePath}".toString())
- def configSlurper = new ConfigSlurper()
- def systemProperties =
Maps.newLinkedHashMap(System.getProperties())
- configSlurper.setBinding(systemProperties)
- ConfigObject configObj = configSlurper.parse(new
File(customConfFilePath).toURI().toURL())
+ String customConfFilePath = confFile.getParentFile().getPath() +
"/regression-conf-custom.groovy"
+ File custFile = new File(customConfFilePath)
+ if (custFile.exists() && custFile.isFile()) {
+ ConfigObject custConfigObj = configSlurper.parse(new
File(customConfFilePath).toURI().toURL())
+ configObj.merge(custConfigObj)
+ }
config = Config.fromConfigObject(configObj)
}
fillDefaultConfig(config)
@@ -274,7 +270,8 @@ class Config {
}
if (config.jdbcUrl == null) {
- config.jdbcUrl = "jdbc:mysql://127.0.0.1:9030"
+ //jdbcUrl needs parameter here. Refer to function: buildUrl(String
dbName)
+ config.jdbcUrl =
"jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true"
log.info("Set jdbcUrl to '${config.jdbcUrl}' because not
specify.".toString())
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
