diff options
| author | wanglihui <[email protected]> | 2020-08-25 10:31:22 +0800 |
|---|---|---|
| committer | wanglihui <[email protected]> | 2020-08-25 10:31:22 +0800 |
| commit | ad1bef2466b31e0bcda715bf2384bb231b67034a (patch) | |
| tree | 90ca07be7091cd0a228fdec3656ecc18767ece72 | |
| parent | abb3b4162b90a617186746f4ad1c91ddd0b7a209 (diff) | |
中心测试版本
3 files changed, 5 insertions, 5 deletions
diff --git a/ip-learning-spark/src/main/resources/application.properties b/ip-learning-spark/src/main/resources/application.properties index 0010b23..3aded0c 100644 --- a/ip-learning-spark/src/main/resources/application.properties +++ b/ip-learning-spark/src/main/resources/application.properties @@ -39,7 +39,7 @@ read.arango.min.time=1571245200 arangoDB.read.limit= update.arango.batch=10000 -distinct.client.ip.num=10000 +distinct.client.ip.num=1 recent.count.hour=24 -update.interval=10800 +update.interval=3600 diff --git a/ip-learning-spark/src/main/scala/cn/ac/iie/dao/BaseClickhouseData.scala b/ip-learning-spark/src/main/scala/cn/ac/iie/dao/BaseClickhouseData.scala index 99496ea..fd89811 100644 --- a/ip-learning-spark/src/main/scala/cn/ac/iie/dao/BaseClickhouseData.scala +++ b/ip-learning-spark/src/main/scala/cn/ac/iie/dao/BaseClickhouseData.scala @@ -31,7 +31,7 @@ object BaseClickhouseData { } def loadConnectionDataFromCk(): Unit ={ - val where = "common_recv_time >= " + timeLimit._2 + " AND common_recv_time < " + timeLimit._1 + val where = "common_recv_time >= " + timeLimit._2 + " AND common_recv_time < " + timeLimit._1 + " and common_schema_type != 'BASE'" val sql = s""" |(SELECT diff --git a/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala b/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala index fda2b00..d3e4af5 100644 --- a/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala +++ b/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala @@ -26,8 +26,8 @@ object UpdateDocument { def update(): Unit = { try { - updateDocument("FQDN", historyVertexFqdnMap, getVertexFqdnRow, classOf[BaseDocument], mergeVertexFqdn) - updateDocument("IP", historyVertexIpMap, getVertexIpRow, classOf[BaseDocument], mergeVertexIp) +// updateDocument("FQDN", historyVertexFqdnMap, getVertexFqdnRow, classOf[BaseDocument], mergeVertexFqdn) +// updateDocument("IP", historyVertexIpMap, getVertexIpRow, classOf[BaseDocument], mergeVertexIp) updateDocument("R_LOCATE_FQDN2IP", historyRelationFqdnAddressIpMap, getRelationFqdnLocateIpRow, classOf[BaseEdgeDocument], mergeRelationFqdnLocateIp) } catch { case e: Exception => e.printStackTrace() |