diff --git a/src/main/java/cn/mesalab/dao/ReadHistoricalDruidData.java b/src/main/java/cn/mesalab/dao/ReadHistoricalDruidData.java index a596060..d0af9a9 100644 --- a/src/main/java/cn/mesalab/dao/ReadHistoricalDruidData.java +++ b/src/main/java/cn/mesalab/dao/ReadHistoricalDruidData.java @@ -19,14 +19,11 @@ public class ReadHistoricalDruidData implements Callable ATTACK_TYPE_LIST = Arrays.asList( @@ -70,7 +59,6 @@ public class BaselineGeneration { long last = System.currentTimeMillis(); LOG.warn("运行时间:" + (last - start)); - druidConn.close(); hbaseTable.close(); LOG.info("Druid 关闭连接"); @@ -101,8 +89,7 @@ public class BaselineGeneration { for (int i = 0; i < (START_END_TIMES._1-START_END_TIMES._2)/timeGrad; i++) { String sql = DruidData.getDruidQuerySql(START_END_TIMES._1, i, timeGrad); ReadHistoricalDruidData readHistoricalDruidData = new ReadHistoricalDruidData( - sql, - druidStatement + sql ); Future>> future = loadDataExecutor.submit(readHistoricalDruidData); resultList.add(future); @@ -145,8 +132,6 @@ public class BaselineGeneration { if(batchIps.size()>0){ BaselineSingleThread baselineSingleThread = new BaselineSingleThread( batchIps, - druidConn, - druidStatement, hbaseTable, ATTACK_TYPE_LIST, BASELINE_POINT_NUM, diff --git a/src/main/java/cn/mesalab/service/BaselineSingleThread.java b/src/main/java/cn/mesalab/service/BaselineSingleThread.java index 559eee1..4870480 100644 --- a/src/main/java/cn/mesalab/service/BaselineSingleThread.java +++ b/src/main/java/cn/mesalab/service/BaselineSingleThread.java @@ -40,8 +40,6 @@ public class BaselineSingleThread extends Thread { public BaselineSingleThread( List batchIpList, - AvaticaConnection druidConn, - AvaticaStatement druidStatement, Table hbaseTable, List attackTypeList, Integer BASELINE_POINT_NUM, @@ -49,8 +47,6 @@ public class BaselineSingleThread extends Thread { List> historicalData ){ this.ipList = batchIpList; - this.druidConn = druidConn; - this.druidStatement = druidStatement; this.hbaseTable = hbaseTable; this.attackTypeList = attackTypeList; this.BASELINE_POINT_NUM = BASELINE_POINT_NUM; @@ -60,7 +56,6 @@ public class BaselineSingleThread extends Thread { @Override public void run(){ -// batchDruidData = DruidData.readFromDruid(druidConn, druidStatement, ipList, timeFilter); batchDruidData = DruidData.getBatchData(historicalData, ipList); List putList = new ArrayList<>(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0d2c76f..fb82400 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,7 +50,7 @@ baseline.kalman.p=0.000001 baseline.kalman.r=4 # FOR TEST -baseline.generate.batch.size=1000 +baseline.generate.batch.size=100 druid.read.batch.time.grad.hour=4 thread.max.num=10