You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/04/04 16:02:16 UTC
[linkis] branch dev-1.4.0 updated: fix(common util)：fix getStringToMap function bug about ECResourceInfoUtils
This is an automated email from the ASF dual-hosted git repository.
casion 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 241894879 fix(common util)：fix getStringToMap function bug about ECResourceInfoUtils
new 6366265df Merge pull request #4430 from WeDataSphere/fix/fix-ECResourceInfoUtils
241894879 is described below
commit 241894879efe028845d78d8e6d1b5981d8262b83
Author: YaoMambaForever <73...@qq.com>
AuthorDate: Mon Apr 3 09:41:23 2023 +0800
fix(common util)：fix getStringToMap function bug about ECResourceInfoUtils
---
.../manager/am/util/ECResourceInfoUtils.java | 2 +-
.../manager/am/util/ECResourceInfoUtilsTest.java | 52 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
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 ab926df64..5fc852966 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
@@ -61,7 +61,7 @@ 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());
- String memoryStr = String.valueOf(map.getOrDefault("memory", "0k"));
+ String memoryStr = String.valueOf(divermap.getOrDefault("memory", "0k"));
long memorylong = 0;
if (!getScientific(memoryStr)) {
memorylong = ByteTimeUtils.byteStringAsBytes(memoryStr);
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/test/java/org/apache/linkis/manager/am/util/ECResourceInfoUtilsTest.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/test/java/org/apache/linkis/manager/am/util/ECResourceInfoUtilsTest.java
new file mode 100644
index 000000000..1d1ce10cf
--- /dev/null
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/test/java/org/apache/linkis/manager/am/util/ECResourceInfoUtilsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.manager.am.util;
+
+import org.apache.linkis.common.utils.ByteTimeUtils;
+import org.apache.linkis.manager.am.vo.ResourceVo;
+import org.apache.linkis.manager.common.entity.persistence.ECResourceInfoRecord;
+import org.apache.linkis.server.BDPJettyServerHelper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/** ECResourceInfoUtilsTest */
+public class ECResourceInfoUtilsTest {
+
+ @Test
+ public void testGetStringToMap() throws Exception {
+ ECResourceInfoRecord info = new ECResourceInfoRecord();
+ info.setLabelValue("hadoop-LINKISCLI,spark-2.4.3");
+ String str =
+ "{\"driver\":{\"instance\":1,\"memory\":\"3.0 GB\",\"cpu\":1}, \"yarn\":{\"queueName\":\"dws\",\"queueMemory\":\"2.0 GB\", \"queueCpu\":2, \"instance\":0}} ";
+ Map<String, Object> map = BDPJettyServerHelper.gson().fromJson(str, new HashMap<>().getClass());
+ ResourceVo resourceVO = ECResourceInfoUtils.getStringToMap(str, info);
+ Map diverMap = (Map) map.get("driver");
+ Assertions.assertEquals(
+ resourceVO.getInstance(), ((Double) diverMap.get("instance")).intValue());
+ Assertions.assertEquals(resourceVO.getInstance(), 1);
+ Assertions.assertEquals(resourceVO.getCores(), ((Double) diverMap.get("cpu")).intValue());
+ Assertions.assertEquals(resourceVO.getCores(), 1);
+ Assertions.assertEquals(
+ resourceVO.getMemory(),
+ ByteTimeUtils.byteStringAsBytes(String.valueOf(diverMap.getOrDefault("memory", "0k"))));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org