Changeset 6835 for source

Timestamp:

Nov 5, 2009, 10:18:18 AM (15 years ago)

Author:

mies

Message:

added replace flag

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (2 diffs)
• BaseOverlay.h (modified) (1 diff)
• messages/DHTMessage.cpp (modified) (4 diffs)
• messages/DHTMessage.h (modified) (3 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -2108 +2108 @@
         switch (msg->getType()) {
         case OverlayMsg::typeDHTPut: {
+                if (dhtMsg->doReplace()) dht->remove(dhtMsg->getKey());
                 BOOST_FOREACH( Data value, dhtMsg->getValues() )
                                         dht->put(dhtMsg->getKey(), value, dhtMsg->getTTL() );
@@ -2145 +2146 @@
 
 /// put a value to the DHT with a ttl given in seconds
-void BaseOverlay::dhtPut( const Data& key, const Data& value, int ttl ) {
+void BaseOverlay::dhtPut( const Data& key, const Data& value, int ttl, bool replace ) {
 
         logging_info("DHT: putting key=" <<  key
                         << " value=" << value
                         << " ttl=" << ttl
+                        << " replace=" << replace
         );
 
+
         // put into local data store (for refreshes)
-        localDHT->put(key,value,ttl);
+        if (replace) localDHT->remove(key);
+        localDHT->put(key, value, ttl);
 
         // calculate hash
         NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key,value);
+        dhtmsg.setReplace(replace);
         dhtmsg.setTTL(ttl);
 

source/ariba/overlay/BaseOverlay.h

@@ -279 +279 @@
 
         /// put a value to the DHT with a ttl given in seconds
-        void dhtPut( const Data& key, const Data& value, int ttl = 0);
+        void dhtPut( const Data& key, const Data& value, int ttl = 0, bool replace = false);
 
         /// removes a key value pair from the DHT

source/ariba/overlay/messages/DHTMessage.cpp

@@ -11 +11 @@
         this->key.setLength(0);
         this->ttl =0 ;
+        this->replace = false;
 }
 
@@ -18 +19 @@
         this->key = key.clone();
         this->ttl =0 ;
+        this->replace = false;
 }
 
@@ -26 +28 @@
         this->values.push_back(  value.clone() );
         this->ttl =0 ;
+        this->replace = false;
 }
 
@@ -32 +35 @@
         BOOST_FOREACH(const Data value, values )
                         this->values.push_back( value.clone() );
+        this->replace = false;
 }
 

source/ariba/overlay/messages/DHTMessage.h

@@ -44 +44 @@
         }
 
+        void setReplace( bool replace ) {
+                this->replace = replace;
+        }
+
+        bool doReplace() const {
+                return replace;
+        }
+
         /// return alles values for the key
         const vector<Data>& getValues() const {
@@ -52 +60 @@
         NodeID hash;
         uint16_t ttl;
+        bool replace;
         Data key;
         vector<Data> values;
@@ -60 +69 @@
 sznBeginDefault( ariba::overlay::DHTMessage, X ) {
 
+        // serialize flags
+        X && replace && cI(0,7);
+
+        // serialize tll
         X && ttl;