Merge pull request #401 from youyong205/master

modify the sql

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

@@ -25,7 +25,6 @@ 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));

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,6 +155,9 @@ public class CatFilter implements Filter {
 
 			@Override
 			public void handle(Context ctx) throws IOException, ServletException {
+				boolean isTraceMode = Cat.getManager().isTraceMode();
+
+				if (isTraceMode) {
 					HttpServletRequest req = ctx.getRequest();
 					HttpServletResponse res = ctx.getResponse();
 					MessageProducer producer = Cat.getProducer();
@@ -217,6 +204,7 @@ public class CatFilter implements Filter {
 						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,7 +33,11 @@ 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) {

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

@@ -27,8 +27,7 @@
       </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>