Merge pull request #108 from progaudi/fix/network-performance

Fix/network performance

Author: aensidhe

.travis.yml

@@ -7,7 +7,7 @@ matrix:
       dist: trusty
       env: BUILD_DOCKER=true
     - os: osx # OSX 10.12
-      osx_image: xcode8.2
+      osx_image: xcode8.3
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_DOCKER" != true ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
@@ -16,8 +16,9 @@ before_install:
 install:
   - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/dotnet-install.sh ; fi
   - if [[ "$BUILD_DOCKER" != true ]]; then PATH=$PATH:$HOME/.dotnet && export PATH ; fi
-  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then docker-compose -f docker-compose.yml -f docker-compose.tests.yml up -d tarantool ; fi
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then docker-compose -f docker-compose.yml up -d ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tarantool tarantool/tarantool.lua ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then redis-server --daemonize yes ; fi
 
 script:
   - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/build-netcore.sh ; fi

.vscode/tasks.json

@@ -8,7 +8,7 @@
     "tasks": [
         {
             "taskName": "build",
-            "args": [ "src/progaudi.tarantool", "tests/progaudi.tarantool.tests", "samples/docker-compose/dotnet"],
+            "args": [ "progaudi.tarantool.sln"],
             "isBuildCommand": true,
             "showOutput": "silent",
             "problemMatcher": "$msCompile"

docker-compose.tests.yml

@@ -1,10 +1,12 @@
 version: '2'
 
 services:
+
   tarantool-client:
     build: .
     command: /app/scripts/test-netcore.sh
     environment:
         TARANTOOL_REPLICATION_SOURCE: "tarantool:3301"
     links:
-        - tarantool
+        - tarantool
+        - redis

docker-compose.yml

@@ -11,4 +11,10 @@ services:
     environment:
         TARANTOOL_USER_NAME: admin
         TARANTOOL_USER_PASSWORD: adminPassword
-        TARANTOOL_SLAB_ALLOC_ARENA: 0.1
+        TARANTOOL_SLAB_ALLOC_ARENA: 0.1
+
+  redis:
+    image: redis:3.0-alpine
+    command: redis-server
+    ports:
+      - 6379:6379

scripts/mac-prereqs.sh

@@ -5,6 +5,7 @@ set -ev
 brew update
 brew install openssl jq
 brew install tarantool --HEAD
+brew install redis
 
 mkdir -p /usr/local/lib
 

scripts/test-netcore.sh

@@ -6,7 +6,6 @@ pushd ${BASH_SOURCE%/*}
 
 cd ..
 
-dotnet test -c Release -f netcoreapp1.0 --no-build tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj -- -parallel assemblies
-dotnet test -c Release -f netcoreapp1.1 --no-build tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj -- -parallel assemblies
+dotnet test -c Release --no-build tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj -- -parallel assemblies
 
 popd

src/progaudi.tarantool/Box.cs

@@ -38,13 +38,7 @@ public Metrics Metrics
             get;
         }
 
-        public bool IsConnected
-        {
-            get
-            {
-                return _logicalConnection.IsConnected();
-            }
-        }
+        public bool IsConnected => _logicalConnection.IsConnected();
 
         public static Task<Box> Connect(string host, int port)
         {

src/progaudi.tarantool/INetworkStreamPhysicalConnection.cs renamed to src/progaudi.tarantool/IPhysicalConnection.cs

@@ -4,12 +4,16 @@
 
 namespace ProGaudi.Tarantool.Client
 {
-    public interface INetworkStreamPhysicalConnection : IDisposable
+    public interface IPhysicalConnection : IDisposable
     {
         Task Connect(ClientOptions options);
+
         Task Flush();
-        bool IsConnected();
+
+        bool IsConnected { get; }
+
         Task<int> ReadAsync(byte[] buffer, int offset, int count);
+
         void Write(byte[] buffer, int offset, int count);
     }
 }

src/progaudi.tarantool/IResponseReader.cs

@@ -6,13 +6,12 @@
 
 namespace ProGaudi.Tarantool.Client
 {
-
     public interface IResponseReader : IDisposable
     {
         void BeginReading();
 
         Task<MemoryStream> GetResponseTask(RequestId requestId);
 
-        bool IsConnected();
+        bool IsConnected { get; }
     }
 }

src/progaudi.tarantool/IResponseWriter.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Threading.Tasks;
+
+namespace ProGaudi.Tarantool.Client
+{
+    internal interface IResponseWriter : IDisposable
+    {
+        void BeginWriting();
+
+        bool IsConnected { get; }
+
+        Task Write(ArraySegment<byte> header, ArraySegment<byte> body);
+    }
+}