mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
Refactor Pool creation logic
1. Refactor the create logic to use NodeListener instead of DataSourceCreator.createMap 2. Add destroy methods to NodeListener and PoolUpdater 3. Add a lock to prevent Node update concurrently
This commit is contained in:
@@ -1,57 +0,0 @@
|
||||
package com.alibaba.druid.pool.ha;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class DataSourceCreatorTest {
|
||||
@Test
|
||||
public void testNameList() {
|
||||
String file = "/com/alibaba/druid/pool/ha/ha-with-prefix-datasource.properties";
|
||||
DataSourceCreator creator = new DataSourceCreator(file, "prefix1");
|
||||
List<String> list = creator.getNameList();
|
||||
assertFalse(list.isEmpty());
|
||||
assertEquals(1, list.size());
|
||||
assertEquals("prefix1.foo", list.get(0));
|
||||
|
||||
creator = new DataSourceCreator(file);
|
||||
list = creator.getNameList();
|
||||
assertEquals(3, list.size());
|
||||
for (String k : list) {
|
||||
assertNotEquals("bar", k);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createMap() throws Exception {
|
||||
HighAvailableDataSource highAvailableDataSource = new HighAvailableDataSource();
|
||||
String file = "/com/alibaba/druid/pool/ha/ha-datasource.properties";
|
||||
DataSourceCreator creator = new DataSourceCreator(file);
|
||||
Map<String, DataSource> map = creator.createMap(highAvailableDataSource);
|
||||
assertEquals(2, map.size());
|
||||
assertNotNull(map.get("foo"));
|
||||
assertNotNull(map.get("bar"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createMapWithPrefix() throws Exception {
|
||||
HighAvailableDataSource highAvailableDataSource = new HighAvailableDataSource();
|
||||
String file = "/com/alibaba/druid/pool/ha/ha-with-prefix-datasource.properties";
|
||||
DataSourceCreator creator = new DataSourceCreator(file, "prefix1");
|
||||
Map<String, DataSource> map = creator.createMap(highAvailableDataSource);
|
||||
assertEquals(1, map.size());
|
||||
assertNotNull(map.get("prefix1.foo"));
|
||||
assertNull(map.get("prefix2.foo"));
|
||||
|
||||
creator = new DataSourceCreator(file, "prefix2");
|
||||
map = creator.createMap(highAvailableDataSource);
|
||||
assertEquals(1, map.size());
|
||||
assertNull(map.get("prefix1.foo"));
|
||||
assertNotNull(map.get("prefix2.foo"));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -26,6 +26,7 @@ public class BaseRandomDataSourceSelectorTest {
|
||||
@After
|
||||
public void tearDown() {
|
||||
dataSourceMap = null;
|
||||
dataSource.destroy();
|
||||
dataSource = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ public class NamedDataSourceSelectorTest {
|
||||
@After
|
||||
public void tearDown() {
|
||||
dataSourceMap = null;
|
||||
dataSource.destroy();
|
||||
dataSource = null;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -25,6 +25,7 @@ public class RandomDataSourceSelectorWithValidationTest {
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
highAvailableDataSource.destroy();
|
||||
highAvailableDataSource = null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user