Skip to content

Commit 18bfc80

Browse files
Replace MemoryStreamFactory usage with RecyclableMemoryStreamFactory (#4502) (#4519)
Usages of MemoryStreamFactory are replaced with RecyclableMemoryStreamFactory, MemoryStreamFactory is kept in place for external use. Co-authored-by: Stuart Cam <stuart.cam@elastic.co>
1 parent e824d85 commit 18bfc80

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

src/Elasticsearch.Net/Providers/MemoryStreamFactory.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Elasticsearch.Net
44
{
5-
// TODO we use this in some places but its no longer clear to me why need to circumvent RecyclableMemoryStream in some cases
65
/// <summary>
76
/// A factory for creating memory streams using instances of <see cref="MemoryStream" />
87
/// </summary>

tests/Tests.Benchmarking/BulkBenchmarkTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class BulkBenchmarkTests
2525
new ElasticClient(new ConnectionSettings(new InMemoryConnection(Response, 200, null, null))
2626
.DefaultIndex("index")
2727
.EnableHttpCompression(false)
28-
.MemoryStreamFactory(MemoryStreamFactory.Default)
2928
);
3029

3130
private static readonly Nest7.IElasticClient ClientV7 =

tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private RequestData CreateRequestData(
8484

8585
var requestData = new RequestData(HttpMethod.POST, "/_search", "{ \"query\": { \"match_all\" : { } } }", connectionSettings,
8686
new SearchRequestParameters(),
87-
new MemoryStreamFactory()) { Node = node };
87+
new RecyclableMemoryStreamFactory()) { Node = node };
8888

8989
return requestData;
9090
}

tests/Tests/ClientConcepts/ConnectionPooling/BuildingBlocks/RequestPipelines.doc.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void RequestPipeline()
3737
var pipeline = new RequestPipeline(
3838
settings,
3939
DateTimeProvider.Default,
40-
new MemoryStreamFactory(),
40+
new RecyclableMemoryStreamFactory(),
4141
new SearchRequestParameters());
4242

4343
pipeline.GetType().Should().Implement<IDisposable>();
@@ -49,7 +49,7 @@ public void RequestPipeline()
4949
var requestPipeline = requestPipelineFactory.Create(
5050
settings,
5151
DateTimeProvider.Default, //<1> An <<date-time-providers,`IDateTimeProvider`>> implementation
52-
new MemoryStreamFactory(),
52+
new RecyclableMemoryStreamFactory(),
5353
new SearchRequestParameters());
5454

5555
requestPipeline.Should().BeOfType<RequestPipeline>();
@@ -63,7 +63,7 @@ public void RequestPipeline()
6363
settings,
6464
requestPipelineFactory,
6565
DateTimeProvider.Default,
66-
new MemoryStreamFactory());
66+
new RecyclableMemoryStreamFactory());
6767

6868
var client = new ElasticClient(transport);
6969
}

tests/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ private RequestPipeline CreatePipeline()
409409
{
410410
var uri = TestConnectionSettings.CreateUri(this._cluster.Nodes.First().Port ?? 9200);
411411
this._settings = new ConnectionSettings(new SniffingConnectionPool(new[] { uri }));
412-
var pipeline = new RequestPipeline(this._settings, DateTimeProvider.Default, new MemoryStreamFactory(),
412+
var pipeline = new RequestPipeline(this._settings, DateTimeProvider.Default, new RecyclableMemoryStreamFactory(),
413413
new SearchRequestParameters());
414414
return pipeline;
415415
}

tests/Tests/CodeStandards/Serialization/GeoLocationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void CanDeserializeAndSerializeToWellKnownText()
1616
var client = TestClient.DisabledStreaming;
1717

1818
Doc deserialized;
19-
using (var stream = MemoryStreamFactory.Default.Create(Encoding.UTF8.GetBytes(wkt)))
19+
using (var stream = RecyclableMemoryStreamFactory.Default.Create(Encoding.UTF8.GetBytes(wkt)))
2020
deserialized = client.RequestResponseSerializer.Deserialize<Doc>(stream);
2121

2222
deserialized.Location.Should().Be(new GeoLocation(90, -90));

0 commit comments

Comments
 (0)