Skip to content

Commit c29465a

Browse files
author
Roman Kozachenko
committed
Remove ITarantoolTuple restrictions
1 parent 7418706 commit c29465a

23 files changed

+40
-137
lines changed

‎.vscode/tasks.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
"isBuildCommand": true,
1313
"showOutput": "silent",
1414
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"taskName": "test",
18+
"args": [ "tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj"],
19+
"isTestCommand": true,
20+
"showOutput": "silent",
21+
"problemMatcher": "$msCompile"
1522
}
1623
]
1724
}

‎src/progaudi.tarantool/Box.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,16 @@ public async Task Call_1_6(string functionName)
6969
}
7070

7171
public async Task Call_1_6<TTuple>(string functionName, TTuple parameters)
72-
where TTuple : ITarantoolTuple
7372
{
7473
await Call_1_6<TTuple, TarantoolTuple>(functionName, parameters).ConfigureAwait(false);
7574
}
7675

7776
public Task<DataResponse<TResponse[]>> Call_1_6<TResponse>(string functionName)
78-
where TResponse : ITarantoolTuple
7977
{
8078
return Call_1_6<TarantoolTuple, TResponse>(functionName, TarantoolTuple.Empty);
8179
}
8280

8381
public async Task<DataResponse<TResponse[]>> Call_1_6<TTuple, TResponse>(string functionName, TTuple parameters)
84-
where TTuple : ITarantoolTuple
85-
where TResponse : ITarantoolTuple
8682
{
8783
var callRequest = new CallRequest<TTuple>(functionName, parameters, false);
8884
return await _logicalConnection.SendRequest<CallRequest<TTuple>, TResponse>(callRequest).ConfigureAwait(false);
@@ -94,7 +90,6 @@ public async Task Call(string functionName)
9490
}
9591

9692
public async Task Call<TTuple>(string functionName, TTuple parameters)
97-
where TTuple : ITarantoolTuple
9893
{
9994
await Call<TTuple, TarantoolTuple>(functionName, parameters).ConfigureAwait(false);
10095
}
@@ -105,14 +100,12 @@ public Task<DataResponse<TResponse[]>> Call<TResponse>(string functionName)
105100
}
106101

107102
public async Task<DataResponse<TResponse[]>> Call<TTuple, TResponse>(string functionName, TTuple parameters)
108-
where TTuple : ITarantoolTuple
109103
{
110104
var callRequest = new CallRequest<TTuple>(functionName, parameters);
111105
return await _logicalConnection.SendRequest<CallRequest<TTuple>, TResponse>(callRequest).ConfigureAwait(false);
112106
}
113107

114108
public async Task<DataResponse<TResponse[]>> Eval<TTuple, TResponse>(string expression, TTuple parameters)
115-
where TTuple : ITarantoolTuple
116109
{
117110
var evalRequest = new EvalRequest<TTuple>(expression, parameters);
118111
return await _logicalConnection.SendRequest<EvalRequest<TTuple>, TResponse>(evalRequest).ConfigureAwait(false);

‎src/progaudi.tarantool/Converters/CallPacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class CallPacketConverter<T> : IMsgPackConverter<CallRequest<T>>
12-
where T : ITarantoolTuple
1312
{
1413
private IMsgPackConverter<Key> _keyConverter;
1514
private IMsgPackConverter<string> _stringConverter;

‎src/progaudi.tarantool/Converters/DeletePacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class DeletePacketConverter<T> : IMsgPackConverter<DeleteRequest<T>>
12-
where T: ITarantoolTuple
1312
{
1413
private IMsgPackConverter<Key> _keyConverter;
1514
private IMsgPackConverter<uint> _uintConverter;

‎src/progaudi.tarantool/Converters/EvalPacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class EvalPacketConverter<T> : IMsgPackConverter<EvalRequest<T>>
12-
where T:ITarantoolTuple
1312
{
1413
private IMsgPackConverter<Key> _keyConverter;
1514
private IMsgPackConverter<string> _stringConverter;

‎src/progaudi.tarantool/Converters/InsertReplacePacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class InsertReplacePacketConverter<T> : IMsgPackConverter<InsertReplaceRequest<T>>
12-
where T : ITarantoolTuple
1312
{
1413
private IMsgPackConverter<Key> _keyConverter;
1514
private IMsgPackConverter<uint> _uintConverter;

‎src/progaudi.tarantool/Converters/SelectPacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class SelectPacketConverter<T> : IMsgPackConverter<SelectRequest<T>>
12-
where T : ITarantoolTuple
1312
{
1413
private IMsgPackConverter<T> _selectKeyConverter;
1514
private IMsgPackConverter<Key> _keyConverter;

‎src/progaudi.tarantool/Converters/UpdatePacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class UpdatePacketConverter<T> : IMsgPackConverter<UpdateRequest<T>>
12-
where T : ITarantoolTuple
1312
{
1413
private IMsgPackConverter<uint> _uintConverter;
1514
private IMsgPackConverter<Key> _keyConverter;

‎src/progaudi.tarantool/Converters/UpsertPacketConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace ProGaudi.Tarantool.Client.Converters
1010
{
1111
internal class UpsertPacketConverter<T> : IMsgPackConverter<UpsertRequest<T>>
12-
where T : ITarantoolTuple
1312
{
1413
private IMsgPackConverter<uint> _uintConverter;
1514
private IMsgPackConverter<Key> _keyConverter;

‎src/progaudi.tarantool/IBox.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,21 @@ public interface IBox : IDisposable
1717

1818
Task Call_1_6(string functionName);
1919

20-
Task Call_1_6<TTuple>(string functionName, TTuple parameters)
21-
where TTuple : ITarantoolTuple;
20+
Task Call_1_6<TTuple>(string functionName, TTuple parameters);
2221

23-
Task<DataResponse<TResponse[]>> Call_1_6<TResponse>(string functionName)
24-
where TResponse : ITarantoolTuple;
22+
Task<DataResponse<TResponse[]>> Call_1_6<TResponse>(string functionName);
2523

26-
Task<DataResponse<TResponse[]>> Call_1_6<TTuple, TResponse>(string functionName, TTuple parameters)
27-
where TTuple : ITarantoolTuple
28-
where TResponse : ITarantoolTuple;
24+
Task<DataResponse<TResponse[]>> Call_1_6<TTuple, TResponse>(string functionName, TTuple parameters);
2925

3026
Task Call(string functionName);
3127

32-
Task Call<TTuple>(string functionName, TTuple parameters)
33-
where TTuple : ITarantoolTuple;
28+
Task Call<TTuple>(string functionName, TTuple parameters);
3429

3530
Task<DataResponse<TResponse[]>> Call<TResponse>(string functionName);
3631

37-
Task<DataResponse<TResponse[]>> Call<TTuple, TResponse>(string functionName, TTuple parameters)
38-
where TTuple : ITarantoolTuple;
32+
Task<DataResponse<TResponse[]>> Call<TTuple, TResponse>(string functionName, TTuple parameters);
3933

40-
Task<DataResponse<TResponse[]>> Eval<TTuple, TResponse>(string expression, TTuple parameters)
41-
where TTuple : ITarantoolTuple;
34+
Task<DataResponse<TResponse[]>> Eval<TTuple, TResponse>(string expression, TTuple parameters);
4235

4336
Task<DataResponse<TResponse[]>> Eval<TResponse>(string expression);
4437
}

0 commit comments

Comments
 (0)