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

Content Lookup Operation Update

Browse Source 
Before the content lookup operation used to lookup a specified set of nodes then return the latest content; a short review of the paper showed that we only lookup until we find the Value then exit as soon as we do. Made the updates to the code.
This commit is contained in:
Joshua Kissoon 2014-04-26 22:09:45 +05:30
parent 4fab4320df
commit 41fb630515
6 changed files with 45 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/kademlia/Kademlia.java
View File

@ -8,8 +8,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@ -20,6 +18,7 @@ import kademlia.core.KadServer;
import kademlia.dht.DHT; import kademlia.dht.DHT;
import kademlia.dht.KadContent; import kademlia.dht.KadContent;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
import kademlia.exceptions.ContentNotFoundException;
import kademlia.exceptions.RoutingException; import kademlia.exceptions.RoutingException;
import kademlia.message.MessageFactory; import kademlia.message.MessageFactory;
import kademlia.node.Node; import kademlia.node.Node;
@ -266,33 +265,24 @@ public class Kademlia
* Get some content stored on the DHT * Get some content stored on the DHT
* The content returned is a JSON String in byte format; this string is parsed into a class * The content returned is a JSON String in byte format; this string is parsed into a class
* *
* @param param The parameters used to search for the content * @param param The parameters used to search for the content
* @param numNodesToQuery How many nodes should we query to get this content. We return all content on these nodes.
* *
* @return DHTContent The content * @return DHTContent The content
* *
* @throws java.io.IOException * @throws java.io.IOException
*/ */
public List<StorageEntry> get(GetParameter param, int numNodesToQuery) throws NoSuchElementException, IOException public StorageEntry get(GetParameter param) throws NoSuchElementException, IOException, ContentNotFoundException
{ {
List contentFound = new ArrayList<>();;
if (this.dht.contains(param)) if (this.dht.contains(param))
{ {
/* If the content exist in our own DHT, then return it. */ /* If the content exist in our own DHT, then return it. */
contentFound.add(this.dht.get(param)); return this.dht.get(param);
}
if (contentFound.size() == numNodesToQuery)
{
return contentFound;
} }
/* Seems like it doesn't exist in our DHT, get it from other Nodes */ /* Seems like it doesn't exist in our DHT, get it from other Nodes */
ContentLookupOperation clo = new ContentLookupOperation(server, localNode, param, numNodesToQuery, this.config); ContentLookupOperation clo = new ContentLookupOperation(server, localNode, param, this.config);
clo.execute(); clo.execute();
contentFound = clo.getContentFound(); return clo.getContentFound();
return contentFound;
} }
/** /**

42
src/kademlia/operation/ContentLookupOperation.java
View File

@ -14,6 +14,7 @@ import kademlia.dht.GetParameter;
import kademlia.core.KadConfiguration; import kademlia.core.KadConfiguration;
import kademlia.core.KadServer; import kademlia.core.KadServer;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
import kademlia.exceptions.ContentNotFoundException;
import kademlia.exceptions.RoutingException; import kademlia.exceptions.RoutingException;
import kademlia.exceptions.UnknownMessageException; import kademlia.exceptions.UnknownMessageException;
import kademlia.message.ContentLookupMessage; import kademlia.message.ContentLookupMessage;
@ -40,14 +41,12 @@ public class ContentLookupOperation implements Operation, Receiver
private final KadServer server; private final KadServer server;
private final Node localNode; private final Node localNode;
private final GetParameter params; private StorageEntry contentFound = null;
private final List<StorageEntry> contentFound;
private final int numNodesToQuery;
private final KadConfiguration config; private final KadConfiguration config;
private final ContentLookupMessage lookupMessage; private final ContentLookupMessage lookupMessage;
private boolean contentsFound; private boolean isContentFound;
private final SortedMap<Node, Byte> nodes; private final SortedMap<Node, Byte> nodes;
/* Tracks messages in transit and awaiting reply */ /* Tracks messages in transit and awaiting reply */
@ -58,27 +57,23 @@ public class ContentLookupOperation implements Operation, Receiver
{ {
contentFound = new ArrayList<>();
messagesTransiting = new HashMap<>(); messagesTransiting = new HashMap<>();
contentsFound = false; isContentFound = false;
} }
/** /**
* @param server * @param server
* @param localNode * @param localNode
* @param params The parameters to search for the content which we need to find * @param params The parameters to search for the content which we need to find
* @param numNodesToQuery The number of nodes to query to get this content. We return the content among these nodes.
* @param config * @param config
*/ */
public ContentLookupOperation(KadServer server, Node localNode, GetParameter params, int numNodesToQuery, KadConfiguration config) public ContentLookupOperation(KadServer server, Node localNode, GetParameter params, KadConfiguration config)
{ {
/* Construct our lookup message */ /* Construct our lookup message */
this.lookupMessage = new ContentLookupMessage(localNode, params); this.lookupMessage = new ContentLookupMessage(localNode, params);
this.server = server; this.server = server;
this.localNode = localNode; this.localNode = localNode;
this.params = params;
this.numNodesToQuery = numNodesToQuery;
this.config = config; this.config = config;
/** /**
@ -111,7 +106,7 @@ public class ContentLookupOperation implements Operation, Receiver
int timeInterval = 100; // We re-check every 300 milliseconds int timeInterval = 100; // We re-check every 300 milliseconds
while (totalTimeWaited < this.config.operationTimeout()) while (totalTimeWaited < this.config.operationTimeout())
{ {
if (!this.askNodesorFinish() && !contentsFound) if (!this.askNodesorFinish() && !isContentFound)
{ {
wait(timeInterval); wait(timeInterval);
totalTimeWaited += timeInterval; totalTimeWaited += timeInterval;
@ -230,7 +225,7 @@ public class ContentLookupOperation implements Operation, Receiver
@Override @Override
public synchronized void receive(Message incoming, int comm) throws IOException, RoutingException public synchronized void receive(Message incoming, int comm) throws IOException, RoutingException
{ {
if (this.contentsFound) if (this.isContentFound)
{ {
return; return;
} }
@ -246,14 +241,8 @@ public class ContentLookupOperation implements Operation, Receiver
/* Get the Content and check if it satisfies the required parameters */ /* Get the Content and check if it satisfies the required parameters */
StorageEntry content = msg.getContent(); StorageEntry content = msg.getContent();
System.out.println("Content Received: " + content); System.out.println("Content Received: " + content);
this.contentFound = content;
this.contentFound.add(content); this.isContentFound = true;
if (this.contentFound.size() == this.numNodesToQuery)
{
/* We've got all the content required, let's stop the loopup operation */
this.contentsFound = true;
}
} }
else else
{ {
@ -305,8 +294,15 @@ public class ContentLookupOperation implements Operation, Receiver
/** /**
* @return The list of all content found during the lookup operation * @return The list of all content found during the lookup operation
*/ */
public List<StorageEntry> getContentFound() public StorageEntry getContentFound() throws ContentNotFoundException
{ {
return this.contentFound; if (this.isContentFound)
{
return this.contentFound;
}
else
{
throw new ContentNotFoundException("No Value was found for the given key.");
}
} }
} }

