This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new f979d20b2 Fixed historical data display issues(#3625)
f979d20b2 is described below
commit f979d20b25550f965d1be0a285afec6b2d686be3
Author: huangKai-2323 <[email protected]>
AuthorDate: Wed Oct 19 10:46:14 2022 +0800
Fixed historical data display issues(#3625)
---
.../linkis/manager/am/util/ECResourceInfoUtils.java | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
index cb4e79192..8f36f467f 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
@@ -60,15 +60,25 @@ public class ECResourceInfoUtils {
Map<String, Object> divermap = MapUtils.getMap(map, "driver");
resourceVo.setInstance(((Double)
divermap.get("instance")).intValue());
resourceVo.setCores(((Double) divermap.get("cpu")).intValue());
-
resourceVo.setMemory(ByteTimeUtils.byteStringAsBytes(divermap.get("memory").toString()));
+ String memoryStr = String.valueOf(map.get("memory"));
+ long memorylong = 0;
+ if (!getScientific(memoryStr)) {
+ memorylong = ByteTimeUtils.byteStringAsBytes(memoryStr);
+ }
+ resourceVo.setMemory(memorylong);
return resourceVo;
} else {
logger.warn("Compatible with old data ,{},{}", info.getLabelValue(),
info);
return null; // Compatible with old data
}
}
+ String memoryStr = String.valueOf(map.get("memory"));
+ long memorylong = 0;
+ if (!getScientific(memoryStr)) {
+ memorylong = ByteTimeUtils.byteStringAsBytes(memoryStr);
+ }
resourceVo.setInstance(((Double) map.get("instance")).intValue());
-
resourceVo.setMemory(ByteTimeUtils.byteStringAsBytes((map.get("memory").toString())));
+ resourceVo.setMemory(memorylong);
Double core = null == map.get("cpu") ? (Double) map.get("cores") :
(Double) map.get("cpu");
resourceVo.setCores(core.intValue());
}
@@ -95,4 +105,10 @@ public class ECResourceInfoUtils {
engineNode.setUpdateTime(ecInfo.getReleaseTime());
return engineNode;
}
+
+ public static boolean getScientific(String input) {
+ String regx = "^((-?\\d+.?\\d*)[Ee]{1}(-?\\d+))$";
+ Pattern pattern = Pattern.compile(regx);
+ return pattern.matcher(input).matches();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
