ChronosXYZ/KademliaDHT
1
0
Fork 0
mirror of https://github.com/ChronosX88/KademliaDHT.git synced 2024-11-22 10:12:19 +00:00
Code Issues Projects Releases Wiki Activity

Routing Table Find Closest

Browse Source 
- Added a shorter method
- Create a treeset to sort the nodes
- Add all nodes in the routing table to the treeset
- Then select the top Q nodes required from the treeset
This commit is contained in:
Joshua Kissoon 2014-05-09 09:27:35 +05:30
parent 89d5c48d28
commit f66d5f662f
1 changed files with 11 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/kademlia/routing/RoutingTable.java
View File

@ -2,7 +2,9 @@ package kademlia.routing;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.TreeSet;
import kademlia.core.KadConfiguration; import kademlia.core.KadConfiguration;
import kademlia.node.KeyComparator;
import kademlia.node.Node; import kademlia.node.Node;
import kademlia.node.NodeId; import kademlia.node.NodeId;
@ -45,6 +47,7 @@ public class RoutingTable implements KadRoutingTable
} }
} }
@Override
public void setConfiguration(KadConfiguration config) public void setConfiguration(KadConfiguration config)
{ {
this.config = config; this.config = config;
@ -99,83 +102,21 @@ public class RoutingTable implements KadRoutingTable
@Override @Override
public synchronized final List<Node> findClosest(NodeId target, int numNodesRequired) public synchronized final List<Node> findClosest(NodeId target, int numNodesRequired)
{ {
TreeSet<Node> sortedSet = new TreeSet<>(new KeyComparator(target));
sortedSet.addAll(this.getAllNodes());
List<Node> closest = new ArrayList<>(numNodesRequired); List<Node> closest = new ArrayList<>(numNodesRequired);
/* Get the bucket index to search for closest from */ /* Now we have the sorted set, lets get the top numRequired */
int bucketIndex = this.getBucketId(target); int count = 0;
for (Node n : sortedSet)
/* Add the contacts from this bucket to the return contacts */
for (Contact c : this.buckets[bucketIndex].getContacts())
{ {
if (closest.size() < numNodesRequired) closest.add(n);
{ if (++count == numNodesRequired)
closest.add(c.getNode());
}
else
{ {
break; break;
} }
} }
if (closest.size() >= numNodesRequired)
{
return closest;
}
/**
* We still need more nodes
* Lets add from nodes closer to localNode since they are the ones that will be closer to the given nid
*/
for (int i = 1; (bucketIndex - i) >= 0; i++)
{
for (Contact c : this.buckets[bucketIndex - i].getContacts())
{
if (closest.size() < numNodesRequired)
{
closest.add(c.getNode());
}
else
{
break;
}
}
/* If we have enough contacts, then stop adding */
if (closest.size() >= numNodesRequired)
{
break;
}
}
if (closest.size() >= numNodesRequired)
{
return closest;
}
/**
* We still need more nodes, add from nodes farther to localNode
*/
for (int i = 1; (bucketIndex + i) < NodeId.ID_LENGTH; i++)
{
for (Contact c : this.buckets[bucketIndex + i].getContacts())
{
if (closest.size() < numNodesRequired)
{
closest.add(c.getNode());
}
else
{
break;
}
}
/* If we have enough contacts, then stop adding */
if (closest.size() >= numNodesRequired)
{
break;
}
}
return closest; return closest;
} }