Browse Source
* add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>pull/3/MERGE
qiaozhanwei
5 years ago
committed by
GitHub
12 changed files with 385 additions and 91 deletions
@ -0,0 +1,92 @@
|
||||
/* |
||||
* 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.dolphinscheduler.dao.upgrade; |
||||
|
||||
import org.apache.dolphinscheduler.common.utils.ConnectionUtils; |
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
|
||||
import java.sql.Connection; |
||||
import java.sql.PreparedStatement; |
||||
import java.sql.ResultSet; |
||||
import java.sql.SQLException; |
||||
import java.util.*; |
||||
|
||||
public class ProcessDefinitionDao { |
||||
|
||||
|
||||
public static final Logger logger = LoggerFactory.getLogger(ProcessDefinitionDao.class); |
||||
|
||||
/** |
||||
* queryAllProcessDefinition |
||||
* @param conn jdbc connection |
||||
* @return ProcessDefinition Json List |
||||
*/ |
||||
public Map<Integer,String> queryAllProcessDefinition(Connection conn){ |
||||
|
||||
Map<Integer,String> processDefinitionJsonMap = new HashMap<>(); |
||||
|
||||
String sql = String.format("SELECT id,process_definition_json FROM t_ds_process_definition"); |
||||
ResultSet rs = null; |
||||
PreparedStatement pstmt = null; |
||||
try { |
||||
pstmt = conn.prepareStatement(sql); |
||||
rs = pstmt.executeQuery(); |
||||
|
||||
while (rs.next()){ |
||||
Integer id = rs.getInt(1); |
||||
String processDefinitionJson = rs.getString(2); |
||||
processDefinitionJsonMap.put(id,processDefinitionJson); |
||||
} |
||||
|
||||
} catch (Exception e) { |
||||
logger.error(e.getMessage(),e); |
||||
throw new RuntimeException("sql: " + sql, e); |
||||
} finally { |
||||
ConnectionUtils.releaseResource(rs, pstmt, conn); |
||||
} |
||||
|
||||
return processDefinitionJsonMap; |
||||
} |
||||
|
||||
|
||||
/** |
||||
* updateProcessDefinitionJson |
||||
* @param conn jdbc connection |
||||
* @param processDefinitionJsonMap processDefinitionJsonMap |
||||
*/ |
||||
public void updateProcessDefinitionJson(Connection conn,Map<Integer,String> processDefinitionJsonMap){ |
||||
String sql = "UPDATE t_ds_process_definition SET process_definition_json=? where id=?"; |
||||
try { |
||||
for (Map.Entry<Integer, String> entry : processDefinitionJsonMap.entrySet()){ |
||||
try(PreparedStatement pstmt= conn.prepareStatement(sql)) { |
||||
pstmt.setString(1,entry.getValue()); |
||||
pstmt.setInt(2,entry.getKey()); |
||||
pstmt.executeUpdate(); |
||||
} |
||||
|
||||
} |
||||
|
||||
} catch (Exception e) { |
||||
logger.error(e.getMessage(),e); |
||||
throw new RuntimeException("sql: " + sql, e); |
||||
} finally { |
||||
ConnectionUtils.releaseResource(conn); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,65 @@
|
||||
/* |
||||
* 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.dolphinscheduler.dao.upgrade; |
||||
|
||||
import org.apache.dolphinscheduler.common.utils.ConnectionUtils; |
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
|
||||
import java.sql.Connection; |
||||
import java.sql.PreparedStatement; |
||||
import java.sql.ResultSet; |
||||
import java.sql.SQLException; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
public class WorkerGroupDao { |
||||
|
||||
public static final Logger logger = LoggerFactory.getLogger(WorkerGroupDao.class); |
||||
|
||||
/** |
||||
* query all old worker group |
||||
* @param conn jdbc connection |
||||
* @return old worker group Map |
||||
*/ |
||||
public Map<Integer,String> queryAllOldWorkerGroup(Connection conn){ |
||||
Map<Integer,String> workerGroupMap = new HashMap<>(); |
||||
|
||||
String sql = String.format("select id,name from t_ds_worker_group"); |
||||
ResultSet rs = null; |
||||
PreparedStatement pstmt = null; |
||||
try { |
||||
pstmt = conn.prepareStatement(sql); |
||||
rs = pstmt.executeQuery(); |
||||
|
||||
while (rs.next()){ |
||||
int id = rs.getInt(1); |
||||
String name = rs.getString(2); |
||||
workerGroupMap.put(id,name); |
||||
} |
||||
|
||||
} catch (Exception e) { |
||||
logger.error(e.getMessage(),e); |
||||
throw new RuntimeException("sql: " + sql, e); |
||||
} finally { |
||||
ConnectionUtils.releaseResource(rs, pstmt, conn); |
||||
} |
||||
|
||||
return workerGroupMap; |
||||
} |
||||
} |
||||
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?> |
||||
<!-- |
||||
~ 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. |
||||
--> |
||||
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > |
||||
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper"> |
||||
<select id="queryAllWorkerGroup" resultType="org.apache.dolphinscheduler.dao.entity.WorkerGroup"> |
||||
select * |
||||
from t_ds_worker_group |
||||
order by update_time desc |
||||
</select> |
||||
<select id="queryWorkerGroupByName" resultType="org.apache.dolphinscheduler.dao.entity.WorkerGroup"> |
||||
select * |
||||
from t_ds_worker_group |
||||
where name = #{name} |
||||
</select> |
||||
<select id="queryListPaging" resultType="org.apache.dolphinscheduler.dao.entity.WorkerGroup"> |
||||
select * |
||||
from t_ds_worker_group |
||||
where 1 = 1 |
||||
<if test="searchVal != null and searchVal != ''"> |
||||
and name like concat('%', #{searchVal}, '%') |
||||
</if> |
||||
order by update_time desc |
||||
</select> |
||||
</mapper> |
||||
@ -0,0 +1,65 @@
|
||||
/* |
||||
* 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.dolphinscheduler.dao.upgrade; |
||||
|
||||
|
||||
import org.junit.Test; |
||||
|
||||
import javax.sql.DataSource; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
import static org.apache.dolphinscheduler.dao.upgrade.UpgradeDao.getDataSource; |
||||
import static org.hamcrest.Matchers.greaterThanOrEqualTo; |
||||
import static org.junit.Assert.assertThat; |
||||
|
||||
public class ProcessDefinitionDaoTest { |
||||
final DataSource dataSource = getDataSource(); |
||||
final ProcessDefinitionDao processDefinitionDao = new ProcessDefinitionDao(); |
||||
|
||||
@Test |
||||
public void testQueryAllProcessDefinition() throws Exception{ |
||||
|
||||
Map<Integer, String> processDefinitionJsonMap = processDefinitionDao.queryAllProcessDefinition(dataSource.getConnection()); |
||||
|
||||
assertThat(processDefinitionJsonMap.size(),greaterThanOrEqualTo(0)); |
||||
} |
||||
|
||||
@Test |
||||
public void testUpdateProcessDefinitionJson() throws Exception{ |
||||
|
||||
Map<Integer,String> processDefinitionJsonMap = new HashMap<>(); |
||||
processDefinitionJsonMap.put(1,"test"); |
||||
|
||||
processDefinitionDao.updateProcessDefinitionJson(dataSource.getConnection(),processDefinitionJsonMap); |
||||
|
||||
} |
||||
|
||||
@Test(expected = Exception.class) |
||||
public void testQueryAllProcessDefinitionException() throws Exception{ |
||||
processDefinitionDao.queryAllProcessDefinition(null); |
||||
|
||||
} |
||||
|
||||
@Test(expected = Exception.class) |
||||
public void testUpdateProcessDefinitionJsonException() throws Exception{ |
||||
processDefinitionDao.updateProcessDefinitionJson(null,null); |
||||
|
||||
} |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
/* |
||||
* 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.dolphinscheduler.dao.upgrade; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
import javax.sql.DataSource; |
||||
import java.util.Map; |
||||
|
||||
import static org.apache.dolphinscheduler.dao.upgrade.UpgradeDao.getDataSource; |
||||
import static org.hamcrest.Matchers.greaterThanOrEqualTo; |
||||
import static org.junit.Assert.assertThat; |
||||
|
||||
public class UpgradeDaoTest { |
||||
PostgresqlUpgradeDao postgresqlUpgradeDao = PostgresqlUpgradeDao.getInstance(); |
||||
|
||||
@Test |
||||
public void testQueryQueryAllOldWorkerGroup() throws Exception{ |
||||
postgresqlUpgradeDao.updateProcessDefinitionJsonWorkerGroup(); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,51 @@
|
||||
/* |
||||
* 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.dolphinscheduler.dao.upgrade; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
import javax.sql.DataSource; |
||||
import java.sql.SQLException; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
import static org.apache.dolphinscheduler.dao.upgrade.UpgradeDao.getDataSource; |
||||
import static org.hamcrest.Matchers.greaterThan; |
||||
import static org.hamcrest.Matchers.greaterThanOrEqualTo; |
||||
import static org.junit.Assert.assertThat; |
||||
|
||||
public class WokrerGrouopDaoTest { |
||||
protected final DataSource dataSource = getDataSource(); |
||||
|
||||
@Test |
||||
public void testQueryQueryAllOldWorkerGroup() throws Exception{ |
||||
WorkerGroupDao workerGroupDao = new WorkerGroupDao(); |
||||
|
||||
Map<Integer, String> workerGroupMap = workerGroupDao.queryAllOldWorkerGroup(dataSource.getConnection()); |
||||
|
||||
assertThat(workerGroupMap.size(),greaterThanOrEqualTo(0)); |
||||
} |
||||
|
||||
@Test(expected = Exception.class) |
||||
public void testQueryQueryAllOldWorkerGroupException() throws Exception{ |
||||
WorkerGroupDao workerGroupDao = new WorkerGroupDao(); |
||||
|
||||
workerGroupDao.queryAllOldWorkerGroup(null); |
||||
|
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue