Skip to content

Commit 69e507a

Browse files
committed
update to latest recyclable memory stream and added dotnet counters to it
1 parent e9dcd74 commit 69e507a

File tree

10 files changed

+969
-219
lines changed

10 files changed

+969
-219
lines changed

src/Auxiliary/Elasticsearch.Net.VirtualizedCluster/MockResponses/SniffResponseBytes.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ public static byte[] Create(IEnumerable<Node> nodes, string elasticsearchVersion
1717
cluster_name = ClusterName,
1818
nodes = SniffResponseNodes(nodes, elasticsearchVersion, publishAddressOverride, randomFqdn)
1919
};
20-
using (var ms = new MemoryStream())
20+
using (var ms = RecyclableMemoryStreamFactory.Default.Create())
2121
{
22-
new LowLevelRequestResponseSerializer().Serialize(response, ms);
22+
LowLevelRequestResponseSerializer.Instance.Serialize(response, ms);
2323
return ms.ToArray();
2424
}
2525
}
2626

2727
private static IDictionary<string, object> SniffResponseNodes(
28-
IEnumerable<Node> nodes,
28+
IEnumerable<Node> nodes,
2929
string elasticsearchVersion,
30-
string publishAddressOverride,
30+
string publishAddressOverride,
3131
bool randomFqdn
3232
) =>
3333
(from node in nodes

src/Auxiliary/Elasticsearch.Net.VirtualizedCluster/Rules/RuleBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public TRule ReturnResponse<T>(T response)
5050
where T : class
5151
{
5252
byte[] r;
53-
using (var ms = new MemoryStream())
53+
using (var ms = RecyclableMemoryStreamFactory.Default.Create())
5454
{
55-
new LowLevelRequestResponseSerializer().Serialize(response, ms);
55+
LowLevelRequestResponseSerializer.Instance.Serialize(response, ms);
5656
r = ms.ToArray();
5757
}
5858
Self.ReturnResponse = r;

src/Auxiliary/Elasticsearch.Net.VirtualizedCluster/VirtualClusterConnection.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static VirtualClusterConnection Success(byte[] response) =>
4949
.StaticConnectionPool()
5050
.AllDefaults()
5151
.Connection;
52-
52+
5353
public static VirtualClusterConnection Error() =>
5454
VirtualClusterWith
5555
.Nodes(1)
@@ -100,7 +100,7 @@ public override TResponse Request<TResponse>(RequestData requestData)
100100
{
101101
if (!_calls.ContainsKey(requestData.Uri.Port))
102102
throw new Exception($"Expected a call to happen on port {requestData.Uri.Port} but received none");
103-
103+
104104
try
105105
{
106106
var state = _calls[requestData.Uri.Port];
@@ -264,9 +264,9 @@ private static byte[] CallResponse<TRule>(TRule rule)
264264
if (_defaultResponseBytes != null) return _defaultResponseBytes;
265265

266266
var response = DefaultResponse;
267-
using (var ms = new MemoryStream())
267+
using (var ms = RecyclableMemoryStreamFactory.Default.Create())
268268
{
269-
new LowLevelRequestResponseSerializer().Serialize(response, ms);
269+
LowLevelRequestResponseSerializer.Instance.Serialize(response, ms);
270270
_defaultResponseBytes = ms.ToArray();
271271
}
272272
return _defaultResponseBytes;

src/Elasticsearch.Net/Elasticsearch.Net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
66
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<!-- Here to satisy UTF8JSON which defines NETSTANDARD also for anything > NET45 -->

0 commit comments

Comments
 (0)