This is an automated email from the ASF dual-hosted git repository.
casion 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 0fe2effe7 [linkis-manager-persistence]fix some dao error and add unit
tests (#3630)
0fe2effe7 is described below
commit 0fe2effe7f76148816ab41a85d3141428bfa22fb
Author: 成彬彬 <[email protected]>
AuthorDate: Thu Oct 13 21:30:14 2022 +0800
[linkis-manager-persistence]fix some dao error and add unit tests (#3630)
---
.../linkis/manager/dao/NodeManagerMapper.java | 12 +-
.../manager/dao/NodeMetricManagerMapper.java | 2 +-
.../linkis/manager/dao/ResourceManagerMapper.java | 4 +-
.../manager/dao/impl/ResourceManagerMapper.xml | 1 -
.../test/java/org/apache/linkis/manager/Scan.java | 26 +-
.../{Scan.java => WebApplicationServer.java} | 33 +--
.../manager/{Scan.java => dao/BaseDaoTest.java} | 34 +--
.../{Scan.java => dao/LockManagerMapperTest.java} | 56 ++--
.../linkis/manager/dao/NodeManagerMapperTest.java | 181 ++++++++++++
.../manager/dao/NodeMetricManagerMapperTest.java | 113 ++++++++
.../manager/dao/ResourceManagerMapperTest.java | 184 +++++++++++++
.../manager/persistence/PersistenceTest.java | 303 ---------------------
.../src/test/resources/application.properties | 41 +++
.../src/test/resources/create.sql | 126 +++++++++
.../core/dao/DataSourceVersionDaoTest.java | 2 +
15 files changed, 719 insertions(+), 399 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeManagerMapper.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeManagerMapper.java
index e8d505ef3..f60cee548 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeManagerMapper.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeManagerMapper.java
@@ -62,15 +62,15 @@ public interface NodeManagerMapper {
@Update({
"update linkis_cg_manager_service_instance set owner =
#{persistenceNode.owner},mark = #{persistenceNode.mark},name =
#{persistenceNode.name},"
- + "update_time = #{persistenceNode.updateTime},create_time =
#{persistenceNode.createTime},updator = #{persistenceNode.updator},creator =
#{persistenceNode.creator} where instance = #{instance}"
+ + "update_time = #{persistenceNode.updateTime},create_time =
#{persistenceNode.createTime},updator = #{persistenceNode.updator},creator =
#{persistenceNode.creator} where instance = #{persistenceNode.instance}"
})
- void updateNodeInstanceOverload(PersistenceNode persistenceNode);
+ void updateNodeInstanceOverload(@Param("persistenceNode") PersistenceNode
persistenceNode);
@Select("select id from linkis_cg_manager_service_instance where instance =
#{instance}")
- int getNodeInstanceId(@Param("instance") String instance);
+ Integer getNodeInstanceId(@Param("instance") String instance);
@Select("select id from linkis_cg_manager_service_instance where instance =
#{instance}")
- int getIdByInstance(@Param("instance") String instance);
+ Integer getIdByInstance(@Param("instance") String instance);
@Select(
"<script>"
@@ -79,7 +79,7 @@ public interface NodeManagerMapper {
+ "#{instance} "
+ "</foreach> "
+ ")</script>")
- List<Integer> getNodeInstanceIds(@Param("serviceInstances") List<String>
instances);
+ List<Integer> getNodeInstanceIds(@Param("instances") List<String> instances);
@Select("select * from linkis_cg_manager_service_instance where instance =
#{instance}")
@Results({
@@ -122,7 +122,7 @@ public interface NodeManagerMapper {
@Result(property = "updateTime", column = "update_time"),
@Result(property = "createTime", column = "create_time")
})
- List<PersistenceNode> getNodesByInstances(@Param("engineNodeIds")
List<String> instances);
+ List<PersistenceNode> getNodesByInstances(@Param("instances") List<String>
instances);
@Insert(
"insert into linkis_cg_manager_engine_em (engine_instance, em_instance,
update_time, create_time)"
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
index 2a8aeb6fe..843d0599e 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
@@ -34,7 +34,7 @@ public interface NodeMetricManagerMapper {
@Select(
"select count(id) from linkis_cg_manager_service_instance_metrics met
inner join linkis_cg_manager_service_instance ins"
+ " on met.instance = #{instance} and ins.instance = #{instance} and
met.instance = ins.instance")
- int checkInstanceExist(@Param("instance") String instance);
+ Integer checkInstanceExist(@Param("instance") String instance);
@Select(
"<script>"
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
index 8e2754c60..1681ad25a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/ResourceManagerMapper.java
@@ -55,7 +55,7 @@ public interface ResourceManagerMapper {
@Select(
"select id from linkis_cg_manager_linkis_resources where ticketId is
null and id in ( select resource_id from linkis_cg_manager_label_resource A
join linkis_cg_manager_label_service_instance B on A.label_id=B.label_id and
B.service_instance=#{instance})")
- int getNodeResourceUpdateResourceId(@Param("instance") String instance);
+ Integer getNodeResourceUpdateResourceId(@Param("instance") String instance);
@Delete(
"delete from linkis_cg_manager_label_resource where label_id in (select
label_id from linkis_cg_manager_label_service_instance where
service_instance=#{instance})")
@@ -89,7 +89,7 @@ public interface ResourceManagerMapper {
PersistenceResource getNodeResourceByTicketId(@Param("ticketId") String
ticketId);
@Select(
- "select * from linkis_cg_manager_linkis_resources where id in (select
resource_id from linkis_cg_manager_label_resource A join
linkis_manager_lable_user B on A.label_id=B.label_id AND
B.user_name=#{userName})")
+ "select * from linkis_cg_manager_linkis_resources where id in (select
resource_id from linkis_cg_manager_label_resource A join
linkis_cg_manager_label_user B on A.label_id=B.label_id AND
B.username=#{userName})")
List<PersistenceResource> getResourceByUserName(@Param("userName") String
userName);
@Select(
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
index 09e40887b..fa76113d0 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ResourceManagerMapper.xml
@@ -38,5 +38,4 @@
SELECT * FROM linkis_cg_manager_linkis_resources WHERE id = #{id}
</select>
-
</mapper>
\ No newline at end of file
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
index 177a3be49..4f931b705 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
@@ -17,27 +17,11 @@
package org.apache.linkis.manager;
-import org.apache.linkis.DataWorkCloudApplication;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.*;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-@ComponentScan(
- value = "org.apache.linkis",
- excludeFilters =
- @ComponentScan.Filter(
- type = FilterType.ASSIGNABLE_TYPE,
- value = DataWorkCloudApplication.class))
-@Configuration
-@EnableAspectJAutoProxy
-public class Scan {
- @Autowired private DataSource dataSource;
+import org.mybatis.spring.annotation.MapperScan;
- @Bean
- public JdbcTemplate getJdbcTemplate() {
- return new JdbcTemplate(dataSource);
- }
-}
+@EnableAutoConfiguration
+@MapperScan("org.apache.linkis.manager")
+public class Scan {}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/WebApplicationServer.java
similarity index 53%
copy from
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
copy to
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/WebApplicationServer.java
index 177a3be49..85b9eb53a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/WebApplicationServer.java
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -17,27 +17,18 @@
package org.apache.linkis.manager;
-import org.apache.linkis.DataWorkCloudApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.ComponentScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
-import org.springframework.jdbc.core.JdbcTemplate;
+@EnableAutoConfiguration
+@ServletComponentScan
+@ComponentScan
+public class WebApplicationServer extends SpringBootServletInitializer {
-import javax.sql.DataSource;
-
-@ComponentScan(
- value = "org.apache.linkis",
- excludeFilters =
- @ComponentScan.Filter(
- type = FilterType.ASSIGNABLE_TYPE,
- value = DataWorkCloudApplication.class))
-@Configuration
-@EnableAspectJAutoProxy
-public class Scan {
- @Autowired private DataSource dataSource;
-
- @Bean
- public JdbcTemplate getJdbcTemplate() {
- return new JdbcTemplate(dataSource);
+ public static void main(String[] args) {
+ new SpringApplicationBuilder(WebApplicationServer.class).run(args);
}
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/BaseDaoTest.java
similarity index 54%
copy from
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
copy to
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/BaseDaoTest.java
index 177a3be49..2e768ed36 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/BaseDaoTest.java
@@ -15,29 +15,17 @@
* limitations under the License.
*/
-package org.apache.linkis.manager;
+package org.apache.linkis.manager.dao;
-import org.apache.linkis.DataWorkCloudApplication;
+import org.apache.linkis.manager.Scan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
-import javax.sql.DataSource;
-
-@ComponentScan(
- value = "org.apache.linkis",
- excludeFilters =
- @ComponentScan.Filter(
- type = FilterType.ASSIGNABLE_TYPE,
- value = DataWorkCloudApplication.class))
-@Configuration
-@EnableAspectJAutoProxy
-public class Scan {
- @Autowired private DataSource dataSource;
-
- @Bean
- public JdbcTemplate getJdbcTemplate() {
- return new JdbcTemplate(dataSource);
- }
-}
+@SpringBootTest(classes = Scan.class)
+@Transactional
+@Rollback(true)
+@EnableTransactionManagement
+public class BaseDaoTest {}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
similarity index 52%
copy from
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
copy to
linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
index 177a3be49..1573bbea2 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/Scan.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/LockManagerMapperTest.java
@@ -15,29 +15,43 @@
* limitations under the License.
*/
-package org.apache.linkis.manager;
+package org.apache.linkis.manager.dao;
-import org.apache.linkis.DataWorkCloudApplication;
+import org.apache.linkis.manager.common.entity.persistence.PersistenceLock;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-
-@ComponentScan(
- value = "org.apache.linkis",
- excludeFilters =
- @ComponentScan.Filter(
- type = FilterType.ASSIGNABLE_TYPE,
- value = DataWorkCloudApplication.class))
-@Configuration
-@EnableAspectJAutoProxy
-public class Scan {
- @Autowired private DataSource dataSource;
-
- @Bean
- public JdbcTemplate getJdbcTemplate() {
- return new JdbcTemplate(dataSource);
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class LockManagerMapperTest extends BaseDaoTest {
+
+ @Autowired LockManagerMapper lockManagerMapper;
+
+ @Test
+ void lock() {
+ lockManagerMapper.lock("testjson", 1L);
+ }
+
+ @Test
+ void unlock() {
+ lockManagerMapper.unlock(1);
+ }
+
+ @Test
+ void getLockersByLockObject() {
+ lock();
+ List<PersistenceLock> list =
lockManagerMapper.getLockersByLockObject("testjson");
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void getAll() {
+ lock();
+ List<PersistenceLock> list = lockManagerMapper.getAll();
+ assertTrue(list.size() >= 1);
}
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeManagerMapperTest.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeManagerMapperTest.java
new file mode 100644
index 000000000..2b3e59929
--- /dev/null
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeManagerMapperTest.java
@@ -0,0 +1,181 @@
+/*
+ * 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.dao;
+
+import org.apache.linkis.manager.common.entity.persistence.PersistenceNode;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class NodeManagerMapperTest extends BaseDaoTest {
+
+ @Autowired NodeManagerMapper nodeManagerMapper;
+
+ @Test
+ void addNodeInstance() {
+ PersistenceNode persistenceNode = new PersistenceNode();
+ persistenceNode.setInstance("instance2");
+ persistenceNode.setName("testname2");
+ persistenceNode.setOwner("testowner2");
+ persistenceNode.setMark("testmark2");
+ persistenceNode.setUpdator("testupdator2");
+ persistenceNode.setCreator("testcreator2");
+ nodeManagerMapper.addNodeInstance(persistenceNode);
+ PersistenceNode persistenceNodes =
nodeManagerMapper.getNodeInstance("instance2");
+ assertTrue(persistenceNodes != null);
+ }
+
+ @Test
+ void updateNodeInstance() {
+ addNodeInstance();
+ PersistenceNode persistenceNode = new PersistenceNode();
+ persistenceNode.setInstance("instance3");
+ persistenceNode.setName("testname3");
+ persistenceNode.setOwner("testowner3");
+ persistenceNode.setMark("testmark3");
+ persistenceNode.setUpdator("testupdator3");
+ persistenceNode.setCreator("testcreator3");
+ nodeManagerMapper.updateNodeInstance("instance2", persistenceNode);
+ PersistenceNode persistenceNodes =
nodeManagerMapper.getNodeInstance("instance3");
+ assertTrue(persistenceNodes != null);
+ }
+
+ @Test
+ void removeNodeInstance() {
+ addNodeInstance();
+ nodeManagerMapper.removeNodeInstance("instance2");
+ PersistenceNode persistenceNodes =
nodeManagerMapper.getNodeInstance("instance2");
+ assertTrue(persistenceNodes == null);
+ }
+
+ @Test
+ void getNodeInstancesByOwner() {
+ addNodeInstance();
+ List<PersistenceNode> list =
nodeManagerMapper.getNodeInstancesByOwner("testowner2");
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void getAllNodes() {
+ addNodeInstance();
+ List<PersistenceNode> list = nodeManagerMapper.getAllNodes();
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void updateNodeInstanceOverload() {
+ addNodeInstance();
+ PersistenceNode persistenceNode = new PersistenceNode();
+ persistenceNode.setInstance("instance2");
+ persistenceNode.setName("testname3");
+ persistenceNode.setOwner("testowner3");
+ persistenceNode.setMark("testmark3");
+ persistenceNode.setUpdator("testupdator3");
+ persistenceNode.setCreator("testcreator3");
+ nodeManagerMapper.updateNodeInstanceOverload(persistenceNode);
+ PersistenceNode persistenceNodes =
nodeManagerMapper.getNodeInstance("instance2");
+ assertTrue(persistenceNode.getName().equals(persistenceNodes.getName()));
+ }
+
+ @Test
+ void getNodeInstanceId() {
+ addNodeInstance();
+ int i = nodeManagerMapper.getNodeInstanceId("instance2");
+ assertTrue(i >= 1);
+ }
+
+ @Test
+ void getIdByInstance() {}
+
+ @Test
+ void getNodeInstanceIds() {
+ addNodeInstance();
+ List<String> stringList = new ArrayList<>();
+ stringList.add("instance1");
+ stringList.add("instance2");
+ List<Integer> list = nodeManagerMapper.getNodeInstanceIds(stringList);
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void getNodeInstance() {
+ PersistenceNode persistenceNode =
nodeManagerMapper.getNodeInstance("instance1");
+ assertTrue(persistenceNode != null);
+ }
+
+ @Test
+ void getNodeInstanceById() {
+ PersistenceNode persistenceNode = nodeManagerMapper.getNodeInstanceById(1);
+ assertTrue(persistenceNode != null);
+ }
+
+ @Test
+ void getEMNodeInstanceByEngineNode() {
+ PersistenceNode persistenceNode =
nodeManagerMapper.getEMNodeInstanceByEngineNode("instance1");
+ assertTrue(persistenceNode != null);
+ }
+
+ @Test
+ void getNodeInstances() {
+ List<PersistenceNode> list =
nodeManagerMapper.getNodeInstances("instance1");
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void getNodesByInstances() {
+ addNodeInstance();
+ List<String> stringList = new ArrayList<>();
+ stringList.add("instance1");
+ stringList.add("instance2");
+ List<PersistenceNode> list =
nodeManagerMapper.getNodesByInstances(stringList);
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void addEngineNode() {
+ nodeManagerMapper.addEngineNode("instance1", "instance1");
+ }
+
+ @Test
+ void deleteEngineNode() {
+ nodeManagerMapper.deleteEngineNode("instance1", "instance1");
+ }
+
+ @Test
+ void getNodeInstanceIdsByOwner() {
+ addNodeInstance();
+ List<Integer> list =
nodeManagerMapper.getNodeInstanceIdsByOwner("testowner2");
+ assertTrue(list.size() >= 1);
+ }
+
+ @Test
+ void updateNodeRelation() {
+ nodeManagerMapper.updateNodeRelation("instance1", "instance2");
+ }
+
+ @Test
+ void updateNodeLabelRelation() {
+ nodeManagerMapper.updateNodeLabelRelation("instance1", "instance2");
+ }
+}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeMetricManagerMapperTest.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeMetricManagerMapperTest.java
new file mode 100644
index 000000000..29d08b0e1
--- /dev/null
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/NodeMetricManagerMapperTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.dao;
+
+import
org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetrics;
+import
org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetricsEntity;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class NodeMetricManagerMapperTest extends BaseDaoTest {
+
+ @Autowired NodeMetricManagerMapper nodeMetricManagerMapper;
+
+ @Test
+ void addNodeMetrics() {
+ PersistenceNodeMetrics nodeMetrics = new PersistenceNodeMetrics();
+ nodeMetrics.setInstance("instance1");
+ nodeMetrics.setStatus(1);
+ nodeMetrics.setOverLoad("testoverload");
+ nodeMetrics.setHeartBeatMsg("testheartbeat_msg");
+ nodeMetrics.setHealthy("2");
+ nodeMetricManagerMapper.addNodeMetrics(nodeMetrics);
+ PersistenceNodeMetrics persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstance("instance1");
+ assertTrue(persistenceNodeMetrics != null);
+ }
+
+ @Test
+ void checkInstanceExist() {
+ addNodeMetrics();
+ int i = nodeMetricManagerMapper.checkInstanceExist("instance1");
+ assertTrue(i >= 1);
+ }
+
+ @Test
+ void getNodeMetricsByInstances() {
+ addNodeMetrics();
+ List<String> list = new ArrayList<>();
+ list.add("instance1");
+ List<PersistenceNodeMetrics> persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstances(list);
+ assertTrue(persistenceNodeMetrics.size() >= 1);
+ }
+
+ @Test
+ void getNodeMetricsByInstance() {
+ addNodeMetrics();
+ PersistenceNodeMetrics persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstance("instance1");
+ assertTrue(persistenceNodeMetrics != null);
+ }
+
+ @Test
+ void updateNodeMetrics() {
+ addNodeMetrics();
+ PersistenceNodeMetrics nodeMetrics = new PersistenceNodeMetrics();
+ nodeMetrics.setStatus(2);
+ nodeMetrics.setOverLoad("testoverloads");
+ nodeMetrics.setHeartBeatMsg("testheartbeat_msgs");
+ nodeMetrics.setHealthy("2s");
+ nodeMetricManagerMapper.updateNodeMetrics(nodeMetrics, "instance1");
+ PersistenceNodeMetrics persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstance("instance1");
+ assertTrue(persistenceNodeMetrics.getOverLoad().equals("testoverloads"));
+ }
+
+ @Test
+ void deleteNodeMetrics() {
+ addNodeMetrics();
+ nodeMetricManagerMapper.deleteNodeMetrics("instance1");
+ PersistenceNodeMetrics persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstance("instance1");
+ assertTrue(persistenceNodeMetrics == null);
+ }
+
+ @Test
+ void deleteNodeMetricsByInstance() {
+ addNodeMetrics();
+ nodeMetricManagerMapper.deleteNodeMetricsByInstance("instance1");
+ PersistenceNodeMetrics persistenceNodeMetrics =
+ nodeMetricManagerMapper.getNodeMetricsByInstance("instance1");
+ assertTrue(persistenceNodeMetrics == null);
+ }
+
+ @Test
+ void getAllNodeMetrics() {
+ addNodeMetrics();
+ List<PersistenceNodeMetricsEntity> list =
nodeMetricManagerMapper.getAllNodeMetrics();
+ assertTrue(list.size() >= 1);
+ }
+}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/ResourceManagerMapperTest.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/ResourceManagerMapperTest.java
new file mode 100644
index 000000000..be8b17151
--- /dev/null
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/dao/ResourceManagerMapperTest.java
@@ -0,0 +1,184 @@
+/*
+ * 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.dao;
+
+import org.apache.linkis.manager.common.entity.persistence.PersistenceLabel;
+import org.apache.linkis.manager.common.entity.persistence.PersistenceResource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ResourceManagerMapperTest extends BaseDaoTest {
+
+ @Autowired ResourceManagerMapper resourceManagerMapper;
+
+ @Test
+ void registerResource() {
+ PersistenceResource persistenceResource = new PersistenceResource();
+ persistenceResource.setId(1);
+ persistenceResource.setMaxResource("testmax");
+ persistenceResource.setMinResource("mintest");
+ persistenceResource.setLeftResource("left");
+ persistenceResource.setUsedResource("user");
+ persistenceResource.setTicketId("1");
+ persistenceResource.setResourceType("testtype");
+ resourceManagerMapper.registerResource(persistenceResource);
+ PersistenceResource persistenceResources =
resourceManagerMapper.getResourceById(1);
+ assertThat(persistenceResources.getId())
+ .usingRecursiveComparison()
+ .isEqualTo(persistenceResource.getId());
+ }
+
+ @Test
+ void nodeResourceUpdate() {
+ registerResource();
+ PersistenceResource persistenceResource = new PersistenceResource();
+ persistenceResource.setId(1);
+ persistenceResource.setMaxResource("testmaxss");
+ persistenceResource.setMinResource("mintestss");
+ persistenceResource.setLeftResource("left");
+ persistenceResource.setUsedResource("user");
+ persistenceResource.setResourceType("testtype");
+ persistenceResource.setUpdateTime(new Date());
+ resourceManagerMapper.nodeResourceUpdate("1", persistenceResource);
+ PersistenceResource persistenceResources =
resourceManagerMapper.getResourceById(1);
+ assertTrue(persistenceResources.getMaxResource() ==
persistenceResource.getMaxResource());
+ }
+
+ @Test
+ void nodeResourceUpdateByResourceId() {
+ registerResource();
+ PersistenceResource persistenceResource = new PersistenceResource();
+ persistenceResource.setId(1);
+ persistenceResource.setMaxResource("testmaxss");
+ persistenceResource.setMinResource("mintestss");
+ persistenceResource.setLeftResource("left");
+ persistenceResource.setUsedResource("user");
+ resourceManagerMapper.nodeResourceUpdateByResourceId(1,
persistenceResource);
+ assertTrue(persistenceResource.getMaxResource() ==
persistenceResource.getMaxResource());
+ }
+
+ @Test
+ void getNodeResourceUpdateResourceId() {
+ PersistenceResource persistenceResource = new PersistenceResource();
+ persistenceResource.setId(1);
+ persistenceResource.setMaxResource("testmax");
+ persistenceResource.setMinResource("mintest");
+ persistenceResource.setLeftResource("left");
+ persistenceResource.setUsedResource("user");
+ persistenceResource.setResourceType("testtype");
+ resourceManagerMapper.registerResource(persistenceResource);
+ Integer i =
resourceManagerMapper.getNodeResourceUpdateResourceId("instance1");
+ assertTrue(i >= 1);
+ }
+
+ @Test
+ void deleteResourceAndLabelId() {
+ resourceManagerMapper.deleteResourceAndLabelId("instance1");
+ }
+
+ @Test
+ void deleteResourceByInstance() {
+ registerResource();
+ resourceManagerMapper.deleteResourceByInstance("instance1");
+ List<PersistenceResource> list =
+ resourceManagerMapper.getResourceByServiceInstance("instance1");
+ assertTrue(list.size() == 0);
+ }
+
+ @Test
+ void deleteResourceByTicketId() {
+ registerResource();
+ resourceManagerMapper.deleteResourceByTicketId("1");
+ PersistenceResource persistenceResource =
resourceManagerMapper.getNodeResourceByTicketId("1");
+ assertTrue(persistenceResource == null);
+ }
+
+ @Test
+ void getResourceByInstanceAndResourceType() {
+ registerResource();
+ List<PersistenceResource> list =
+
resourceManagerMapper.getResourceByInstanceAndResourceType("instance1",
"testtype");
+ int i = list.size();
+ assertTrue(i == 1);
+ }
+
+ @Test
+ void getResourceByServiceInstance() {
+ registerResource();
+ List<PersistenceResource> list =
+ resourceManagerMapper.getResourceByServiceInstance("instance1");
+ int i = list.size();
+ assertTrue(i == 1);
+ }
+
+ @Test
+ void getNodeResourceByTicketId() {
+ registerResource();
+ PersistenceResource persistenceResource =
resourceManagerMapper.getNodeResourceByTicketId("1");
+ assertTrue(persistenceResource != null);
+ }
+
+ @Test
+ void getResourceByUserName() {
+ registerResource();
+ List<PersistenceResource> list =
resourceManagerMapper.getResourceByUserName("testname");
+ int i = list.size();
+ assertTrue(i == 1);
+ }
+
+ @Test
+ void getLabelsByTicketId() {
+ registerResource();
+ List<PersistenceLabel> list =
resourceManagerMapper.getLabelsByTicketId("1");
+ int i = list.size();
+ assertTrue(i == 1);
+ }
+
+ @Test
+ void deleteResourceById() {
+ registerResource();
+ List<Integer> list = new ArrayList<>();
+ list.add(1);
+ resourceManagerMapper.deleteResourceById(list);
+ PersistenceResource persistenceResource =
resourceManagerMapper.getResourceById(1);
+ assertTrue(persistenceResource == null);
+ }
+
+ @Test
+ void deleteResourceRelByResourceId() {
+ List<Integer> list = new ArrayList<>();
+ list.add(1);
+ resourceManagerMapper.deleteResourceRelByResourceId(list);
+ }
+
+ @Test
+ void getResourceById() {
+ registerResource();
+ PersistenceResource persistenceResource =
resourceManagerMapper.getResourceById(1);
+ assertTrue(persistenceResource != null);
+ }
+}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/persistence/PersistenceTest.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/persistence/PersistenceTest.java
deleted file mode 100644
index 41d419786..000000000
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/java/org/apache/linkis/manager/persistence/PersistenceTest.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * 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.persistence;
-
-import org.apache.linkis.common.ServiceInstance;
-import org.apache.linkis.manager.Scan;
-import org.apache.linkis.manager.common.entity.label.LabelKeyValue;
-import org.apache.linkis.manager.common.entity.persistence.PersistenceLabel;
-import org.apache.linkis.manager.common.entity.persistence.PersistenceResource;
-import org.apache.linkis.manager.dao.LabelManagerMapper;
-import org.apache.linkis.manager.entity.Tunple;
-import org.apache.linkis.manager.label.entity.Label;
-
-import org.apache.commons.beanutils.BeanUtils;
-
-import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class PersistenceTest {
-
- AnnotationConfigApplicationContext context = null;
-
- LabelManagerMapper labelManagerMapper = null;
-
- ResourceLabelPersistence resourceLabelPersistence = null;
-
- @BeforeEach
- public void before() {
- context = new AnnotationConfigApplicationContext(Scan.class);
- labelManagerMapper = context.getBean(LabelManagerMapper.class);
- resourceLabelPersistence = context.getBean(ResourceLabelPersistence.class);
- }
-
- @Test
- public void test01() throws InvocationTargetException,
IllegalAccessException {
-
- PersistenceLabel persistenceLabel1 = new PersistenceLabel();
- persistenceLabel1.setLabelKey("engineType");
- persistenceLabel1.setValue(Collections.singletonMap("runType", "spark"));
- System.out.println(persistenceLabel1.getStringValue());
- PersistenceLabel persistenceLabel2 = new PersistenceLabel();
- persistenceLabel2.setLabelKey("engineType");
- persistenceLabel2.setValue(Collections.singletonMap("runType", "hive"));
- System.out.println(persistenceLabel2.getStringValue());
- List<PersistenceLabel> persistenceLabels =
Arrays.asList(persistenceLabel1);
- List<Map<String, Object>> nodeRelationsByLabels =
- labelManagerMapper.dimListNodeRelationsByKeyValueMap(
- Collections.singletonMap(persistenceLabel1.getLabelKey(),
persistenceLabel1.getValue()),
- Label.ValueRelation.ALL.name());
- List<Tunple<PersistenceLabel, ServiceInstance>> arrays =
- new ArrayList<Tunple<PersistenceLabel, ServiceInstance>>();
- for (Map<String, Object> nodeRelationsByLabel : nodeRelationsByLabels) {
- ServiceInstance serviceInstance = new ServiceInstance();
- PersistenceLabel persistenceLabel = new PersistenceLabel();
- BeanUtils.populate(serviceInstance, nodeRelationsByLabel);
- BeanUtils.populate(persistenceLabel, nodeRelationsByLabel);
- arrays.add(new Tunple(persistenceLabel, serviceInstance));
- }
- Map<PersistenceLabel, List<ServiceInstance>> collect =
- arrays.stream()
- .collect(Collectors.groupingBy(Tunple::getKey))
- .entrySet()
- .stream()
- .collect(
- Collectors.toMap(
- Map.Entry::getKey,
- f ->
f.getValue().stream().map(Tunple::getValue).collect(Collectors.toList())));
- System.out.println(collect);
- }
-
- @Test
- public void test02() throws InvocationTargetException,
IllegalAccessException {
-
- List<ServiceInstance> list =
- Arrays.asList(
- ServiceInstance.apply("aaa", "localhost:8088"),
- ServiceInstance.apply("bbb", "localhost:8089"));
- List<Map<String, Object>> nodeRelationsByLabels =
- labelManagerMapper.listLabelRelationByServiceInstance(list);
- List<Tunple<ServiceInstance, PersistenceLabel>> arrays = new ArrayList<>();
- for (Map<String, Object> nodeRelationsByLabel : nodeRelationsByLabels) {
- ServiceInstance serviceInstance = new ServiceInstance();
- PersistenceLabel persistenceLabel = new PersistenceLabel();
- BeanUtils.populate(serviceInstance, nodeRelationsByLabel);
- BeanUtils.populate(persistenceLabel, nodeRelationsByLabel);
- arrays.add(new Tunple(serviceInstance, persistenceLabel));
- }
- Map<ServiceInstance, List<PersistenceLabel>> collect =
- arrays.stream()
- .collect(Collectors.groupingBy(Tunple::getKey))
- .entrySet()
- .stream()
- .collect(
- Collectors.toMap(
- Map.Entry::getKey,
- f ->
f.getValue().stream().map(Tunple::getValue).collect(Collectors.toList())));
- System.out.println(collect);
- }
-
- @Test
- public void test03() throws InvocationTargetException,
IllegalAccessException {
-
- List<ServiceInstance> nodeByLabelKeyValue =
- labelManagerMapper.getNodeByLabelKeyValue("serverAlias", "em");
- System.out.println(nodeByLabelKeyValue);
- }
-
- @Test
- public void testListResourceLabelByValueList()
- throws InvocationTargetException, IllegalAccessException {
- /*SELECT l.*,lvr.*
- FROM linkis_cg_manager_label l ,linkis_cg_manager_label_resource
lr ,linkis_cg_manager_label_value_relation lvr
- WHERE l.id = lr.label_id AND l.id = lvr.label_id
- AND (lvr.label_value_key,lvr.label_value_content) IN
(('alias','em'),('key2','value2'),("instance","localhost:9000"),("serviceName","sparkEngine"))
- GROUP BY l.id HAVING COUNT(1) = l.label_value_size;*/
- ArrayList<LabelKeyValue> labelKeyValues = new ArrayList<>();
- labelKeyValues.add(new LabelKeyValue("alias", "em"));
- labelKeyValues.add(new LabelKeyValue("key2", "value2"));
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.listResourceLabelByValues(labelKeyValues);
- System.out.println(persistenceLabels);
- }
-
- @Test
- public void testListResourceLabelByKeyValuesMaps()
- throws InvocationTargetException, IllegalAccessException {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("instance", "localhost:9026");
- key1.put("serviceName", "linkis-engineManager");
- labelKeyValues.put("emInstance", key1);
- HashMap<String, String> key2 = new HashMap<>();
- key2.put("instance", "localhost:9000");
- key2.put("serviceName", "sparkEngine");
- labelKeyValues.put("engineInstance", key2);
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.dimlistResourceLabelByKeyValueMap(
- labelKeyValues, Label.ValueRelation.ALL.name());
- System.out.println(persistenceLabels);
- }
-
- @Test
- public void testGetResourceByLaBelId() {
- List<PersistenceResource> persistenceResources =
labelManagerMapper.listResourceByLaBelId(1);
- System.out.println(persistenceResources);
- }
-
- @Test
- public void testGetResourceByKeyValuesMaps() {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("alias", "em");
- key1.put("key2", "value2");
- labelKeyValues.put("serverAlias", key1);
- HashMap<String, String> key2 = new HashMap<>();
- key2.put("instance", "localhost:9000");
- key2.put("serviceName", "sparkEngine");
- labelKeyValues.put("engineInstance", key2);
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.dimlistResourceLabelByKeyValueMap(
- labelKeyValues, Label.ValueRelation.ALL.name());
- System.out.println(persistenceLabels);
- }
-
- @Test
- public void testDeleteResourceByLabelId() {
- labelManagerMapper.deleteResourceByLabelId(1);
- }
-
- @Test
- public void testDeleteResourceByLabelKeyValuesMaps() {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("alias", "em");
- key1.put("key2", "value2");
- labelKeyValues.put("serverAlias", key1);
- }
-
- @Test
- public void testBatchDeleteResourceByLabelId() {
- labelManagerMapper.batchDeleteResourceByLabelId(Arrays.asList(3, 4));
- labelManagerMapper.batchDeleteResourceByLabelIdInDirect(Arrays.asList(3,
4));
- }
-
- @Test
- public void testBatchDeleteResourceByLabelKeyValuesMaps() {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("alias", "em");
- key1.put("key2", "value2");
- labelKeyValues.put("serverAlias", key1);
- HashMap<String, String> key2 = new HashMap<>();
- key2.put("instance", "localhost:9000");
- key2.put("serviceName", "sparkEngine");
- labelKeyValues.put("engineInstance", key2);
- labelManagerMapper.batchDeleteResourceByLabelKeyValuesMaps(labelKeyValues);
- }
-
- @Test
- public void testSetResource01() {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("alias", "em");
- key1.put("key2", "value2");
- labelKeyValues.put("serverAlias", key1);
- HashMap<String, String> key2 = new HashMap<>();
- key2.put("instance", "localhost:9000");
- key2.put("serviceName", "sparkEngine");
- labelKeyValues.put("engineInstance", key2);
- PersistenceResource persistenceResource = new PersistenceResource();
- persistenceResource.setMaxResource("100");
- PersistenceLabel persistenceLabel = new PersistenceLabel();
- persistenceLabel.setId(3);
- resourceLabelPersistence.setResourceToLabel(persistenceLabel,
persistenceResource);
- }
-
- @Test
- public void testSetResource02() {
- HashMap<String, Map<String, String>> labelKeyValues = new HashMap<>();
- HashMap<String, String> key1 = new HashMap<>();
- key1.put("alias", "em");
- key1.put("key2", "value2");
- labelKeyValues.put("serverAlias", key1);
- HashMap<String, String> key2 = new HashMap<>();
- key2.put("instance", "localhost:9000");
- key2.put("serviceName", "sparkEngine");
- labelKeyValues.put("engineInstance", key2);
- PersistenceResource persistenceResource = new PersistenceResource();
- persistenceResource.setMaxResource("300");
- PersistenceLabel persistenceLabel = new PersistenceLabel();
- persistenceLabel.setValue(key1);
- persistenceLabel.setLabelKey("serverAlias");
- resourceLabelPersistence.setResourceToLabel(persistenceLabel,
persistenceResource);
- }
-
- @Test
- public void testdimListLabelByValueList()
- throws InvocationTargetException, IllegalAccessException {
- HashMap<String, String> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put("type", "spark");
- // stringStringHashMap.put("version","2.4.3");
- stringStringHashMap.put("aaa", "bbb");
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.dimListLabelByValueList(
- Arrays.asList(stringStringHashMap), Label.ValueRelation.OR.name());
- System.out.println(persistenceLabels.size());
- }
-
- @Test
- public void testdimListLabelsByKeyValueMap()
- throws InvocationTargetException, IllegalAccessException {
- HashMap<String, String> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put("type", "spark");
- // stringStringHashMap.put("version","2.4.3");
- stringStringHashMap.put("aaa", "bbb");
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.dimListLabelByKeyValueMap(
- Collections.singletonMap("combined_xx_xx", stringStringHashMap),
- Label.ValueRelation.AND.name());
- System.out.println(persistenceLabels.size());
- }
-
- @Test
- public void testListLabelByKeyValueMap()
- throws InvocationTargetException, IllegalAccessException {
- HashMap<String, String> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put("type", "spark");
- stringStringHashMap.put("version", "2.4.3");
- stringStringHashMap.put("aaa", "bbb");
- stringStringHashMap.put("ccc", "ddd");
- stringStringHashMap.put("eee", "fff");
- List<PersistenceLabel> persistenceLabels =
- labelManagerMapper.listLabelByKeyValueMap(
- Collections.singletonMap("combined_xx_xx", stringStringHashMap));
- System.out.println(persistenceLabels.size());
- }
-}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
new file mode 100644
index 000000000..ca7d27a23
--- /dev/null
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties
@@ -0,0 +1,41 @@
+#
+# 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.
+#
+
+
+
+#h2 database config
+spring.datasource.driver-class-name=org.h2.Driver
+#init
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript
from 'classpath:create.sql'
+spring.datasource.username=sa
+spring.datasource.password=
+spring.datasource.hikari.connection-test-query=select 1
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.validation-timeout=3000
+spring.datasource.hikari.pool-name=linkis-test
+spring.datasource.hikari.maximum-pool-size=50
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.idle-timeout=600000
+spring.datasource.hikari.leak-detection-threshold=0
+spring.datasource.hikari.initialization-fail-timeout=1
+
+mybatis-plus.mapper-locations=org/apache/linkis/manager/dao/impl/*.xml
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+#disable eureka discovery client
+spring.cloud.service-registry.auto-registration.enabled=false
+eureka.client.enabled=false
+eureka.client.serviceUrl.registerWithEureka=false
\ No newline at end of file
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/create.sql
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/create.sql
new file mode 100644
index 000000000..8e3193302
--- /dev/null
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/create.sql
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+CREATE TABLE `linkis_cg_manager_linkis_resources` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `max_resource` varchar(1020) DEFAULT NULL,
+ `min_resource` varchar(1020) DEFAULT NULL,
+ `used_resource` varchar(1020) DEFAULT NULL,
+ `left_resource` varchar(1020) DEFAULT NULL,
+ `expected_resource` varchar(1020) DEFAULT NULL,
+ `locked_resource` varchar(1020) DEFAULT NULL,
+ `resourceType` varchar(255) DEFAULT NULL,
+ `ticketId` varchar(255) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `updator` varchar(255) DEFAULT NULL,
+ `creator` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+);
+
+
+CREATE TABLE `linkis_cg_manager_label_resource` (
+ `id` int(20) NOT NULL AUTO_INCREMENT,
+ `label_id` int(20) DEFAULT NULL,
+ `resource_id` int(20) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+INSERT INTO linkis_cg_manager_label_resource (label_id, resource_id,
update_time, create_time) VALUES(2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+
+CREATE TABLE `linkis_cg_manager_label_service_instance` (
+ `id` int(20) NOT NULL AUTO_INCREMENT,
+ `label_id` int(20) DEFAULT NULL,
+ `service_instance` varchar(128) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+
+INSERT INTO linkis_cg_manager_label_service_instance(label_id,
service_instance, update_time, create_time) VALUES (2, 'instance1',
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+
+CREATE TABLE `linkis_cg_manager_label_user` (
+ `id` int(20) NOT NULL AUTO_INCREMENT,
+ `username` varchar(255) DEFAULT NULL,
+ `label_id` int(20) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+) ;
+
+INSERT INTO linkis_cg_manager_label_user(username, label_id, update_time,
create_time)VALUES('testname', 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+
+CREATE TABLE `linkis_cg_manager_label` (
+ `id` int(20) NOT NULL AUTO_INCREMENT,
+ `label_key` varchar(32) NOT NULL,
+ `label_value` varchar(255) NOT NULL,
+ `label_feature` varchar(16) NOT NULL,
+ `label_value_size` int(20) NOT NULL,
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+INSERT INTO linkis_cg_manager_label
(id,label_key,label_value,label_feature,label_value_size,update_time,create_time)
VALUES
(2,'combined_userCreator_engineType','*-LINKISCLI,*-*','OPTIONAL',2,'2022-03-28
01:31:08.0','2022-03-28 01:31:08.0');
+
+CREATE TABLE `linkis_cg_manager_service_instance_metrics` (
+ `instance` varchar(128) NOT NULL,
+ `instance_status` int(11) DEFAULT NULL,
+ `overload` varchar(255) DEFAULT NULL,
+ `heartbeat_msg` text ,
+ `healthy_status` varchar(255) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`instance`)
+) ;
+
+CREATE TABLE `linkis_cg_manager_service_instance` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `instance` varchar(128) DEFAULT NULL,
+ `name` varchar(32) DEFAULT NULL,
+ `owner` varchar(32) DEFAULT NULL,
+ `mark` varchar(32) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `updator` varchar(32) DEFAULT NULL,
+ `creator` varchar(32) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+);
+INSERT INTO linkis_cg_manager_service_instance(`instance`, name, owner, mark,
update_time, create_time, updator, creator)VALUES('instance1', 'testname',
'testowner', 'testmark', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'testupdator',
'testcreator');
+
+CREATE TABLE `linkis_cg_manager_engine_em` (
+ `id` int(20) NOT NULL AUTO_INCREMENT,
+ `engine_instance` varchar(128) DEFAULT NULL,
+ `em_instance` varchar(128) DEFAULT NULL,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+) ;
+
+INSERT INTO linkis_cg_manager_engine_em
(engine_instance,em_instance,update_time,create_time) VALUES
('instance1','instance1','2022-02-26 14:54:05.0','2022-02-26 14:54:05.0');
+
+
+CREATE TABLE `linkis_cg_manager_lock` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `lock_object` varchar(255) DEFAULT NULL,
+ `time_out` longtext ,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+);
+INSERT INTO linkis_cg_manager_lock(lock_object, time_out, update_time,
create_time)VALUES('testjson', 1l, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
\ No newline at end of file
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
index 9006fdab2..973ffdb0e 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
@@ -32,6 +33,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@Ignore
class DataSourceVersionDaoTest extends BaseDaoTest {
private static final Logger logger =
LoggerFactory.getLogger(DataSourceVersionDaoTest.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
