Merge tag 'neo-v0.6.1' into neo-v0.x.x

neo-v0.6.1
daniel-zullo · Jul 18, 2018 · 35627c1 · 35627c1
2 parents 6331275 + 554e957
commit 35627c1
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 23 deletions.
diff --git a/src/dhtproto/client/legacy/DhtConst.d b/src/dhtproto/client/legacy/DhtConst.d
@@ -66,7 +66,7 @@ static:
 
     ***************************************************************************/
 
-    public const RecordSizeLimit = RecordBatch.DefaultMaxBatchSize;
+    public const RecordSizeLimit = RecordBatcher.DefaultMaxBatchSize;
 
 
     /***************************************************************************

diff --git a/src/dhtproto/client/legacy/internal/connection/DhtRequestConnection.d b/src/dhtproto/client/legacy/internal/connection/DhtRequestConnection.d
@@ -47,6 +47,8 @@ import swarm.client.request.GetChannelSizeRequest;
 import swarm.client.request.GetSizeRequest;
 import swarm.client.request.RemoveChannelRequest;
 
+import swarm.util.RecordBatcher;
+
 import dhtproto.client.legacy.internal.request.model.IDhtRequestResources;
 import dhtproto.client.legacy.internal.request.GetVersionRequest;
 import dhtproto.client.legacy.internal.request.GetResponsibleRangeRequest;
@@ -229,7 +231,7 @@ public class DhtRequestConnection :
 
         override protected mstring new_batch_buffer ( )
         {
-            return new char[RecordBatch.DefaultMaxBatchSize];
+            return new char[RecordBatcher.DefaultMaxBatchSize];
         }
 
 

diff --git a/src/dhtproto/client/request/internal/Exists.d b/src/dhtproto/client/request/internal/Exists.d
@@ -19,6 +19,7 @@ module dhtproto.client.request.internal.Exists;
 *******************************************************************************/
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 
 /*******************************************************************************
@@ -179,7 +180,9 @@ public struct Exists
                     payload.add(context.user_params.args.key);
                 }
             );
-            conn.flush();
+
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                conn.flush();
 
             // Receive supported code from node
             auto supported = conn.receiveValue!(SupportedStatus)();

diff --git a/src/dhtproto/client/request/internal/Get.d b/src/dhtproto/client/request/internal/Get.d
@@ -19,6 +19,7 @@ module dhtproto.client.request.internal.Get;
 *******************************************************************************/
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 
 /*******************************************************************************
@@ -196,7 +197,9 @@ public struct Get
                     payload.add(context.user_params.args.key);
                 }
             );
-            conn.flush();
+
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                conn.flush();
 
             // Receive supported code from node
             auto supported = conn.receiveValue!(SupportedStatus)();

diff --git a/src/dhtproto/client/request/internal/Put.d b/src/dhtproto/client/request/internal/Put.d
@@ -19,6 +19,7 @@ module dhtproto.client.request.internal.Put;
 *******************************************************************************/
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 
 /*******************************************************************************
@@ -170,7 +171,9 @@ public struct Put
                     payload.addArray(context.user_params.args.value);
                 }
             );
-            conn.flush();
+
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                conn.flush();
 
             // Receive supported code from node
             auto supported = conn.receiveValue!(SupportedStatus)();

diff --git a/src/dhtproto/client/request/internal/Remove.d b/src/dhtproto/client/request/internal/Remove.d
@@ -13,6 +13,7 @@
 module dhtproto.client.request.internal.Remove;
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 
 /*******************************************************************************
@@ -174,7 +175,9 @@ public struct Remove
                     payload.add(context.user_params.args.key);
                 }
             );
-            conn.flush();
+
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                conn.flush();
 
             // Receive supported code from node
             auto supported = conn.receiveValue!(SupportedStatus)();

diff --git a/src/dhtproto/client/request/internal/Update.d b/src/dhtproto/client/request/internal/Update.d
@@ -13,6 +13,7 @@
 module dhtproto.client.request.internal.Update;
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 import ocean.core.Verify;
 
@@ -408,7 +409,9 @@ private struct FirstROCHandler
                 payload.add(this.context.user_params.args.key);
             }
         );
-        conn.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            conn.flush();
 
         // Receive supported code from node.
         auto supported = conn.receiveValue!(SupportedStatus)();
@@ -514,7 +517,9 @@ private struct FirstROCHandler
                 payload.addArray(*this.context.shared_working.updated_value);
             }
         );
-        conn.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            conn.flush();
 
         // Handle response message.
         auto result = conn.receiveValue!(MessageType)();
@@ -597,7 +602,9 @@ private struct FirstROCHandler
                 payload.addCopy(MessageType.RemoveRecord);
             }
         );
-        conn.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            conn.flush();
 
         // Handle response message.
         auto result = conn.receiveValue!(MessageType)();
@@ -647,7 +654,9 @@ private struct FirstROCHandler
                 payload.addCopy(MessageType.LeaveRecord);
             }
         );
-        conn.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            conn.flush();
 
         auto result = conn.receiveValue!(MessageType)();
         with ( MessageType ) switch ( result )
@@ -736,7 +745,9 @@ private struct SecondROCHandler
                     payload.addArray(*this.context.shared_working.updated_value);
                 }
             );
-            conn.flush();
+
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                conn.flush();
 
             // Receive supported code from node.
             auto supported = conn.receiveValue!(SupportedStatus)();

diff --git a/src/dhtproto/node/neo/request/Exists.d b/src/dhtproto/node/neo/request/Exists.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.Exists;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 
 /*******************************************************************************
@@ -92,7 +93,9 @@ public abstract scope class ExistsProtocol_v0 : IRequestHandler
                 payload.add(this.response);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************

diff --git a/src/dhtproto/node/neo/request/Get.d b/src/dhtproto/node/neo/request/Get.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.Get;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 
 /*******************************************************************************
@@ -128,7 +129,8 @@ public abstract class GetProtocol_v0 : IRequestHandler
         else
             sendResponse(MessageType.WrongNode);
 
-        ed.flush();
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************

diff --git a/src/dhtproto/node/neo/request/GetAll.d b/src/dhtproto/node/neo/request/GetAll.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.GetAll;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 import ocean.util.log.Logger;
 
@@ -180,7 +181,9 @@ public abstract class GetAllProtocol_v0 : IRequestHandler
                     ? MessageType.Started : MessageType.Error);
             }
         );
-        this.connection.event_dispatcher.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            this.connection.event_dispatcher.flush();
 
         if ( !this.initialised_ok )
             return;
@@ -431,9 +434,11 @@ public abstract class GetAllProtocol_v0 : IRequestHandler
                     payload.addArray(*this.outer.compressed_batch);
                 }
             );
+
             // flush() does not suspend the fiber, so is safe to call in a
             // RequestEventDispatcher-managed request.
-            this.outer.connection.event_dispatcher.flush();
+            static if (!hasFeaturesFrom!("swarm", 4, 7))
+                this.outer.connection.event_dispatcher.flush();
         }
     }
 

diff --git a/src/dhtproto/node/neo/request/GetHashRange.d b/src/dhtproto/node/neo/request/GetHashRange.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.GetHashRange;
 
+import ocean.core.VersionCheck;
 import swarm.neo.AddrPort;
 import swarm.neo.node.IRequestHandler;
 
@@ -128,7 +129,9 @@ public abstract scope class GetHashRangeProtocol_v0 : IRequestHandler
                 payload.add(max);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
 
         while ( true )
         {

diff --git a/src/dhtproto/node/neo/request/Put.d b/src/dhtproto/node/neo/request/Put.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.Put;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 
 /*******************************************************************************
@@ -94,7 +95,9 @@ public abstract class PutProtocol_v0 : IRequestHandler
                 payload.add(response);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************

diff --git a/src/dhtproto/node/neo/request/Remove.d b/src/dhtproto/node/neo/request/Remove.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.Remove;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 
 /*******************************************************************************
@@ -93,7 +94,9 @@ public abstract class RemoveProtocol_v0 : IRequestHandler
                 payload.add(this.response);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************

diff --git a/src/dhtproto/node/neo/request/RemoveChannel.d b/src/dhtproto/node/neo/request/RemoveChannel.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.RemoveChannel;
 
+import ocean.core.VersionCheck;
 import ocean.util.log.Logger;
 import swarm.neo.node.IRequestHandler;
 
@@ -82,7 +83,9 @@ public abstract scope class RemoveChannelProtocol_v0 : IRequestHandler
                 payload.add(this.response);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************

diff --git a/src/dhtproto/node/neo/request/Update.d b/src/dhtproto/node/neo/request/Update.d
@@ -12,6 +12,7 @@
 
 module dhtproto.node.neo.request.Update;
 
+import ocean.core.VersionCheck;
 import swarm.neo.node.IRequestHandler;
 
 /*******************************************************************************
@@ -110,7 +111,9 @@ public abstract class UpdateProtocol_v0 : IRequestHandler
                 payload.add(response);
             }
         );
-        ed.flush();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            ed.flush();
     }
 
     /***************************************************************************
@@ -144,7 +147,9 @@ public abstract class UpdateProtocol_v0 : IRequestHandler
                         payload.addArray(value);
                     }
                 );
-                ed.flush();
+
+                static if (!hasFeaturesFrom!("swarm", 4, 7))
+                    ed.flush();
             }
         );
 

diff --git a/src/dhttest/DhtTestCase.d b/src/dhttest/DhtTestCase.d
@@ -21,6 +21,7 @@ module dhttest.DhtTestCase;
 *******************************************************************************/
 
 import ocean.transition;
