..

blank-1 · May 21, 2013 · fc4cc7f · fc4cc7f
2 parents 914d236 + 0859b8e
commit fc4cc7f
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 69 deletions.
diff --git a/docs/table-mysql/initTable.sql b/docs/table-mysql/initTable.sql
@@ -1,73 +1,73 @@
---创建seed表
-CREATE TABLE 'TB_DATA_SEED' (
-  'ID' int(11) NOT NULL AUTO_INCREMENT,
-  'VALUE' bigint(11) DEFAULT NULL,
-  PRIMARY KEY ('ID')
-) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8
+#创建seed表
+CREATE TABLE `TB_DATA_SEED` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `VALUE` bigint(11) DEFAULT NULL,
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8;
 
---创建app表
-CREATE TABLE 'TB_PARA_APP' (
-  'ID' int(11) NOT NULL AUTO_INCREMENT,
-  'NAME' varchar(100) DEFAULT NULL,
-  PRIMARY KEY ('ID')
-) ENGINE=InnoDB AUTO_INCREMENT=154 DEFAULT CHARSET=utf8
+#创建app表
+CREATE TABLE `TB_PARA_APP` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `NAME` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=154 DEFAULT CHARSET=utf8;
 
---创建service表
-CREATE TABLE 'TB_PARA_SERVICE' (
-  'ID' varchar(6) NOT NULL,
-  'NAME' varchar(100) DEFAULT NULL,
-  'APP_ID' int(11) DEFAULT NULL,
-  PRIMARY KEY ('ID'),
-  KEY 'fk_appId' ('APP_ID'),
-  CONSTRAINT 'fk_appId' FOREIGN KEY ('APP_ID') REFERENCES 'TB_PARA_APP' ('ID') ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='utf8_general_ci'
+#创建service表
+CREATE TABLE `TB_PARA_SERVICE` (
+  `ID` varchar(6) NOT NULL,
+  `NAME` varchar(100) DEFAULT NULL,
+  `APP_ID` int(11) DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `fk_appId` (`APP_ID`),
+  CONSTRAINT `fk_appId` FOREIGN KEY (`APP_ID`) REFERENCES `TB_PARA_APP` (`ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
---创建serviceId生成策略表
-CREATE TABLE 'TB_PARA_SERVICE_ID_GEN' (
-  'MAX_ID' int(11) NOT NULL,
-  'HEAD' int(11) NOT NULL,
-  'MAX_HEAD' int(11) NOT NULL,
-  'ID_SCOPE' int(11) NOT NULL,
-  PRIMARY KEY ('MAX_ID')
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='utf8_general_ci'
+#创建serviceId生成策略表
+CREATE TABLE `TB_PARA_SERVICE_ID_GEN` (
+  `MAX_ID` int(11) NOT NULL,
+  `HEAD` int(11) NOT NULL,
+  `MAX_HEAD` int(11) NOT NULL,
+  `ID_SCOPE` int(11) NOT NULL,
+  PRIMARY KEY (`MAX_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
---初始化生成策略数据，serviceId由head+max_id两部分组成max_id和head分别自增。
---head自增至26之后重置为0（为了配合hbase分区策略，hbase分多少个区，则max_head为多少）
---max_id自增值9999后后重置为0
-INSERT INTO 'TB_PARA_SERVICE_ID_GEN' VALUES (0, 0, 26, 10000)
+#初始化生成策略数据，serviceId由head+max_id两部分组成max_id和head分别自增。
+#head自增至26之后重置为0（为了配合hbase分区策略，hbase分多少个区，则max_head为多少）
+#max_id自增值9999后后重置为0
+INSERT INTO `TB_PARA_SERVICE_ID_GEN` VALUES (0, 0, 26, 10000);
 
---annotation
-CREATE TABLE 'annotation' (
-  'id' int(11) NOT NULL AUTO_INCREMENT,
-  'k' varchar(128) DEFAULT NULL,
-  'value' varchar(2048) DEFAULT NULL,
-  'ip' varchar(45) DEFAULT NULL,
-  'port' varchar(11) DEFAULT NULL,
-  'timestamp' bigint(20) DEFAULT NULL,
-  'duration' int(11) DEFAULT NULL,
-  'spanId' bigint(128) DEFAULT NULL,
-  'traceId' bigint(128) DEFAULT NULL,
-  'service' varchar(128) DEFAULT NULL,
-  PRIMARY KEY ('id')
-) ENGINE=InnoDB AUTO_INCREMENT=217122 DEFAULT CHARSET=utf8 COMMENT='utf8_general_ci'
+#annotation
+CREATE TABLE `annotation` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `k` varchar(128) DEFAULT NULL,
+  `value` varchar(2048) DEFAULT NULL,
+  `ip` varchar(45) DEFAULT NULL,
+  `port` varchar(11) DEFAULT NULL,
+  `timestamp` bigint(20) DEFAULT NULL,
+  `duration` int(11) DEFAULT NULL,
+  `spanId` bigint(128) DEFAULT NULL,
+  `traceId` bigint(128) DEFAULT NULL,
+  `service` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=217122 DEFAULT CHARSET=utf8;
 
---span
-CREATE TABLE 'span' (
-  'id' int(11) NOT NULL AUTO_INCREMENT,
-  'name' varchar(128) DEFAULT NULL,
-  'traceId' bigint(20) DEFAULT NULL,
-  'parentId' bigint(20) DEFAULT NULL,
-  'spanId' bigint(20) DEFAULT NULL,
-  'service' varchar(128) DEFAULT NULL,
-  PRIMARY KEY ('id')
-) ENGINE=InnoDB AUTO_INCREMENT=53365 DEFAULT CHARSET=utf8 COMMENT='utf8_general_ci'
+#span
+CREATE TABLE `span` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) DEFAULT NULL,
+  `traceId` bigint(20) DEFAULT NULL,
+  `parentId` bigint(20) DEFAULT NULL,
+  `spanId` bigint(20) DEFAULT NULL,
+  `service` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=53365 DEFAULT CHARSET=utf8;
 
---trace
-CREATE TABLE 'trace' (
-  'id' int(11) NOT NULL AUTO_INCREMENT,
-  'traceId' bigint(128) DEFAULT NULL,
-  'duration' int(11) DEFAULT NULL,
-  'service' varchar(1024) CHARACTER SET utf8 DEFAULT NULL,
-  'time' bigint(20) DEFAULT NULL,
-  PRIMARY KEY ('id')
-) ENGINE=InnoDB AUTO_INCREMENT=16924 DEFAULT CHARSET=utf8 COMMENT='utf8_general_ci'
+#trace
+CREATE TABLE `trace` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `traceId` bigint(128) DEFAULT NULL,
+  `duration` int(11) DEFAULT NULL,
+  `service` varchar(1024) CHARACTER SET utf8 DEFAULT NULL,
+  `time` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=16924 DEFAULT CHARSET=utf8;
diff --git a/modules/hydra-manager-db/src/test/java/service/TestServiceIdGenService.java b/modules/hydra-manager-db/src/test/java/service/TestServiceIdGenService.java
@@ -87,7 +87,7 @@ public void run() {
 
     @Override
     protected String[] getConfigLocations() {
-        String[] location = {"classpath:hydra-manager-db.xml"};
+        String[] location = {"classpath:hydra-manager-db-test.xml"};
         return location;
     }
 

diff --git a/modules/hydra-manager-db/src/test/resources/mybatis/mysql.properties b/modules/hydra-manager-db/src/test/resources/mybatis/mysql.properties
@@ -1,4 +1,4 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.227.48:3306/hydra-config-test
+jdbc.url=jdbc:mysql://192.168.200.113:3306/hydra-config-test
 jdbc.username=root
 jdbc.password=root
diff --git a/modules/hydra-store/hydra-mysql/src/test/resources/mybatis/mysql.properties b/modules/hydra-store/hydra-mysql/src/test/resources/mybatis/mysql.properties
@@ -1,4 +1,4 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.227.48:3306/hydra-config-test
+jdbc.url=jdbc:mysql://192.168.200.113:3306/hydra-config-test
 jdbc.username=root
 jdbc.password=root