Merge pull request #401 from youyong205/master

modify the sql

cat-broker/src/main/java/com/dianping/cat/broker/build/ComponentsConfigurator.java

@@ -25,17 +25,16 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(IpService.class));
 		all.add(C(RequestUtils.class));
 		all.add(C(MonitorManager.class).req(UrlPatternConfigManager.class, IpService.class));
-		
 		all.add(C(AppDataConsumer.class).req(AppDataService.class));
 		
 		all.add(C(TableProvider.class,"app-data-command",AppDataCommandTableProvider.class));
-		
+
 		// database
 		all.add(C(JdbcDataSourceDescriptorManager.class) //
 		      .config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml")));
 
 		all.addAll(new AppDatabaseConfigurator().defineComponents());
-		
+
 		// Please keep it as last
 		all.addAll(new WebComponentConfigurator().defineComponents());
 

cat-broker/src/main/resources/META-INF/plexus/components.xml

@@ -163,6 +163,9 @@
 				<requirement>
 					<role>com.dianping.cat.app.AppDataCommandDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.app.AppConfigManager</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>

cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java

@@ -92,20 +92,6 @@ public class CatFilter implements Filter {
 				}
 			}
 
-			protected String getCookie(HttpServletRequest req, String name) {
-				Cookie[] cookies = req.getCookies();
-
-				if (cookies != null) {
-					for (Cookie cookie : cookies) {
-						if (name.equalsIgnoreCase(cookie.getName())) {
-							return cookie.getValue();
-						}
-					}
-				}
-
-				return null;
-			}
-
 			@Override
 			public void handle(Context ctx) throws IOException, ServletException {
 				HttpServletRequest req = ctx.getRequest();
@@ -117,8 +103,6 @@ public class CatFilter implements Filter {
 					ctx.setMode(detectMode(req));
 					ctx.setType(CatConstants.TYPE_URL);
 
-					Cat.setup(getCookie(req, "JSESSIONID"));
-
 					setTraceMode(req);
 				} else {
 					ctx.setType(CatConstants.TYPE_URL_FORWARD);
@@ -171,51 +155,55 @@ public class CatFilter implements Filter {
 
 			@Override
 			public void handle(Context ctx) throws IOException, ServletException {
-				HttpServletRequest req = ctx.getRequest();
-				HttpServletResponse res = ctx.getResponse();
-				MessageProducer producer = Cat.getProducer();
-				int mode = ctx.getMode();
-
-				switch (mode) {
-				case 0:
-					ctx.setId(producer.createMessageId());
-					break;
-				case 1:
-					ctx.setRootId(req.getHeader("X-CAT-ROOT-ID"));
-					ctx.setParentId(req.getHeader("X-CAT-PARENT-ID"));
-					ctx.setId(req.getHeader("X-CAT-ID"));
-					break;
-				case 2:
-					ctx.setRootId(producer.createMessageId());
-					ctx.setParentId(ctx.getRootId());
-					ctx.setId(producer.createMessageId());
-					break;
-				default:
-					throw new RuntimeException(String.format("Internal Error: unsupported mode(%s)!", mode));
-				}
+				boolean isTraceMode = Cat.getManager().isTraceMode();
+
+				if (isTraceMode) {
+					HttpServletRequest req = ctx.getRequest();
+					HttpServletResponse res = ctx.getResponse();
+					MessageProducer producer = Cat.getProducer();
+					int mode = ctx.getMode();
+
+					switch (mode) {
+					case 0:
+						ctx.setId(producer.createMessageId());
+						break;
+					case 1:
+						ctx.setRootId(req.getHeader("X-CAT-ROOT-ID"));
+						ctx.setParentId(req.getHeader("X-CAT-PARENT-ID"));
+						ctx.setId(req.getHeader("X-CAT-ID"));
+						break;
+					case 2:
+						ctx.setRootId(producer.createMessageId());
+						ctx.setParentId(ctx.getRootId());
+						ctx.setId(producer.createMessageId());
+						break;
+					default:
+						throw new RuntimeException(String.format("Internal Error: unsupported mode(%s)!", mode));
+					}
 
-				MessageTree tree = Cat.getManager().getThreadLocalMessageTree();
-
-				tree.setMessageId(ctx.getId());
-				tree.setParentMessageId(ctx.getParentId());
-				tree.setRootMessageId(ctx.getRootId());
-
-				res.setHeader("X-CAT-SERVER", getCatServer());
-
-				switch (mode) {
-				case 0:
-					res.setHeader("X-CAT-ROOT-ID", ctx.getId());
-					break;
-				case 1:
-					res.setHeader("X-CAT-ROOT-ID", ctx.getRootId());
-					res.setHeader("X-CAT-PARENT-ID", ctx.getParentId());
-					res.setHeader("X-CAT-ID", ctx.getId());
-					break;
-				case 2:
-					res.setHeader("X-CAT-ROOT-ID", ctx.getRootId());
-					res.setHeader("X-CAT-PARENT-ID", ctx.getParentId());
-					res.setHeader("X-CAT-ID", ctx.getId());
-					break;
+					MessageTree tree = Cat.getManager().getThreadLocalMessageTree();
+
+					tree.setMessageId(ctx.getId());
+					tree.setParentMessageId(ctx.getParentId());
+					tree.setRootMessageId(ctx.getRootId());
+
+					res.setHeader("X-CAT-SERVER", getCatServer());
+
+					switch (mode) {
+					case 0:
+						res.setHeader("X-CAT-ROOT-ID", ctx.getId());
+						break;
+					case 1:
+						res.setHeader("X-CAT-ROOT-ID", ctx.getRootId());
+						res.setHeader("X-CAT-PARENT-ID", ctx.getParentId());
+						res.setHeader("X-CAT-ID", ctx.getId());
+						break;
+					case 2:
+						res.setHeader("X-CAT-ROOT-ID", ctx.getRootId());
+						res.setHeader("X-CAT-PARENT-ID", ctx.getParentId());
+						res.setHeader("X-CAT-ID", ctx.getId());
+						break;
+					}
 				}
 
 				ctx.handle();
@@ -531,7 +519,6 @@ public class CatFilter implements Filter {
 		public String toString() {
 			return m_cookie.toString();
 		}
-
 	}
 
 	protected static interface Handler {

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/metric/MetricConfigManagerTest.java

@@ -74,7 +74,6 @@ public class MetricConfigManagerTest {
 		configs.put(item, 3L);
 		Assert.assertEquals(3L, configs.get(item).longValue());
 		Assert.assertEquals(1, configs.size());
-
 	}
 
 	@Test

cat-core/src/main/java/com/dianping/cat/config/app/AppDataService.java

@@ -33,9 +33,13 @@ public class AppDataService {
 	public static final String DELAY_AVG = "成功延时(ms)";
 
 	public void insert(AppDataCommand proto) throws DalException {
-		m_dao.insertData(proto);
+		m_dao.insert(proto);
 	}
 
+	public void insert(AppDataCommand[] proto) throws DalException {
+		m_dao.insert(proto);
+	}
+	
 	public double[] queryValue(QueryEntity entity, String type) {
 		int commandId = entity.getCommand();
 		Date period = entity.getDate();

cat-core/src/main/resources/META-INF/dal/jdbc/app-dal.xml

@@ -27,11 +27,10 @@
       </readset>
     </readsets>
     <query-defs>
-	  <query name="insert-data" type="INSERT">
-        <param name="command-id" />
+	  <query name="insert" type="INSERT"  batch="true">
         <statement><![CDATA[INSERT INTO <TABLE/>(<FIELDS/>)
         VALUES(<VALUES/>)]]></statement>
-      </query>    	
+      </query>  
       <query name="find-data-by-minute" type="SELECT" multiple="true">
         <param name="command-id" /><param name="period" />
         <param name="period" />

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertInfo.java

@@ -38,7 +38,7 @@ public class AlertInfo implements Initializable {
 				keys.add(entry.getKey());
 			}
 		}
-		
+
 		return keys;
 	}