+import ocean.core.VersionCheck;
 
 import turtle.TestCase;
 
@@ -194,7 +195,9 @@ abstract class NeoDhtTestCase : TestCase
         const max_connections = 2;
         this.dht = new DhtClient(theScheduler.epoll, auth_name,
             auth_key.content, &this.neoConnectionNotifier, max_connections);
-        this.dht.neo.enableSocketNoDelay();
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            this.dht.neo.enableSocketNoDelay();
 
         this.connect(10000);
     }

diff --git a/src/fakedht/DhtNode.d b/src/fakedht/DhtNode.d
@@ -52,6 +52,7 @@ public class DhtNode
 {
     import core.stdc.stdlib : abort;
 
+    import ocean.core.VersionCheck;
     import ocean.io.select.client.model.ISelectClient : IAdvancedSelectClient;
     import ocean.net.server.connection.IConnectionHandlerInfo;
     import ocean.io.select.protocol.generic.ErrnoIOException;
@@ -95,7 +96,10 @@ public class DhtNode
         Options neo_options;
         neo_options.requests = requests;
         neo_options.epoll = epoll;
-        neo_options.no_delay = true; // favour network turn-around over packet efficiency
+
+        static if (!hasFeaturesFrom!("swarm", 4, 7))
+            neo_options.no_delay = true; // favour network turn-around over packet efficiency
+
         neo_options.credentials_map["admin"] = Key.init;
 
         ushort neo_port = node_item.Port;