13
src/kademlia/tests/ContentSendingTest.java
View File

@ -1,10 +1,10 @@
package kademlia.tests; package kademlia.tests;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import kademlia.dht.GetParameter; import kademlia.dht.GetParameter;
import kademlia.Kademlia; import kademlia.Kademlia;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
import kademlia.exceptions.ContentNotFoundException;
import kademlia.node.NodeId; import kademlia.node.NodeId;
/** /**
@ -40,15 +40,12 @@ public class ContentSendingTest
GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE); GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE);
gp.setOwnerId(c.getOwnerId()); gp.setOwnerId(c.getOwnerId());
System.out.println("Get Parameter: " + gp); System.out.println("Get Parameter: " + gp);
List<StorageEntry> conte = kad2.get(gp, 4); StorageEntry conte = kad2.get(gp);
for (StorageEntry cc : conte) System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
{ System.out.println("Content Metadata: " + conte.getContentMetadata());
System.out.println("Content Found: " + new DHTContentImpl().fromBytes(cc.getContent().getBytes()));
System.out.println("Content Metadata: " + cc.getContentMetadata());
}
} }
catch (IOException e) catch (IOException | ContentNotFoundException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }

23
src/kademlia/tests/ContentUpdatingTest.java
View File

@ -1,10 +1,10 @@
package kademlia.tests; package kademlia.tests;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import kademlia.dht.GetParameter; import kademlia.dht.GetParameter;
import kademlia.Kademlia; import kademlia.Kademlia;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
import kademlia.exceptions.ContentNotFoundException;
import kademlia.node.NodeId; import kademlia.node.NodeId;
/** /**
@ -34,13 +34,11 @@ public class ContentUpdatingTest
/* Lets retrieve the content */ /* Lets retrieve the content */
System.out.println("Retrieving Content"); System.out.println("Retrieving Content");
GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE, c.getOwnerId()); GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE, c.getOwnerId());
System.out.println("Get Parameter: " + gp); System.out.println("Get Parameter: " + gp);
List<StorageEntry> conte = kad2.get(gp, 4); StorageEntry conte = kad2.get(gp);
for (StorageEntry cc : conte) System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
{ System.out.println("Content Metadata: " + conte.getContentMetadata());
System.out.println("Content Found: " + new DHTContentImpl().fromBytes(cc.getContent().getBytes()));
System.out.println("Content Metadata: " + cc.getContentMetadata());
}
/* Lets update the content and put it again */ /* Lets update the content and put it again */
c.setData("Some New Data"); c.setData("Some New Data");
@ -48,15 +46,12 @@ public class ContentUpdatingTest
/* Lets retrieve the content */ /* Lets retrieve the content */
System.out.println("Retrieving Content Again"); System.out.println("Retrieving Content Again");
conte = kad2.get(gp, 4); conte = kad2.get(gp);
for (StorageEntry cc : conte) System.out.println("Content Found: " + new DHTContentImpl().fromBytes(conte.getContent().getBytes()));
{ System.out.println("Content Metadata: " + conte.getContentMetadata());
System.out.println("Content Found: " + new DHTContentImpl().fromBytes(cc.getContent().getBytes()));
System.out.println("Content Metadata: " + cc.getContentMetadata());
}
} }
catch (IOException e) catch (IOException | ContentNotFoundException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }

