This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new 5e267df71 optimize code (#4512)
5e267df71 is described below
commit 5e267df713f167e72814c46782223bf223975ec5
Author: GuoPhilipse <[email protected]>
AuthorDate: Tue May 2 17:20:41 2023 +0800
optimize code (#4512)
---
.../scala/org/apache/linkis/rpc/transform/RPCProduct.scala | 13 -------------
.../linkis/ujes/client/response/JobProgressResult.scala | 2 +-
.../manager/rm/external/yarn/YarnResourceRequester.scala | 2 --
.../apache/linkis/manager/common/utils/ResourceUtils.scala | 4 ++--
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git
a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
index b4f4bd759..afb4d17ea 100644
---
a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
+++
b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
@@ -25,8 +25,6 @@ import org.apache.linkis.rpc.exception.DWCURIException
import org.apache.linkis.rpc.serializer.ProtostuffSerializeUtil
import org.apache.linkis.server.{EXCEPTION_MSG, Message}
-import org.apache.commons.lang3.ClassUtils
-
private[linkis] trait RPCProduct {
def toMessage(t: Any): Message
@@ -40,12 +38,9 @@ private[linkis] trait RPCProduct {
private[linkis] object RPCProduct extends Logging {
private[rpc] val IS_REQUEST_PROTOCOL_CLASS = "rpc_is_request_protocol"
- private[rpc] val IS_SCALA_CLASS = "rpc_is_scala_class"
private[rpc] val CLASS_VALUE = "rpc_object_class"
private[rpc] val OBJECT_VALUE = "rpc_object_value"
- private var serializerClasses: List[Class[_]] = List.empty
-
private val rpcProduct: RPCProduct = new RPCProduct {
override def toMessage(t: Any): Message = {
@@ -88,13 +83,5 @@ private[linkis] object RPCProduct extends Logging {
private[rpc] def isRequestProtocol(obj: Any): Boolean =
obj.isInstanceOf[RequestProtocol]
- private[rpc] def isScalaClass(obj: Any): Boolean =
- (obj.isInstanceOf[Product] && obj.isInstanceOf[Serializable]) ||
- serializerClasses.exists(ClassUtils.isAssignable(obj.getClass, _)) ||
- obj.getClass.getName.startsWith("scala.")
-
- private[rpc] def getSerializableScalaClass(clazz: Class[_]): Class[_] =
- serializerClasses.find(ClassUtils.isAssignable(clazz, _)).getOrElse(clazz)
-
def getRPCProduct: RPCProduct = rpcProduct
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
index 79efe2005..e3330d00a 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
@@ -41,7 +41,7 @@ class JobProgressResult extends UJESJobResult {
.map(map =>
JsonUtils.jackson
.readValue(
- JsonUtils.jackson.writeValueAsString(map, classOf[Map[String,
Any]]),
+ JsonUtils.jackson.writeValueAsString(map.asScala.toMap),
classOf[JobProgressInfo]
)
)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
index 0109f7d32..d403b56dc 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
@@ -352,8 +352,6 @@ class YarnResourceRequester extends
ExternalResourceRequester with Logging {
val response = YarnResourceRequester.httpClient.execute(httpGet)
httpResponse = response
}
- val response = YarnResourceRequester.httpClient.execute(httpGet)
- httpResponse = response
JsonUtils.jackson.readValue(
EntityUtils.toString(httpResponse.getEntity()),
classOf[util.Map[String, Object]]
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
index 6e89039d8..273b20a34 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
@@ -41,7 +41,7 @@ object ResourceUtils {
} else if (resourceType.equals(ResourceType.Yarn)) {
JsonUtils.jackson.readValue(plainResource, classOf[YarnResource])
} else {
- JsonUtils.jackson.readValue(plainResource, classOf[Resource])
+ JsonUtils.jackson.readValue(plainResource, classOf[LoadResource])
}
}
@@ -64,7 +64,7 @@ object ResourceUtils {
} else if (resourceType.equals(ResourceType.Yarn)) {
JsonUtils.jackson.writeValueAsString(resource, classOf[YarnResource])
} else {
- JsonUtils.jackson.writeValueAsString(resource, classOf[Resource])
+ JsonUtils.jackson.writeValueAsString(resource, classOf[LoadResource])
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
