commit a5f0c580ec1aca9d80bc02ba82eb5b0f73339f66
author Jian Li <pyguni@gmail.com> Sat May 13 03:52:36 2017 +0900
committer Jian Li <pyguni@gmail.com> Mon May 22 09:53:56 2017 +0000
tree 07601b582ee9973e455bbcb86b5ff888cc865c53
parent 26c397c52d5e51fff022138e4fecfd6fc0ccd8a4

Improve MapDB query speed by parallelly checking the address range

Change-Id: I714d56277de89ff11803349f9d6d3c386ef6c9d3

protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java

diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
index 8878349..4cfaf12 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispMappingDatabase.java
@@ -25,10 +25,13 @@
 import org.onosproject.lisp.msg.protocols.LispMapRecord;
 import org.onosproject.lisp.msg.protocols.LispProxyMapRecord;
 import org.onosproject.lisp.msg.types.LispAfiAddress;
+import org.slf4j.Logger;
 
 import java.util.List;
 import java.util.Optional;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * A singleton class that stores EID-RLOC mapping information.
  */
@@ -36,7 +39,9 @@
 
     private static final long MINUTE_TO_MS_UNIT = 60 * 1000;
 
-    private ExpireMap<LispEidRecord, LispProxyMapRecord> map = new ExpireHashMap<>();
+    private static final Logger log = getLogger(LispMappingDatabase.class);
+
+    private final ExpireMap<LispEidRecord, LispProxyMapRecord> map = new ExpireHashMap<>();
 
     /**
      * Prevents object instantiation from external.
@@ -110,14 +115,14 @@
      * @param proxyMapReply proxy map reply flag
      * @return an EID-RLOC mapping record
      */
-    public LispMapRecord getMapRecordByEidRecord(LispEidRecord eid, boolean proxyMapReply) {
-
-        for (LispEidRecord key : map.keySet()) {
-            if (isInRange(key, eid)) {
-                LispProxyMapRecord record = map.get(key);
-                if (record != null && record.isProxyMapReply() == proxyMapReply) {
-                    return record.getMapRecord();
-                }
+    public LispMapRecord getMapRecordByEidRecord(LispEidRecord eid,
+                                                 boolean proxyMapReply) {
+        Optional<LispEidRecord> filteredEidRecord = map.keySet().parallelStream()
+                .filter(k -> isInRange(k, eid)).findAny();
+        if (filteredEidRecord.isPresent()) {
+            LispProxyMapRecord record = map.get(filteredEidRecord.get());
+            if (record != null && record.isProxyMapReply() == proxyMapReply) {
+                return record.getMapRecord();
             }
         }
 
@@ -136,7 +141,8 @@
                                                         boolean proxyMapReply) {
         List<LispMapRecord> mapRecords = Lists.newArrayList();
         eids.forEach(eidRecord -> {
-            LispMapRecord mapRecord = getMapRecordByEidRecord(eidRecord, proxyMapReply);
+            LispMapRecord mapRecord =
+                    getMapRecordByEidRecord(eidRecord, proxyMapReply);
             if (mapRecord != null) {
                 mapRecords.add(mapRecord);
             }
@@ -152,7 +158,8 @@
      */
     public LispMapRecord getMapRecordByEidAddress(LispAfiAddress address) {
         Optional<LispEidRecord> eidRecord =
-                map.keySet().stream().filter(k -> k.getPrefix().equals(address)).findFirst();
+                map.keySet().stream().filter(k ->
+                        k.getPrefix().equals(address)).findFirst();
         return eidRecord.map(lispEidRecord ->
                 map.get(lispEidRecord).getMapRecord()).orElse(null);
     }