6
src/kademlia/tests/RefreshOperationTest.java
View File

@ -1,10 +1,10 @@
package kademlia.tests; package kademlia.tests;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import kademlia.dht.GetParameter; import kademlia.dht.GetParameter;
import kademlia.Kademlia; import kademlia.Kademlia;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
import kademlia.exceptions.ContentNotFoundException;
import kademlia.node.NodeId; import kademlia.node.NodeId;
/** /**
@ -33,11 +33,11 @@ public class RefreshOperationTest
GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE); GetParameter gp = new GetParameter(c.getKey(), DHTContentImpl.TYPE);
gp.setType(DHTContentImpl.TYPE); gp.setType(DHTContentImpl.TYPE);
gp.setOwnerId(c.getOwnerId()); gp.setOwnerId(c.getOwnerId());
List<StorageEntry> conte = kad2.get(gp, 1); StorageEntry conte = kad2.get(gp);
kad2.refresh(); kad2.refresh();
} }
catch (IOException e) catch (IOException | ContentNotFoundException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }

15
src/kademlia/tests/SaveStateTest2.java
View File

@ -1,6 +1,5 @@
package kademlia.tests; package kademlia.tests;
import java.util.List;
import kademlia.Kademlia; import kademlia.Kademlia;
import kademlia.dht.GetParameter; import kademlia.dht.GetParameter;
import kademlia.dht.StorageEntry; import kademlia.dht.StorageEntry;
@ -53,17 +52,9 @@ public class SaveStateTest2
/* Trying to get a content stored on the restored node */ /* Trying to get a content stored on the restored node */
GetParameter gp = new GetParameter(c.getKey(), kad2.getOwnerId(), c.getType()); GetParameter gp = new GetParameter(c.getKey(), kad2.getOwnerId(), c.getType());
List<StorageEntry> content = kad2.get(gp, 1); StorageEntry content = kad2.get(gp);
DHTContentImpl cc = new DHTContentImpl().fromBytes(content.getContent().getBytes());
if (!content.isEmpty()) System.out.println("Content received: " + cc);
{
DHTContentImpl cc = new DHTContentImpl().fromBytes(content.get(0).getContent().getBytes());
System.out.println("Content received: " + cc);
}
else
{
System.out.println("No Content found");
}
} }
catch (Exception e) catch (Exception e)