From 9abc30c3914136af8b84edf390949dbf3cc929ab Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 3 Apr 2017 23:23:24 +0400 Subject: [PATCH] Unused async/await pairs are removed to optimize and reduce compiled code --- src/progaudi.tarantool/Box.cs | 32 +++++++++---------- src/progaudi.tarantool/Index.cs | 32 +++++++++---------- src/progaudi.tarantool/LogicalConnection.cs | 8 ++--- .../NetworkStreamPhysicalConnection.cs | 8 ++--- src/progaudi.tarantool/Space.cs | 24 +++++++------- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/progaudi.tarantool/Box.cs b/src/progaudi.tarantool/Box.cs index bbbda29f..6de10267 100644 --- a/src/progaudi.tarantool/Box.cs +++ b/src/progaudi.tarantool/Box.cs @@ -21,9 +21,9 @@ public Box(ClientOptions options) Metrics = new Metrics(_logicalConnection); } - public async Task Connect() + public Task Connect() { - await _logicalConnection.Connect(); + return _logicalConnection.Connect(); } public static async Task Connect(string replicationSource) @@ -69,15 +69,15 @@ public ISchema GetSchema() return new Schema(_logicalConnection); } - public async Task Call_1_6(string functionName) + public Task Call_1_6(string functionName) { - await Call_1_6(functionName, TarantoolTuple.Empty); + return Call_1_6(functionName, TarantoolTuple.Empty); } - public async Task Call_1_6(string functionName, TTuple parameters) + public Task Call_1_6(string functionName, TTuple parameters) where TTuple : ITarantoolTuple { - await Call_1_6(functionName, parameters); + return Call_1_6(functionName, parameters); } public Task> Call_1_6(string functionName) @@ -86,23 +86,23 @@ public Task> Call_1_6(string functionName) return Call_1_6(functionName, TarantoolTuple.Empty); } - public async Task> Call_1_6(string functionName, TTuple parameters) + public Task> Call_1_6(string functionName, TTuple parameters) where TTuple : ITarantoolTuple where TResponse : ITarantoolTuple { var callRequest = new CallRequest(functionName, parameters, false); - return await _logicalConnection.SendRequest, TResponse>(callRequest); + return _logicalConnection.SendRequest, TResponse>(callRequest); } - public async Task Call(string functionName) + public Task Call(string functionName) { - await Call(functionName, TarantoolTuple.Empty); + return Call(functionName, TarantoolTuple.Empty); } - public async Task Call(string functionName, TTuple parameters) + public Task Call(string functionName, TTuple parameters) where TTuple : ITarantoolTuple { - await Call(functionName, parameters); + return Call(functionName, parameters); } public Task> Call(string functionName) @@ -110,18 +110,18 @@ public Task> Call(string functionName) return Call(functionName, TarantoolTuple.Empty); } - public async Task> Call(string functionName, TTuple parameters) + public Task> Call(string functionName, TTuple parameters) where TTuple : ITarantoolTuple { var callRequest = new CallRequest(functionName, parameters); - return await _logicalConnection.SendRequest, TResponse>(callRequest); + return _logicalConnection.SendRequest, TResponse>(callRequest); } - public async Task> Eval(string expression, TTuple parameters) + public Task> Eval(string expression, TTuple parameters) where TTuple : ITarantoolTuple { var evalRequest = new EvalRequest(expression, parameters); - return await _logicalConnection.SendRequest, TResponse>(evalRequest); + return _logicalConnection.SendRequest, TResponse>(evalRequest); } public Task> Eval(string expression) diff --git a/src/progaudi.tarantool/Index.cs b/src/progaudi.tarantool/Index.cs index 4f7243ff..88305bc1 100644 --- a/src/progaudi.tarantool/Index.cs +++ b/src/progaudi.tarantool/Index.cs @@ -44,7 +44,7 @@ public Task> Pairs(TValue value, Iterator throw new NotImplementedException(); } - public async Task> Select(TKey key, SelectOptions options = null) + public Task> Select(TKey key, SelectOptions options = null) where TKey : ITarantoolTuple where TTuple : ITarantoolTuple { @@ -56,33 +56,33 @@ public async Task> Select(TKey key, SelectO options?.Iterator ?? Iterator.Eq, key); - return await LogicalConnection.SendRequest, TTuple>(selectRequest); + return LogicalConnection.SendRequest, TTuple>(selectRequest); } ///Note: there is no such method in specification http://tarantool.org/doc/book/box/box_index.html. ///But common sense, and sources https://github.com/tarantool/tarantool/blob/1.7/src/box/lua/index.c says that that method sould be - public async Task> Insert(TTuple tuple) + public Task> Insert(TTuple tuple) where TTuple : ITarantoolTuple { var insertRequest = new InsertRequest(SpaceId, tuple); - return await LogicalConnection.SendRequest, TTuple>(insertRequest); + return LogicalConnection.SendRequest, TTuple>(insertRequest); } ///Note: there is no such method in specification http://tarantool.org/doc/book/box/box_index.html. ///But common sense, and sources https://github.com/tarantool/tarantool/blob/1.7/src/box/lua/index.c says that that method sould be - public async Task> Replace(TTuple tuple) + public Task> Replace(TTuple tuple) where TTuple : ITarantoolTuple { var replaceRequest = new ReplaceRequest(SpaceId, tuple); - return await LogicalConnection.SendRequest, TTuple>(replaceRequest); + return LogicalConnection.SendRequest, TTuple>(replaceRequest); } - public async Task Min() + public Task Min() where TTuple : ITarantoolTuple { - return await Min(TarantoolTuple.Empty); + return Min(TarantoolTuple.Empty); } public async Task Min(TKey key) @@ -101,10 +101,10 @@ public async Task Min(TKey key) return minResponse.Data.SingleOrDefault(); } - public async Task Max() + public Task Max() where TTuple : ITarantoolTuple { - return await Max(TarantoolTuple.Empty); + return Max(TarantoolTuple.Empty); } public async Task Max(TKey key = null) @@ -135,7 +135,7 @@ public uint Count(TKey key = null, Iterator it = Iterator.Eq) throw new NotImplementedException(); } - public async Task> Update(TKey key, UpdateOperation[] updateOperations) + public Task> Update(TKey key, UpdateOperation[] updateOperations) where TKey : ITarantoolTuple where TTuple : ITarantoolTuple { @@ -145,10 +145,10 @@ public async Task> Update(TKey key, UpdateO key, updateOperations); - return await LogicalConnection.SendRequest, TTuple>(updateRequest); + return LogicalConnection.SendRequest, TTuple>(updateRequest); } - public async Task Upsert(TKey key, UpdateOperation[] updateOperations) + public Task Upsert(TKey key, UpdateOperation[] updateOperations) where TKey : ITarantoolTuple { var updateRequest = new UpsertRequest( @@ -156,16 +156,16 @@ public async Task Upsert(TKey key, UpdateOperation[] updateOperations) key, updateOperations); - await LogicalConnection.SendRequestWithEmptyResponse(updateRequest); + return LogicalConnection.SendRequestWithEmptyResponse(updateRequest); } - public async Task> Delete(TKey key) + public Task> Delete(TKey key) where TKey : ITarantoolTuple where TTuple : ITarantoolTuple { var deleteRequest = new DeleteRequest(SpaceId, Id, key); - return await LogicalConnection.SendRequest, TTuple>(deleteRequest); + return LogicalConnection.SendRequest, TTuple>(deleteRequest); } public Task Alter(IndexCreationOptions options) diff --git a/src/progaudi.tarantool/LogicalConnection.cs b/src/progaudi.tarantool/LogicalConnection.cs index 47badb69..8102c4eb 100644 --- a/src/progaudi.tarantool/LogicalConnection.cs +++ b/src/progaudi.tarantool/LogicalConnection.cs @@ -117,16 +117,16 @@ private async Task LoginIfNotGuest(GreetingsResponse greetings) _clientOptions.LogWriter?.WriteLine($"Authentication request send: {authenticateRequest}"); } - public async Task SendRequestWithEmptyResponse(TRequest request, TimeSpan? timeout = null) + public Task SendRequestWithEmptyResponse(TRequest request, TimeSpan? timeout = null) where TRequest : IRequest { - await SendRequestImpl(request, timeout); + return SendRequestImpl(request, timeout); } - public async Task> SendRequest(TRequest request, TimeSpan? timeout = null) + public Task> SendRequest(TRequest request, TimeSpan? timeout = null) where TRequest : IRequest { - return await SendRequestImpl>(request, timeout); + return SendRequestImpl>(request, timeout); } public static byte[] ReadFully(Stream input) diff --git a/src/progaudi.tarantool/NetworkStreamPhysicalConnection.cs b/src/progaudi.tarantool/NetworkStreamPhysicalConnection.cs index 1ad84c39..da28c74e 100644 --- a/src/progaudi.tarantool/NetworkStreamPhysicalConnection.cs +++ b/src/progaudi.tarantool/NetworkStreamPhysicalConnection.cs @@ -53,16 +53,16 @@ public void Write(byte[] buffer, int offset, int count) _stream.Write(buffer, offset, count); } - public async Task Flush() + public Task Flush() { CheckConnectionStatus(); - await _stream.FlushAsync(); + return _stream.FlushAsync(); } - public async Task ReadAsync(byte[] buffer, int offset, int count) + public Task ReadAsync(byte[] buffer, int offset, int count) { CheckConnectionStatus(); - return await _stream.ReadAsync(buffer, offset, count); + return _stream.ReadAsync(buffer, offset, count); } #if PROGAUDI_NETCORE diff --git a/src/progaudi.tarantool/Space.cs b/src/progaudi.tarantool/Space.cs index 9e81e63e..274a28de 100644 --- a/src/progaudi.tarantool/Space.cs +++ b/src/progaudi.tarantool/Space.cs @@ -97,19 +97,19 @@ public async Task GetIndex(uint indexId) return result; } - public async Task> Insert(TTuple tuple) + public Task> Insert(TTuple tuple) where TTuple : ITarantoolTuple { var insertRequest = new InsertRequest(Id, tuple); - return await LogicalConnection.SendRequest, TTuple>(insertRequest); + return LogicalConnection.SendRequest, TTuple>(insertRequest); } - public async Task> Select(TKey selectKey) + public Task> Select(TKey selectKey) where TKey : ITarantoolTuple where TTuple : ITarantoolTuple { var selectRequest = new SelectRequest(Id, PrimaryIndexId, uint.MaxValue, 0, Iterator.Eq, selectKey); - return await LogicalConnection.SendRequest, TTuple>(selectRequest); + return LogicalConnection.SendRequest, TTuple>(selectRequest); } public async Task Get(TKey key) @@ -121,11 +121,11 @@ public async Task Get(TKey key) return response.Data.SingleOrDefault(); } - public async Task> Replace(TTuple tuple) + public Task> Replace(TTuple tuple) where TTuple : ITarantoolTuple { var replaceRequest = new ReplaceRequest(Id, tuple); - return await LogicalConnection.SendRequest, TTuple>(replaceRequest); + return LogicalConnection.SendRequest, TTuple>(replaceRequest); } public async Task Put(T tuple) @@ -135,27 +135,27 @@ public async Task Put(T tuple) return response.Data.First(); } - public async Task> Update(TKey key, UpdateOperation[] updateOperations) + public Task> Update(TKey key, UpdateOperation[] updateOperations) where TKey : ITarantoolTuple where TTuple : ITarantoolTuple { var updateRequest = new UpdateRequest(Id, PrimaryIndexId, key, updateOperations); - return await LogicalConnection.SendRequest, TTuple>(updateRequest); + return LogicalConnection.SendRequest, TTuple>(updateRequest); } - public async Task Upsert(TTuple tuple, UpdateOperation[] updateOperations) + public Task Upsert(TTuple tuple, UpdateOperation[] updateOperations) where TTuple : ITarantoolTuple { var upsertRequest = new UpsertRequest(Id, tuple, updateOperations); - await LogicalConnection.SendRequestWithEmptyResponse(upsertRequest); + return LogicalConnection.SendRequestWithEmptyResponse(upsertRequest); } - public async Task> Delete(TKey key) + public Task> Delete(TKey key) where TTuple : ITarantoolTuple where TKey : ITarantoolTuple { var deleteRequest = new DeleteRequest(Id, PrimaryIndexId, key); - return await LogicalConnection.SendRequest, TTuple>(deleteRequest); + return LogicalConnection.SendRequest, TTuple>(deleteRequest); } public Task Count(TKey key)