fix: unnecessary API call when writing collection of DataPoints (#113)

Author: bednar

CHANGELOG.md

@@ -3,6 +3,9 @@
 ### Features
 1. [#97](https://github.com/influxdata/influxdb-client-csharp/pull/97): Improved WriteApi performance
 
+### Bug Fixes
+1. [#113](https://github.com/influxdata/influxdb-client-csharp/pull/113): Fixed unnecessary API call when writing collection of DataPoints
+
 ## 1.10.0 [2020-07-17]
 
 ### Features

Client.Test/WriteApiAsyncTest.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using InfluxDB.Client.Api.Domain;
+using InfluxDB.Client.Core.Test;
+using InfluxDB.Client.Writes;
+using NUnit.Framework;
+using WireMock.RequestBuilders;
+
+namespace InfluxDB.Client.Test
+{
+    [TestFixture]
+    public class WriteApiAsyncTest : AbstractMockServerTest
+    {
+        private InfluxDBClient _influxDbClient;
+
+        [SetUp]
+        public new void SetUp()
+        {
+            _influxDbClient = InfluxDBClientFactory.Create(MockServerUrl, "token".ToCharArray());
+        }
+
+        [TearDown]
+        public new void ResetServer()
+        {
+            _influxDbClient.Dispose();
+        }
+
+        [Test]
+        public async Task GroupPointsByPrecisionSame()
+        {
+            MockServer
+                .Given(Request.Create().WithPath("/api/v2/write").UsingPost())
+                .RespondWith(CreateResponse("{}"));
+
+            var writeApi = _influxDbClient.GetWriteApiAsync();
+            await writeApi.WritePointsAsync("my-bucket", "my-org", new List<PointData>
+            {
+                PointData.Measurement("h2o").Tag("location", "coyote_creek").Field("water_level", 9.0D)
+                    .Timestamp(9L, WritePrecision.S),
+                PointData.Measurement("h2o").Tag("location", "coyote_creek").Field("water_level", 10.0D)
+                    .Timestamp(10L, WritePrecision.S)
+            });
+
+            Assert.AreEqual(1, MockServer.LogEntries.Count());
+
+            var request = MockServer.LogEntries.Last();
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=my-org&bucket=my-bucket&precision=s",
+                request.RequestMessage.AbsoluteUrl);
+            Assert.AreEqual("h2o,location=coyote_creek water_level=9 9\nh2o,location=coyote_creek water_level=10 10",
+                request.RequestMessage.Body);
+        }
+
+        [Test]
+        public async Task GroupPointsByPrecisionDifferent()
+        {
+            MockServer
+                .Given(Request.Create().WithPath("/api/v2/write").UsingPost())
+                .RespondWith(CreateResponse("{}"));
+
+            var writeApi = _influxDbClient.GetWriteApiAsync();
+            await writeApi.WritePointsAsync("my-bucket", "my-org", new List<PointData>
+            {
+                PointData.Measurement("h2o").Tag("location", "coyote_creek").Field("water_level", 9.0D)
+                    .Timestamp(9L, WritePrecision.S),
+                PointData.Measurement("h2o").Tag("location", "coyote_creek").Field("water_level", 10.0D)
+                    .Timestamp(10L, WritePrecision.Ms)
+            });
+
+            Assert.AreEqual(2, MockServer.LogEntries.Count());
+
+            var request = MockServer.LogEntries.ToList()[0];
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=my-org&bucket=my-bucket&precision=s",
+                request.RequestMessage.AbsoluteUrl);
+            Assert.AreEqual("h2o,location=coyote_creek water_level=9 9",
+                request.RequestMessage.Body);
+
+            request = MockServer.LogEntries.ToList()[1];
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=my-org&bucket=my-bucket&precision=ms",
+                request.RequestMessage.AbsoluteUrl);
+            Assert.AreEqual("h2o,location=coyote_creek water_level=10 10",
+                request.RequestMessage.Body);
+        }
+    }
+}

Client.Test/WriteApiTest.cs

@@ -8,7 +8,6 @@
 using InfluxDB.Client.Core.Exceptions;
 using InfluxDB.Client.Core.Test;
 using InfluxDB.Client.Writes;
-using Moq;
 using NUnit.Framework;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;

Client/WriteApiAsync.cs

@@ -88,7 +88,7 @@ public async Task WriteRecordsAsync(string bucket, string org, WritePrecision pr
             Arguments.CheckNonEmptyString(org, nameof(org));
             Arguments.CheckNotNull(precision, nameof(precision));
 
-            List<BatchWriteData> list = new List<BatchWriteData>();
+            var list = new List<BatchWriteData>();
 
             foreach (var record in records)
             {
@@ -150,10 +150,7 @@ public async Task WritePointAsync(string bucket, string org, PointData point)
 
             if (point == null) return;
 
-            BatchWriteData data = new BatchWritePoint(new BatchWriteOptions(bucket, org, 
-                            point.Precision), _options, point);
-
-            await WriteData(org, bucket, point.Precision, new List<BatchWriteData>{data});
+            await WritePointsAsync(bucket, org, new List<PointData> {point});
         }
 
         /// <summary>
@@ -175,8 +172,16 @@ public async Task WritePointsAsync(string bucket, string org, List<PointData> po
         {
             Arguments.CheckNonEmptyString(bucket, nameof(bucket));
             Arguments.CheckNonEmptyString(org, nameof(org));
+            
+            foreach (var grouped in points.GroupBy(it => it.Precision))
+            {
+                var options = new BatchWriteOptions(bucket, org, grouped.Key);
+                var groupedPoints = grouped
+                    .Select(it => new BatchWritePoint(options, _options, it))
+                    .ToList();
 
-            foreach (var point in points) await WritePointAsync(bucket, org, point);
+                await WriteData(org, bucket, grouped.Key, groupedPoints);
+            }
         }
 
         /// <summary>
@@ -262,7 +267,7 @@ public async Task WriteMeasurementsAsync<TM>(string bucket, string org, WritePre
             Arguments.CheckNonEmptyString(org, nameof(org));
             Arguments.CheckNotNull(precision, nameof(precision));
 
-            List<BatchWriteData> list = new List<BatchWriteData>();
+            var list = new List<BatchWriteData>();
 
             foreach (var measurement in measurements)
             {