diff --git a/pom.xml b/pom.xml index 49f883f..678e338 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,9 @@ tddl-group tddl-repo-mysql tddl-repo-hbase + tddl-repo-demo tddl-optimizer tddl-executor @@ -120,17 +122,26 @@ com.taobao.diamond diamond-client + + edas-3.7.3 com.taobao.diamond diamond-utils + + 3.2.0 com.alibaba druid + + 1.0.19 org.codehaus.groovy @@ -295,6 +306,7 @@ **/*NoRunTest.java + true diff --git a/tddl-atom/pom.xml b/tddl-atom/pom.xml index 6dc7caa..1ca5746 100644 --- a/tddl-atom/pom.xml +++ b/tddl-atom/pom.xml @@ -27,6 +27,10 @@ tddl-config ${project.version} + + com.taobao.diamond + diamond-client + com.alibaba @@ -59,5 +63,11 @@ spring-jdbc test + + + log4j + log4j + test + diff --git a/tddl-atom/src/main/java/com/taobao/tddl/atom/config/TAtomDsConfHandle.java b/tddl-atom/src/main/java/com/taobao/tddl/atom/config/TAtomDsConfHandle.java index d5cd99e..54a5012 100644 --- a/tddl-atom/src/main/java/com/taobao/tddl/atom/config/TAtomDsConfHandle.java +++ b/tddl-atom/src/main/java/com/taobao/tddl/atom/config/TAtomDsConfHandle.java @@ -609,7 +609,7 @@ public static DruidDataSource convertTAtomDsConf2DruidConf(String dbKey, TAtomDs localDruidDataSource.setName(dbKey + "_" + version.getAndIncrement()); localDruidDataSource.setTestOnBorrow(false); localDruidDataSource.setTestWhileIdle(true); - localDruidDataSource.setLogDiffrentThread(false);// 关闭日志警告 + localDruidDataSource.setLogDifferentThread(false);// 关闭日志警告 // localDruidDataSource.setFilters(DEFAULT_TDDL_DRUID_FILTERS); localDruidDataSource.setUsername(tAtomDsConfDO.getUserName()); diff --git a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/PropLoadTestUtil.java b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/PropLoadTestUtil.java index 29d21e1..50d3a0b 100644 --- a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/PropLoadTestUtil.java +++ b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/PropLoadTestUtil.java @@ -23,10 +23,14 @@ public static String convertProp2Str(Properties prop) { for (Entry entry : prop.entrySet()) { String key = (String) entry.getKey(); String value = (String) entry.getValue(); + if(sb.length() > 0) { + sb.append("\r\n"); + } sb.append(key); - sb.append("="); - sb.append(value); - sb.append("\r\n"); + if(value != null && value.length() > 0) { + sb.append("="); + sb.append(value); + } } data = sb.toString(); return data; diff --git a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomConfParserUnitTest.java b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomConfParserUnitTest.java index f475e1e..7a5c4f7 100644 --- a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomConfParserUnitTest.java +++ b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomConfParserUnitTest.java @@ -59,7 +59,8 @@ public class TAtomConfParserUnitTest { @Test public void parserPasswd_解析密码() throws IOException, InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException { - String passwdFile = "conf/oracle/passwd.properties"; + System.out.println(new PasswordCoder().encode("tddl", "JJ1988113")); + String passwdFile = "conf/oracle/passwd.properties"; String passwdStr = PropLoadTestUtil.loadPropFile2String(passwdFile); String passwd = TAtomConfParser.parserPasswd(passwdStr); Properties prop = PropLoadTestUtil.loadPropFromFile(passwdFile); diff --git a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomDataSourceTest.java b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomDataSourceTest.java index 4e7a2be..ce6c7fd 100644 --- a/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomDataSourceTest.java +++ b/tddl-atom/src/test/java/com/taobao/tddl/atom/common/TAtomDataSourceTest.java @@ -251,6 +251,7 @@ private void testChangePasswd(ChangeTestConfig change, ChangeTestConfig restore, Exception { String appName = "tddl_sample"; String dbKey = "unitTestDb-" + dbType; + dbKey = "tddl_sample_0"; String configName = ""; String testSql = TAtomDataSourceTest.TEST_SQL; configName = dbType; @@ -296,6 +297,7 @@ private void testChange(ChangeTestConfig change, ChangeTestConfig restore, Strin String methodName) throws IOException, TddlException, Exception { String appName = "tddl_sample"; String dbKey = "unitTestDb-" + methodName; + dbKey = "tddl_sample_0"; String configName = dbType; String testSql = TAtomDataSourceTest.TEST_SQL; TAtomDataSource tAtomDataSource = createTAtomDataSource(appName, dbKey, configName); diff --git a/tddl-atom/src/test/java/com/taobao/tddl/atom/utils/StaticTAtomDataSourceTest.java b/tddl-atom/src/test/java/com/taobao/tddl/atom/utils/StaticTAtomDataSourceTest.java index 8047fb3..24d1677 100644 --- a/tddl-atom/src/test/java/com/taobao/tddl/atom/utils/StaticTAtomDataSourceTest.java +++ b/tddl-atom/src/test/java/com/taobao/tddl/atom/utils/StaticTAtomDataSourceTest.java @@ -11,7 +11,7 @@ public class StaticTAtomDataSourceTest { @Test public void createStaticTAtomDataSource() throws Exception { StaticTAtomDataSource dataSource = new StaticTAtomDataSource(); - dataSource.setIp("10.232.31.154"); + dataSource.setIp("rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com"); dataSource.setPort("3306"); dataSource.setDbName("test"); dataSource.setDbType("mysql"); diff --git a/tddl-atom/src/test/resources/conf/mysql/app.properties b/tddl-atom/src/test/resources/conf/mysql/app.properties index 4dad594..6e75524 100644 --- a/tddl-atom/src/test/resources/conf/mysql/app.properties +++ b/tddl-atom/src/test/resources/conf/mysql/app.properties @@ -1,4 +1,4 @@ -userName=tddl +userName=root minPoolSize=1 maxPoolSize=2 idleTimeout=10 diff --git a/tddl-atom/src/test/resources/conf/mysql/globa.properties b/tddl-atom/src/test/resources/conf/mysql/globa.properties index 1563939..31edd32 100644 --- a/tddl-atom/src/test/resources/conf/mysql/globa.properties +++ b/tddl-atom/src/test/resources/conf/mysql/globa.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=tddl_sample_0 dbType=mysql diff --git a/tddl-atom/src/test/resources/conf/mysql/passwd.properties b/tddl-atom/src/test/resources/conf/mysql/passwd.properties index 17c8940..e878ebf 100644 --- a/tddl-atom/src/test/resources/conf/mysql/passwd.properties +++ b/tddl-atom/src/test/resources/conf/mysql/passwd.properties @@ -1 +1 @@ -encPasswd=tddl \ No newline at end of file +Zz20170707 \ No newline at end of file diff --git a/tddl-group/pom.xml b/tddl-group/pom.xml index 742793e..6af41bf 100644 --- a/tddl-group/pom.xml +++ b/tddl-group/pom.xml @@ -64,5 +64,11 @@ mysql-connector-java test + + + log4j + log4j + test + diff --git a/tddl-group/src/test/java/com/taobao/tddl/group/BaseGroupTest.java b/tddl-group/src/test/java/com/taobao/tddl/group/BaseGroupTest.java index b4b2dd0..9dc660d 100644 --- a/tddl-group/src/test/java/com/taobao/tddl/group/BaseGroupTest.java +++ b/tddl-group/src/test/java/com/taobao/tddl/group/BaseGroupTest.java @@ -78,7 +78,7 @@ public static DataSource getMySQLDataSource(int num) { ds.setDriverClassName("com.mysql.jdbc.Driver"); ds.setUsername("tddl"); ds.setPassword("tddl"); - ds.setUrl("jdbc:mysql://10.232.31.154/tddl_sample_" + num); + ds.setUrl("jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com/tddl_sample_" + num); return ds; } diff --git a/tddl-group/src/test/resources/conf/group0/globa.properties b/tddl-group/src/test/resources/conf/group0/globa.properties index 1563939..31edd32 100644 --- a/tddl-group/src/test/resources/conf/group0/globa.properties +++ b/tddl-group/src/test/resources/conf/group0/globa.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=tddl_sample_0 dbType=mysql diff --git a/tddl-group/src/test/resources/conf/group1/globa.properties b/tddl-group/src/test/resources/conf/group1/globa.properties index 911e810..4a801be 100644 --- a/tddl-group/src/test/resources/conf/group1/globa.properties +++ b/tddl-group/src/test/resources/conf/group1/globa.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=tddl_sample_1 dbType=mysql diff --git a/tddl-group/src/test/resources/conf/group2/globa.properties b/tddl-group/src/test/resources/conf/group2/globa.properties index 3296946..bbc393b 100644 --- a/tddl-group/src/test/resources/conf/group2/globa.properties +++ b/tddl-group/src/test/resources/conf/group2/globa.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=tddl_sample_2 dbType=mysql diff --git a/tddl-manager/pom.xml b/tddl-manager/pom.xml index 89e6c92..11d0e7c 100644 --- a/tddl-manager/pom.xml +++ b/tddl-manager/pom.xml @@ -133,7 +133,9 @@ com.taobao.diamond diamond-client + @@ -189,7 +191,7 @@ **/manager/test/*.java **/jdbcmock/testcase/*.java - false + true diff --git a/tddl-net/pom.xml b/tddl-net/pom.xml index f9dd187..3d22027 100644 --- a/tddl-net/pom.xml +++ b/tddl-net/pom.xml @@ -17,11 +17,13 @@ tddl-common ${project.version} + diff --git a/tddl-qatest/pom.xml b/tddl-qatest/pom.xml index 862474b..c88bfbe 100644 --- a/tddl-qatest/pom.xml +++ b/tddl-qatest/pom.xml @@ -50,12 +50,14 @@ ${project.version} test + ${project.groupId} tddl-server diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/atom/AtomDynamicChangeGlobalTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/atom/AtomDynamicChangeGlobalTest.java index 20bd6af..18e875a 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/atom/AtomDynamicChangeGlobalTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/atom/AtomDynamicChangeGlobalTest.java @@ -29,14 +29,14 @@ public void destroy() throws Exception { private void restore() throws Exception { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); Map re = null; try { re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); } catch (Exception ex) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); } @@ -61,7 +61,7 @@ public void dynamicChangeGlobalIpTest() throws InterruptedException { } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); @@ -72,20 +72,20 @@ public void dynamicChangeGlobalPortTest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3300\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3300\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); try { tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3300\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3300\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.fail(); } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); @@ -96,7 +96,7 @@ public void dynamicChangeGlobalDbNameTest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); try { @@ -109,7 +109,7 @@ public void dynamicChangeGlobalDbNameTest() throws InterruptedException { } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); @@ -121,20 +121,20 @@ public void dynamicChangeGlobalDbTypeTest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=oracle\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=oracle\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); try { tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=oracle\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=oracle\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.fail(); } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(time, String.valueOf(re.get("gmt_create"))); @@ -147,21 +147,21 @@ public void dynamicChangeGlobalDbStatusToRTest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(nextDay, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(nextDay, String.valueOf(re.get("gmt_create"))); try { tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); Assert.fail(); } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); @@ -177,7 +177,7 @@ public void dynamicChangeGlobalDbStatusToWTest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(nextDay, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=W\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=W\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); int result = tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); @@ -186,14 +186,14 @@ public void dynamicChangeGlobalDbStatusToWTest() throws InterruptedException { try { tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=W\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=W\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.fail(); } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { nextDay, RANDOM_ID }); @@ -209,12 +209,12 @@ public void dynamicChangeGlobalDbStatusToNATest() throws InterruptedException { Map re = tddlJT.queryForMap("select * from normaltbl_0001 where pk=?", new Object[] { RANDOM_ID }); Assert.assertEquals(nextDay, String.valueOf(re.get("gmt_create"))); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); try { tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); tddlJT.update("update normaltbl_0001 set gmt_create=? where pk=?", new Object[] { time, RANDOM_ID }); Assert.fail(); @@ -226,7 +226,7 @@ public void dynamicChangeGlobalDbStatusToNATest() throws InterruptedException { } catch (Exception ex) { } MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=RW\r\n"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/ChangeMasterSlaveTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/ChangeMasterSlaveTest.java index 3bd46af..f8de4da 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/ChangeMasterSlaveTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/ChangeMasterSlaveTest.java @@ -116,7 +116,7 @@ public void writeDataToReadOnlyDSTest() throws Exception { // 修改为只读(确保推送成功) for (int i = 0; i < 3; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } @@ -130,7 +130,7 @@ public void writeDataToReadOnlyDSTest() throws Exception { // 恢复 MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=WR"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=WR"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } } diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/GroupRetryExecuteTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/GroupRetryExecuteTest.java index 3ea0117..9dd04b0 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/GroupRetryExecuteTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/GroupRetryExecuteTest.java @@ -50,7 +50,7 @@ public void oneOfAtomDssInGropuIsOkTest() throws Exception { // qatest_normal_0状态改为只读(确保推送成功) for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA"); MockServer.setConfigInfo(tds.getFullDbGroupKey(), "qatest_normal_0:wr,qatest_normal_0_bac:r,qatest_normal_1_bac:r"); TimeUnit.SECONDS.sleep(SLEEP_TIME); @@ -84,11 +84,11 @@ public void noneOfAtomDssInGropuIsOkTest() throws Exception { // 改变atomDs的状态(确保推送成功) for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=NA"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=NA"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=NA"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_1_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=NA"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=NA"); MockServer.setConfigInfo(tds.getFullDbGroupKey(), "qatest_normal_0:wr,qatest_normal_0_bac:r,qatest_normal_1_bac:r"); TimeUnit.SECONDS.sleep(SLEEP_TIME); diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseRwTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseRwTest.java index 4edc90e..3bf3130 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseRwTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseRwTest.java @@ -250,11 +250,11 @@ public void wireteDataWithoutRWTest() throws Exception { // 将3个库全部设置为只读(确保推送成功) for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=R"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=R"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=R"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_1_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=R"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=R"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } @@ -271,11 +271,11 @@ public void wireteDataWithoutRWTest() throws Exception { // 恢复(确保推送成功) for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=WR"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0\r\ndbType=mysql\r\ndbStatus=WR"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=WR"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=WR"); MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_1_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=WR"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_1_bac\r\ndbType=mysql\r\ndbStatus=WR"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } } diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseWeightTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseWeightTest.java index 815da19..07e2e30 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseWeightTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/group/selector/GroupSelectDbUseWeightTest.java @@ -302,7 +302,7 @@ public void someOfDssWithoutRWAndWeightWhoDbstatusAreNATest() throws Interrupted /* 有部分DS没有设置权重值 */ for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=NA"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=NA"); MockServer.setConfigInfo(tds.getFullDbGroupKey(), "qatest_normal_0:wr1,,qatest_normal_1_bac:r3"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } @@ -332,7 +332,7 @@ public void someOfDssWithoutRWAndWeightWhoDbstatusAreNATest() throws Interrupted // 恢复配置(确保推送成功) for (int i = 0; i < 2; i++) { MockServer.setConfigInfo(TAtomConstants.getGlobalDataId(DBKEY_0_BAC), - "ip=10.232.31.154\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=RW"); + "ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com\r\nport=3306\r\ndbName=qatest_normal_0_bac\r\ndbType=mysql\r\ndbStatus=RW"); TimeUnit.SECONDS.sleep(SLEEP_TIME); } } diff --git a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/sequence/GroupSequenceTest.java b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/sequence/GroupSequenceTest.java index f5926a3..c2af386 100644 --- a/tddl-qatest/src/test/java/com/taobao/tddl/qatest/sequence/GroupSequenceTest.java +++ b/tddl-qatest/src/test/java/com/taobao/tddl/qatest/sequence/GroupSequenceTest.java @@ -384,7 +384,7 @@ public Connection getConnection(String db) { Connection conn = null; try { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://10.232.31.154:3306/" + db; + String url = "jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/" + db; String user = "tddl"; String passWord = "tddl"; conn = (Connection) DriverManager.getConnection(url, user, passWord); diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_0/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_0/global.properties index c6fac93..d0b96c1 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_0/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_0/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_0 dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_0_bac/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_0_bac/global.properties index 0b427d4..f871020 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_0_bac/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_0_bac/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_0_bac dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_1/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_1/global.properties index 62dd320..faa7614 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_1/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_1/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_1 dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_1_bac/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_1_bac/global.properties index 45043b1..ef5ab9a 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_1_bac/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_1_bac/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_1_bac dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_2/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_2/global.properties index 7141390..422ddff 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_2/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_2/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_2 dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_2_bac/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_2_bac/global.properties index c6af0c6..be90dc8 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_2_bac/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_2_bac/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_2_bac dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/qatest_normal_monitor/global.properties b/tddl-qatest/src/test/resources/atom/qatest_normal_monitor/global.properties index c6fac93..d0b96c1 100644 --- a/tddl-qatest/src/test/resources/atom/qatest_normal_monitor/global.properties +++ b/tddl-qatest/src/test/resources/atom/qatest_normal_monitor/global.properties @@ -1,4 +1,4 @@ -ip=10.232.31.154 +ip=rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com port=3306 dbName=qatest_normal_0 dbType=mysql diff --git a/tddl-qatest/src/test/resources/atom/tddl_config.properties b/tddl-qatest/src/test/resources/atom/tddl_config.properties index 0e631fc..b3c0f54 100644 --- a/tddl-qatest/src/test/resources/atom/tddl_config.properties +++ b/tddl-qatest/src/test/resources/atom/tddl_config.properties @@ -1,34 +1,34 @@ -mysql.normal0.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_0 +mysql.normal0.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_0 mysql.normal0.username=tddl mysql.normal0.password=tddl mysql.normal0.maxActive=100 mysql.normal0.initialSize=1 -mysql.normal1.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_1 +mysql.normal1.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_1 mysql.normal1.username=tddl mysql.normal1.password=tddl mysql.normal1.maxActive=100 mysql.normal1.initialSize=1 -mysql.normal2.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_2 +mysql.normal2.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_2 mysql.normal2.username=tddl mysql.normal2.password=tddl mysql.normal2.maxActive=100 mysql.normal2.initialSize=1 -mysql.normal0.bac.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_0_bac +mysql.normal0.bac.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_0_bac mysql.normal0.bac.username=tddl mysql.normal0.bac.password=tddl mysql.normal0.bac.maxActive=100 mysql.normal0.bac.initialSize=1 -mysql.normal1.bac.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_1_bac +mysql.normal1.bac.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_1_bac mysql.normal1.bac.username=tddl mysql.normal1.bac.password=tddl mysql.normal1.bac.maxActive=100 mysql.normal1.bac.initialSize=1 -mysql.normal2.bac.url=jdbc:mysql://10.232.31.154:3306/qatest_normal_2_bac +mysql.normal2.bac.url=jdbc:mysql://rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com:3306/qatest_normal_2_bac mysql.normal2.bac.username=tddl mysql.normal2.bac.password=tddl mysql.normal2.bac.maxActive=100 diff --git a/tddl-qatest/src/test/resources/readme.txt b/tddl-qatest/src/test/resources/readme.txt index 27e9500..f03d722 100644 --- a/tddl-qatest/src/test/resources/readme.txt +++ b/tddl-qatest/src/test/resources/readme.txt @@ -1,6 +1,84 @@ atom/group -1. 测试库： 10.232.31.154 (qatest_normal_0,qatest_normal_1,qatest_normal_2) -2. +1. 测试库： rm-wz9h5hd1d1a8c7886o.mysql.rds.aliyuncs.com (qatest_normal_0,qatest_normal_1,qatest_normal_2) +2. 创建脚本 +-- (1).建库: +CREATE DATABASE `qatest_normal_0`; +CREATE DATABASE `qatest_normal_1`; +CREATE DATABASE `qatest_normal_2`; + +CREATE DATABASE `qatest_normal_0_bac`; +CREATE DATABASE `qatest_normal_1_bac`; +CREATE DATABASE `qatest_normal_2_bac`; + +-- (2).在库中建表normaltbl_0001 +USE qatest_normal_0; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +USE qatest_normal_1; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +USE qatest_normal_2; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +USE qatest_normal_0_bac; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +USE qatest_normal_1_bac; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +USE qatest_normal_2_bac; +CREATE TABLE `normaltbl_0001` ( +`pk` int(11) NOT NULL, +`id` int(11) DEFAULT NULL, +`gmt_create` date DEFAULT NULL, +`name` varchar(30) DEFAULT NULL, +`floatCol` float(9,3) DEFAULT 0.000, +PRIMARY KEY (`pk`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- (3).在库创建tddl用户,授予读写数据库权限 +CREATE USER 'tddl'@'%' IDENTIFIED BY 'tddl'; +GRANT Insert,Update,Select,Delete ON qatest_normal_0.* TO 'tddl'@'%'; +GRANT Insert,Update,Select,Delete ON qatest_normal_1.* TO 'tddl'@'%'; +GRANT Insert,Update,Select,Delete ON qatest_normal_2.* TO 'tddl'@'%'; +GRANT Insert,Update,Select,Delete ON qatest_normal_0_bac.* TO 'tddl'@'%'; +GRANT Insert,Update,Select,Delete ON qatest_normal_1_bac.* TO 'tddl'@'%'; +GRANT Insert,Update,Select,Delete ON qatest_normal_2_bac.* TO 'tddl'@'%'; matrix 1. 测试库： mysql -h10.232.24.104 -udiamond -pdiamond diff --git a/tddl-sequence/pom.xml b/tddl-sequence/pom.xml index 8355b55..8e86127 100644 --- a/tddl-sequence/pom.xml +++ b/tddl-sequence/pom.xml @@ -33,12 +33,11 @@ junit test + 1.0.8 test @@ -48,6 +47,7 @@ 1.2.8 test + --> org.springframework spring-core diff --git a/tddl-server/pom.xml b/tddl-server/pom.xml index 3766e55..406a847 100644 --- a/tddl-server/pom.xml +++ b/tddl-server/pom.xml @@ -27,12 +27,13 @@ tddl-config-diamond ${project.version} +