diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java b/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java index 12772bd..b16be3b 100644 --- a/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java +++ b/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java @@ -105,6 +105,7 @@ public class ReadClickhouseData { newDoc.setKey(subscriberId); newDoc.addAttribute("FIRST_FOUND_TIME", firstFoundTime); newDoc.addAttribute("LAST_FOUND_TIME", lastFoundTime); + newDoc.addAttribute("SUBSCRIBER_ID",subscriberId); } catch (Exception e) { e.printStackTrace(); } diff --git a/IP-learning-graph/src/main/resources/application.properties b/IP-learning-graph/src/main/resources/application.properties index ed8bb1f..dd055d9 100644 --- a/IP-learning-graph/src/main/resources/application.properties +++ b/IP-learning-graph/src/main/resources/application.properties @@ -1,6 +1,6 @@ #arangoDB参数配置 -#arangoDB.host=192.168.40.182 -arangoDB.host=192.168.40.224 +arangoDB.host=192.168.40.182 +#arangoDB.host=192.168.40.224 arangoDB.port=8529 arangoDB.user=upsert arangoDB.password=ceiec2018 @@ -9,7 +9,7 @@ arangoDB.DB.name=ip-learning-test arangoDB.batch=100000 arangoDB.ttl=3600 -arangoDB.read.limit=limit 100 +arangoDB.read.limit= update.arango.batch=10000 thread.pool.number=10 @@ -17,9 +17,9 @@ thread.await.termination.time=10 #读取clickhouse时间范围方式,0:读取过去一小时,1:指定时间范围 -time.limit.type=0 -read.clickhouse.max.time=1595833062 -read.clickhouse.min.time=1595833060 +time.limit.type=1 +read.clickhouse.max.time=1596684142 +read.clickhouse.min.time=1596425769 update.interval=3600 distinct.client.ip.num=10000 diff --git a/IP-learning-graph/src/main/resources/clickhouse.properties b/IP-learning-graph/src/main/resources/clickhouse.properties index f3607e9..3b18aa4 100644 --- a/IP-learning-graph/src/main/resources/clickhouse.properties +++ b/IP-learning-graph/src/main/resources/clickhouse.properties @@ -1,9 +1,9 @@ drivers=ru.yandex.clickhouse.ClickHouseDriver mdb.user=default -#db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=300000 -#mdb.password=111111 -db.id=192.168.40.224:8123/tsg_galaxy_v3?socket_timeout=300000 -mdb.password=ceiec2019 +db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=300000 +mdb.password=111111 +#db.id=192.168.40.224:8123/tsg_galaxy_v3?socket_timeout=300000 +#mdb.password=ceiec2019 initialsize=1 minidle=1 maxactive=50 diff --git a/IP-learning-graph/src/test/java/cn/ac/iie/readHistoryDataTest.java b/IP-learning-graph/src/test/java/cn/ac/iie/readHistoryDataTest.java new file mode 100644 index 0000000..56f9b50 --- /dev/null +++ b/IP-learning-graph/src/test/java/cn/ac/iie/readHistoryDataTest.java @@ -0,0 +1,10 @@ +package cn.ac.iie; + +import cn.ac.iie.dao.BaseArangoData; +import com.arangodb.entity.BaseEdgeDocument; + +public class readHistoryDataTest { + public static void main(String[] args) { + BaseArangoData baseArangoData = new BaseArangoData(); + } +}