This is an automated email from the ASF dual-hosted git repository.
chengjie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 08cbcfca1 remove unnecessary log print
new f81179420 Merge pull request #5037 from WeDataSphere/master-remove-log
08cbcfca1 is described below
commit 08cbcfca140afebae10e1582ee87721578719ded
Author: peacewong <[email protected]>
AuthorDate: Wed Dec 13 11:46:11 2023 +0800
remove unnecessary log print
---
.github/workflows/publish-snapshot.yml | 2 +-
.../linkis/manager/am/restful/ECResourceInfoRestfulApi.java | 3 +--
.../org/apache/linkis/manager/am/restful/EngineRestfulApi.java | 3 +--
linkis-dist/deploy-config/linkis-env.sh | 2 +-
.../apache/linkis/engineplugin/spark/executor/SQLSession.scala | 1 +
.../configuration/restful/api/TemplateManagerRestfulApi.java | 9 +++------
.../apache/linkis/metadata/query/service/OracleMetaService.java | 3 +--
.../apache/linkis/metadata/query/service/MongoDbConnection.java | 6 +-----
8 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/publish-snapshot.yml
b/.github/workflows/publish-snapshot.yml
index 8bb65c90f..dfcee9e22 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
branch:
- - dev-1.4.0
+ - dev-1.5.0
steps:
- name: Checkout repository
uses: actions/checkout@v2
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
index 0ff9ef93e..c3c14a809 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
@@ -237,8 +237,7 @@ public class ECResourceInfoRestfulApi {
// check special admin token
if (StringUtils.isNotBlank(token)) {
if (!Configuration.isAdminToken(token)) {
- logger.warn("Token:{} has no permission to query ecList.", token);
- return Message.error("Token:" + token + " has no permission to query
ecList.");
+ return Message.error("Token has no permission to query ecList.");
}
} else if (!Configuration.isAdmin(username)) {
logger.warn("User:{} has no permission to query ecList.", username);
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
index 14cad1380..355ce2e9c 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
@@ -479,8 +479,7 @@ public class EngineRestfulApi {
// check special token
if (StringUtils.isNotBlank(token)) {
if (!Configuration.isAdminToken(token)) {
- logger.warn("Token {} has no permission to asyn kill engines.", token);
- return Message.error("Token:" + token + " has no permission to asyn
kill engines.");
+ return Message.error("Token has no permission to asyn kill engines.");
}
} else if (!Configuration.isAdmin(username)) {
logger.warn("User {} has no permission to asyn kill engines.", username);
diff --git a/linkis-dist/deploy-config/linkis-env.sh
b/linkis-dist/deploy-config/linkis-env.sh
index fed49826b..5578e2527 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -167,7 +167,7 @@ export SERVER_HEAP_SIZE="512M"
##The extended lib such mysql-connector-java-*.jar
#LINKIS_EXTENDED_LIB=/appcom/common/linkisExtendedLib
-LINKIS_VERSION=1.4.0
+LINKIS_VERSION=1.5.0
# for install
LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
index 77fe9ca97..6e302b440 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
@@ -69,6 +69,7 @@ object SQLSession extends Logging {
"Spark application sc has already stopped, please restart it."
)
}
+
val startTime = System.currentTimeMillis()
// sc.setJobGroup(jobGroup, "Get IDE-SQL Results.", false)
diff --git
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java
index 7ed5c4e57..e0d52d423 100644
---
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java
+++
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java
@@ -86,8 +86,7 @@ public class TemplateManagerRestfulApi {
// check special admin token
if (StringUtils.isNotBlank(token)) {
if (!Configuration.isAdminToken(token)) {
- logger.warn("Token:{} has no permission to updateKeyMapping.", token);
- return Message.error("Token:" + token + " has no permission to
updateKeyMapping.");
+ return Message.error("Token has no permission to updateKeyMapping.");
}
} else if (!Configuration.isAdmin(username)) {
logger.warn("User:{} has no permission to updateKeyMapping.", username);
@@ -160,8 +159,7 @@ public class TemplateManagerRestfulApi {
// check special admin token
if (StringUtils.isNotBlank(token)) {
if (!Configuration.isAdminToken(token)) {
- logger.warn("Token:{} has no permission to queryKeyInfoList.", token);
- return Message.error("Token:" + token + " has no permission to
queryKeyInfoList.");
+ return Message.error("Token has no permission to queryKeyInfoList.");
}
} else if (!Configuration.isAdmin(username)) {
logger.warn("User:{} has no permission to queryKeyInfoList.", username);
@@ -212,8 +210,7 @@ public class TemplateManagerRestfulApi {
// check special admin token
if (StringUtils.isNotBlank(token)) {
if (!Configuration.isAdminToken(token)) {
- logger.warn("Token:{} has no permission to apply.", token);
- return Message.error("Token:" + token + " has no permission to
apply.");
+ return Message.error("Token has no permission to apply.");
}
} else if (!Configuration.isAdmin(username)) {
logger.warn("User:{} has no permission to apply.", username);
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
index 71f659595..e048d71bd 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
@@ -74,11 +74,10 @@ public class OracleMetaService extends
AbstractDbMetaService<SqlConnection> {
assert extraParams != null;
LOG.info("oracle connection params:{}", params.toString());
LOG.info(
- "oracle connection
host:{},port:{},username:{},password:{},database:{}",
+ "oracle connection host:{},port:{},username:{},database:{}",
host,
port,
username,
- password,
database);
return new MetadataConnection<>(
new SqlConnection(host, port, username, password, database,
serviceName, extraParams));
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
index 7a5292852..3586982bb 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
@@ -177,11 +177,7 @@ public class MongoDbConnection implements Closeable {
private MongoClient getDBConnection(ConnectMessage connectMessage, String
database)
throws Exception {
- LOG.info(
- "mongo information is database:{}, username:{}, passwordd:{} ",
- database,
- connectMessage.username,
- connectMessage.password);
+ LOG.info("mongo information is database:{}, username:{}", database,
connectMessage.username);
MongoClient client = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
