Changeset 18

Timestamp:

08/13/07 16:41:30 (1 year ago)

Author:

pitt-zhang

Message:

fix the 0 hop bug of deliver() in planet.test.dht.dhtapplication.java

Location:

trunk/src/planet

Files:

• chord/ChordNode.java (modified) (1 diff)
• simulate/Results.java (modified) (2 diffs)
• test/dht/DHTApplication.java (modified) (1 diff)
• test/dht/DHTMessage.java (modified) (1 diff)

trunk/src/planet/chord/ChordNode.java

@@ -591 +591 @@
                 } else {
             sendData(message,closestPrecedingFinger(nextHop.getId()),REQUEST);
-                        Results.updateHopsMsg(message.getSource().getId(), message.getKey());
-                }
+                }
+                Results.updateHopsMsg(message.getSource().getId(), message.getKey());
         }
         

trunk/src/planet/simulate/Results.java

@@ -134 +134 @@
           }
           else {                                         
-            hops.put(identif,new Integer(1));
+            hops.put(identif,new Integer(0));
           }                       
         }
@@ -216 +216 @@
     }
         
+        /**
+         *  the lookup and insert times 
+         */
         private static int lookup_number = 0;
         /**

trunk/src/planet/test/dht/DHTApplication.java

@@ -108 +108 @@
                 data.put(mesg.getKey(), v);
             }
-        }
-        // Message of type LOOKUP
-        else {
-            System.out.println("The local node is["+endPoint.getId()+"], and the mesg.originNode is ["+mesg.getOriginNode().getId()+"]");
-            //the response arrive to the source sender node
-            if (endPoint.getId().equals(mesg.getOriginNode().getId()))
-            {
-                //if there is no contents, the key not exits into the DHT
-                if (mesg.getVectorValue() == null)
-                {
-                    System.out.println("Fail: The key {"+mesg.getKey()+
-                            "} not found");
-                } else
-                {
-                    System.out.println("Success: The key {"+mesg.getKey()+
-                            "} has the values {"+mesg.getVectorValue()+"}");
-                }
-            }
-            //the message arrives to the final receiver node.
-            else
-            {
-                DHTMessage msg = new DHTMessage(mesg.getOriginNode(),
-                        DHTMessage.LOOKUP, mesg.getKey(), (Vector) data
-                                .get(mesg.getKey()));
-                endPoint.route(mesg.getOriginNode().getId(), msg, mesg.getOriginNode());
-            }
-        }       
-    }
+        } else if(mesg.getType() == DHTMessage.REPLY){
+                        
+                        
+                
+                        // the response arrive to the source sender node
+                        if (endPoint.getId().equals(mesg.getOriginNode().getId())) {
+                                
+                                // if there is no contents, the key not exits into the DHT
+                                if (mesg.getVectorValue() == null) {
+                                        System.out.println("Fail: The key {" + mesg.getKey()
+                                                        + "} not found");
+                                } else {
+                                        System.out.println("Success: The key {" + mesg.getKey()
+                                                        + "} has the values {" + mesg.getVectorValue()
+                                                        + "}");
+                                }
+                        }
+                        
+                } else{
+                        
+                        // the message arrives to the final receiver node.
+                        
+                        System.out.println("The local node is[" + endPoint.getId()
+                                        + "], and the mesg.originNode is ["
+                                        + mesg.getOriginNode().getId() + "]");
+                        
+                                DHTMessage msg = new DHTMessage(mesg.getOriginNode(),
+                                                DHTMessage.REPLY, mesg.getKey(), (Vector) data
+                                                                .get(mesg.getKey()));
+                                endPoint.route(mesg.getOriginNode().getId(), msg, mesg
+                                                .getOriginNode());
+                        
+                }
+        }
+   
         /**
          * Generate a string with a representation of keys and values existing at

trunk/src/planet/test/dht/DHTMessage.java

@@ -31 +31 @@
    */
   public static final int LOOKUP = 1;
+  
+  /**
+ * Reply message when find or not find the data. 
+ */
+  public static final int REPLY =2;