summaryrefslogtreecommitdiff
path: root/IP-learning-graph
diff options
context:
space:
mode:
authorwanglihui <[email protected]>2020-08-10 18:37:53 +0800
committerwanglihui <[email protected]>2020-08-10 18:37:53 +0800
commite946b506d399140bdf3c722139de031628f28ab0 (patch)
tree43eb49e754c9c23f5c996a03bf56eff6071e2396 /IP-learning-graph
parent2a4d6dda4ad2c9b1f57994938abccaadc086ac07 (diff)
修改日志输出
Diffstat (limited to 'IP-learning-graph')
-rw-r--r--IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadHistoryArangoData.java3
-rw-r--r--IP-learning-graph/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java3
-rw-r--r--IP-learning-graph/src/test/java/cn/ac/iie/TestList.java21
3 files changed, 25 insertions, 2 deletions
diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadHistoryArangoData.java b/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadHistoryArangoData.java
index a4541f9..8b51128 100644
--- a/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadHistoryArangoData.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadHistoryArangoData.java
@@ -19,6 +19,7 @@ import static cn.ac.iie.service.ingestion.ReadClickhouseData.*;
* @author wlh
* 多线程全量读取arangoDb历史数据,封装到map
*/
+@SuppressWarnings("unchecked")
public class ReadHistoryArangoData<T extends BaseDocument> extends Thread {
private static final Logger LOG = LoggerFactory.getLogger(ReadHistoryArangoData.class);
@@ -84,7 +85,7 @@ public class ReadHistoryArangoData<T extends BaseDocument> extends Thread {
for (String protocol : ReadClickhouseData.PROTOCOL_SET) {
String protocolRecent = protocol + "_CNT_RECENT";
ArrayList<Long> cntRecent = (ArrayList<Long>) doc.getAttribute(protocolRecent);
- Long[] cntRecentsSrc = cntRecent.toArray(new Long[cntRecent.size()]);
+ Long[] cntRecentsSrc = cntRecent.toArray(new Long[0]);
Long[] cntRecentsDst = new Long[RECENT_COUNT_HOUR];
System.arraycopy(cntRecentsSrc, 0, cntRecentsDst, 1, cntRecentsSrc.length - 1);
cntRecentsDst[0] = 0L;
diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java b/IP-learning-graph/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
index fd4d91e..1346ee3 100644
--- a/IP-learning-graph/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/utils/ArangoDBConnect.java
@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
public class ArangoDBConnect {
@@ -71,7 +72,7 @@ public class ArangoDBConnect {
}
}
- public <T> void overwrite(ArrayList<T> docOverwrite,String collectionName){
+ public <T> void overwrite(List<T> docOverwrite, String collectionName){
ArangoDatabase database = getDatabase();
try {
ArangoCollection collection = database.collection(collectionName);
diff --git a/IP-learning-graph/src/test/java/cn/ac/iie/TestList.java b/IP-learning-graph/src/test/java/cn/ac/iie/TestList.java
index 83ce03c..d437595 100644
--- a/IP-learning-graph/src/test/java/cn/ac/iie/TestList.java
+++ b/IP-learning-graph/src/test/java/cn/ac/iie/TestList.java
@@ -1,10 +1,25 @@
package cn.ac.iie;
+import cn.ac.iie.utils.ArangoDBConnect;
+import com.arangodb.ArangoCursor;
+import com.arangodb.entity.BaseEdgeDocument;
+
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
public class TestList {
public static void main(String[] args) {
+ ArangoDBConnect arangoConnect = ArangoDBConnect.getInstance();
+ ArangoCursor<BaseEdgeDocument> documents = arangoConnect.executorQuery("FOR doc IN R_LOCATE_FQDN2IP filter doc.FIRST_FOUND_TIME >= 1596080839 and doc.FIRST_FOUND_TIME <= 1596395473 RETURN doc", BaseEdgeDocument.class);
+ List<BaseEdgeDocument> baseEdgeDocuments = documents.asListRemaining();
+ for (BaseEdgeDocument doc: baseEdgeDocuments){
+ doc.updateAttribute("PROTOCOL_TYPE","123");
+ }
+
+
+ /*
ArrayList<Integer> integers = new ArrayList<>();
integers.add(10);
integers.add(8);
@@ -14,11 +29,17 @@ public class TestList {
integers.add(4);
integers.add(4);
integers.add(12);
+
+ Integer[] objects = integers.toArray(new Integer[2]);
+ System.out.println(Arrays.toString(objects));
+
+
Collections.sort(integers);
System.out.println(integers);
integers.add(5);
Collections.sort(integers);
System.out.println(integers);
System.out.println(integers.indexOf(5));
+ */
}
}