Browse Source
* [DS-6540][refactor-server] Optimize the code related to the processInstanceExecMaps object3.0.0/version-upgrade
ououtt
3 years ago
committed by
GitHub
16 changed files with 263 additions and 86 deletions
@ -0,0 +1,66 @@ |
|||||||
|
/* |
||||||
|
* 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.server.master.cache; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThread; |
||||||
|
|
||||||
|
import java.util.Collection; |
||||||
|
|
||||||
|
/** |
||||||
|
* cache of process instance id and WorkflowExecuteThread |
||||||
|
*/ |
||||||
|
public interface ProcessInstanceExecCacheManager { |
||||||
|
|
||||||
|
/** |
||||||
|
* get WorkflowExecuteThread by process instance id |
||||||
|
* |
||||||
|
* @param processInstanceId processInstanceId |
||||||
|
* @return WorkflowExecuteThread |
||||||
|
*/ |
||||||
|
WorkflowExecuteThread getByProcessInstanceId(int processInstanceId); |
||||||
|
|
||||||
|
/** |
||||||
|
* judge the process instance does it exist |
||||||
|
* |
||||||
|
* @param processInstanceId processInstanceId |
||||||
|
* @return true - if process instance id exists in cache |
||||||
|
*/ |
||||||
|
boolean contains(int processInstanceId); |
||||||
|
|
||||||
|
/** |
||||||
|
* remove cache by process instance id |
||||||
|
* |
||||||
|
* @param processInstanceId processInstanceId |
||||||
|
*/ |
||||||
|
void removeByProcessInstanceId(int processInstanceId); |
||||||
|
|
||||||
|
/** |
||||||
|
* cache |
||||||
|
* |
||||||
|
* @param processInstanceId processInstanceId |
||||||
|
* @param workflowExecuteThread if it is null, will not be cached |
||||||
|
*/ |
||||||
|
void cache(int processInstanceId, WorkflowExecuteThread workflowExecuteThread); |
||||||
|
|
||||||
|
/** |
||||||
|
* get all WorkflowExecuteThread from cache |
||||||
|
* |
||||||
|
* @return all WorkflowExecuteThread in cache |
||||||
|
*/ |
||||||
|
Collection<WorkflowExecuteThread> getAll(); |
||||||
|
} |
||||||
@ -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.server.master.cache.impl; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; |
||||||
|
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThread; |
||||||
|
|
||||||
|
import java.util.Collection; |
||||||
|
import java.util.concurrent.ConcurrentHashMap; |
||||||
|
|
||||||
|
import org.springframework.stereotype.Component; |
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList; |
||||||
|
|
||||||
|
/** |
||||||
|
* cache of process instance id and WorkflowExecuteThread |
||||||
|
*/ |
||||||
|
@Component |
||||||
|
public class ProcessInstanceExecCacheManagerImpl implements ProcessInstanceExecCacheManager { |
||||||
|
|
||||||
|
private final ConcurrentHashMap<Integer, WorkflowExecuteThread> processInstanceExecMaps = new ConcurrentHashMap<>(); |
||||||
|
|
||||||
|
@Override |
||||||
|
public WorkflowExecuteThread getByProcessInstanceId(int processInstanceId) { |
||||||
|
return processInstanceExecMaps.get(processInstanceId); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public boolean contains(int processInstanceId) { |
||||||
|
return processInstanceExecMaps.containsKey(processInstanceId); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void removeByProcessInstanceId(int processInstanceId) { |
||||||
|
processInstanceExecMaps.remove(processInstanceId); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void cache(int processInstanceId, WorkflowExecuteThread workflowExecuteThread) { |
||||||
|
if (workflowExecuteThread == null) { |
||||||
|
return; |
||||||
|
} |
||||||
|
processInstanceExecMaps.put(processInstanceId, workflowExecuteThread); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public Collection<WorkflowExecuteThread> getAll() { |
||||||
|
return ImmutableList.copyOf(processInstanceExecMaps.values()); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,78 @@ |
|||||||
|
/* |
||||||
|
* 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.server.master.cache.impl; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThread; |
||||||
|
|
||||||
|
import java.util.Collection; |
||||||
|
|
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
import org.junit.runner.RunWith; |
||||||
|
import org.mockito.InjectMocks; |
||||||
|
import org.mockito.Mock; |
||||||
|
import org.mockito.Mockito; |
||||||
|
import org.mockito.junit.MockitoJUnitRunner; |
||||||
|
|
||||||
|
@RunWith(MockitoJUnitRunner.class) |
||||||
|
public class ProcessInstanceExecCacheManagerImplTest { |
||||||
|
|
||||||
|
@InjectMocks |
||||||
|
private ProcessInstanceExecCacheManagerImpl processInstanceExecCacheManager; |
||||||
|
|
||||||
|
@Mock |
||||||
|
private WorkflowExecuteThread workflowExecuteThread; |
||||||
|
|
||||||
|
@Before |
||||||
|
public void before() { |
||||||
|
Mockito.when(workflowExecuteThread.getKey()).thenReturn("workflowExecuteThread1"); |
||||||
|
processInstanceExecCacheManager.cache(1, workflowExecuteThread); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testGetByProcessInstanceId() { |
||||||
|
WorkflowExecuteThread workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(1); |
||||||
|
Assert.assertEquals("workflowExecuteThread1", workflowExecuteThread.getKey()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testContains() { |
||||||
|
Assert.assertTrue(processInstanceExecCacheManager.contains(1)); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testCacheNull() { |
||||||
|
processInstanceExecCacheManager.cache(2, null); |
||||||
|
WorkflowExecuteThread workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(2); |
||||||
|
Assert.assertNull(workflowExecuteThread); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testRemoveByProcessInstanceId() { |
||||||
|
processInstanceExecCacheManager.removeByProcessInstanceId(1); |
||||||
|
WorkflowExecuteThread workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(1); |
||||||
|
Assert.assertNull(workflowExecuteThread); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testGetAll() { |
||||||
|
Collection<WorkflowExecuteThread> workflowExecuteThreads = processInstanceExecCacheManager.getAll(); |
||||||
|
Assert.assertEquals(1, workflowExecuteThreads.size()); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue