Merge pull request #5 from AdysTech/wip

Added InfluxDataPoint, and PostPoint methods

Author: mvadu

AdysTech.InfluxDB.Client.Net.Test/InfluxDBClientTest.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Dynamic;
-
+using System.Linq;
 using AdysTech.InfluxDB.Client.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
@@ -134,14 +134,52 @@ public async Task TestCreateDatabaseAsync()
             }
         }
 
+
         [TestMethod]
-        public async Task TestPostValueAsync()
+        public async Task TestQueryAsync()
         {
             try
             {
+
                 var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
-                var r = await client.PostValueAsync (dbName, measurementName, DateTime.UtcNow.ToEpoch (TimePrecision.Seconds), TimePrecision.Seconds, "testTag=testTagValue", "Temp", new Random ().NextDouble ());
-                Assert.IsTrue (r, "PostValueAsync retunred false");
+                var r = await client.QueryDBAsync ("stress", "select * from performance limit 10");
+                DateTime d;
+                Assert.IsTrue (r != null && DateTime.TryParse (r[0].time, out d), "QueryDBAsync retunred null or invalid data");
+            }
+            catch ( Exception e )
+            {
+                Assert.Fail ("Unexpected exception of type {0} caught: {1}",
+                            e.GetType (), e.Message);
+                return;
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException (typeof (ArgumentException))]
+        public async Task TestQueryAsync_MultiSeries()
+        {
+            var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
+            var r = await client.QueryDBAsync ("_internal", "Show Series");
+        }
+
+        [TestMethod]
+        public async Task TestPostIntPointAsync()
+        {
+            try
+            {
+                var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
+                var time = DateTime.Now;
+                var rand = new Random ();
+                var valInt = new InfluxDatapoint<int> ();
+                valInt.UtcTimestamp = DateTime.UtcNow;
+                valInt.Tags.Add ("TestDate", time.ToShortDateString ());
+                valInt.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valInt.Fields.Add ("Intfield", rand.Next ());
+                valInt.Fields.Add ("Intfield2", rand.Next ());
+                valInt.MeasurementName = measurementName;
+                valInt.Precision = TimePrecision.Seconds;
+                var r = await client.PostPointAsync (dbName, valInt);
+                Assert.IsTrue (r, "PostPointAsync retunred false");
             }
             catch ( Exception e )
             {
@@ -153,15 +191,23 @@ public async Task TestPostValueAsync()
         }
 
         [TestMethod]
-        public async Task TestPostValuesAsync()
+        public async Task TestPostDoublePointAsync()
         {
             try
             {
                 var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
-                var val = new Random ();
-                var values = new Dictionary<string, double> () { { "filed1", val.NextDouble () * 10 }, { "filed2", val.NextDouble () * 10 }, { "filed3", val.NextDouble () * 10 } };
-                var r = await client.PostValuesAsync (dbName, measurementName, DateTime.UtcNow.ToEpoch (TimePrecision.Seconds), TimePrecision.Seconds, "testTag=testTagValue", values);
-                Assert.IsTrue (r, "PostValuesAsync retunred false");
+                var time = DateTime.Now;
+                var rand = new Random ();
+                var valDouble = new InfluxDatapoint<double> ();
+                valDouble.UtcTimestamp = DateTime.UtcNow;
+                valDouble.Tags.Add ("TestDate", time.ToShortDateString ());
+                valDouble.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valDouble.Fields.Add ("Doublefield", rand.NextDouble ());
+                valDouble.Fields.Add ("Doublefield2", rand.NextDouble ());
+                valDouble.MeasurementName = measurementName;
+                valDouble.Precision = TimePrecision.Seconds;
+                var r = await client.PostPointAsync (dbName, valDouble);
+                Assert.IsTrue (r, "PostPointAsync retunred false");
             }
             catch ( Exception e )
             {
@@ -172,31 +218,206 @@ public async Task TestPostValuesAsync()
             }
         }
 
+        private string GenerateRandomString()
+        {
+            var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ,=/\\";
+            var stringChars = new char[16];
+            var random = new Random ();
+
+            for ( int i = 0; i < stringChars.Length; i++ )
+            {
+                stringChars[i] = chars[random.Next (chars.Length)];
+            }
+            return new String (stringChars);
+        }
+
         [TestMethod]
-        public async Task TestQueryAsync()
+        public async Task TestPostStringPointAsync()
+        {
+            try
+            {
+                var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
+                var time = DateTime.Now;
+                var valString = new InfluxDatapoint<string> ();
+                valString.UtcTimestamp = DateTime.UtcNow;
+                valString.Tags.Add ("TestDate", time.ToShortDateString ());
+                valString.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valString.Fields.Add ("Stringfield", GenerateRandomString ());
+                valString.MeasurementName = measurementName;
+                valString.Precision = TimePrecision.Seconds;
+                var r = await client.PostPointAsync (dbName, valString);
+                Assert.IsTrue (r, "PostPointAsync retunred false");
+            }
+            catch ( Exception e )
+            {
+
+                Assert.Fail ("Unexpected exception of type {0} caught: {1}",
+                            e.GetType (), e.Message);
+                return;
+            }
+        }
+
+        [TestMethod]
+        public async Task TestPostBooleanPointAsync()
         {
             try
             {
+                var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
+                var time = DateTime.Now;
 
+                var valBool = new InfluxDatapoint<bool> ();
+                valBool.UtcTimestamp = DateTime.UtcNow;
+                valBool.Tags.Add ("TestDate", time.ToShortDateString ());
+                valBool.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valBool.Fields.Add ("Booleanfield", time.Ticks % 2 == 0);
+                valBool.MeasurementName = measurementName;
+                valBool.Precision = TimePrecision.Seconds;
+                var r = await client.PostPointAsync (dbName, valBool);
+                Assert.IsTrue (r, "PostPointAsync retunred false");
+            }
+            catch ( Exception e )
+            {
+
+                Assert.Fail ("Unexpected exception of type {0} caught: {1}",
+                            e.GetType (), e.Message);
+                return;
+            }
+        }
+
+        [TestMethod]
+        public async Task TestPostPointsAsync()
+        {
+            try
+            {
                 var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
-                var r = await client.QueryDBAsync ("stress", "select * from performance limit 10");
-                DateTime d;
-                Assert.IsTrue (r != null && DateTime.TryParse(r[0].time,out d), "QueryDBAsync retunred null or invalid data");
+                var time = DateTime.Now;
+                var rand = new Random ();
+
+                var valDouble = new InfluxDatapoint<double> ();
+                valDouble.UtcTimestamp = DateTime.UtcNow;
+                valDouble.Tags.Add ("TestDate", time.ToShortDateString ());
+                valDouble.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valDouble.Fields.Add ("Doublefield", rand.NextDouble ());
+                valDouble.Fields.Add ("Doublefield2", rand.NextDouble ());
+                valDouble.MeasurementName = measurementName;
+                valDouble.Precision = TimePrecision.Milliseconds;
+
+                var valInt = new InfluxDatapoint<int> ();
+                valInt.UtcTimestamp = DateTime.UtcNow;
+                valInt.Tags.Add ("TestDate", time.ToShortDateString ());
+                valInt.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valInt.Fields.Add ("Intfield", rand.Next ());
+                valInt.Fields.Add ("Intfield2", rand.Next ());
+                valInt.MeasurementName = measurementName;
+                valInt.Precision = TimePrecision.Seconds;
+
+                var valBool = new InfluxDatapoint<bool> ();
+                valBool.UtcTimestamp = DateTime.UtcNow;
+                valBool.Tags.Add ("TestDate", time.ToShortDateString ());
+                valBool.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valBool.Fields.Add ("Booleanfield", time.Ticks % 2 == 0);
+                valBool.MeasurementName = measurementName;
+                valBool.Precision = TimePrecision.Minutes;
+
+                var valString = new InfluxDatapoint<string> ();
+                valString.UtcTimestamp = DateTime.UtcNow;
+                valString.Tags.Add ("TestDate", time.ToShortDateString ());
+                valString.Tags.Add ("TestTime", time.ToShortTimeString ());
+                valString.Fields.Add ("Stringfield", GenerateRandomString ());
+                valString.MeasurementName = measurementName;
+                valString.Precision = TimePrecision.Hours;
+
+                var points = new List<IInfluxDatapoint> ();
+                points.Add (valString);
+                points.Add (valInt);
+                points.Add (valDouble);
+                points.Add (valBool);
+                var r = await client.PostPointsAsync (dbName, points);
+                Assert.IsTrue (r, "PostPointsAsync retunred false");
             }
             catch ( Exception e )
             {
+
                 Assert.Fail ("Unexpected exception of type {0} caught: {1}",
                             e.GetType (), e.Message);
                 return;
             }
         }
 
+        /// <summary>
+        /// This will create 2000 objects, and posts them to Influx. Since the precision is random, many points get overwritten 
+        /// (e.g. you can have only point per hour at hour precision.
+        /// </summary>
+        /// <returns></returns>
         [TestMethod]
-        [ExpectedException (typeof (ArgumentException))]
-        public async Task TestQueryAsync_MultiSeries()
+        public async Task TestBachingPostPointsAsync()
         {
-            var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
-            var r = await client.QueryDBAsync ("_internal", "Show Series");
+            try
+            {
+                var client = new InfluxDBClient (influxUrl, dbUName, dbpwd);
+                
+                var rand = new Random ();
+                var points = new List<IInfluxDatapoint> ();
+
+                var today = DateTime.Now.ToShortDateString ();
+                var now = DateTime.Now.ToShortTimeString ();
+
+                for ( int i = 0; i < 500; i++ )
+                {
+                    var utcTime = DateTime.UtcNow;
+                    var valDouble = new InfluxDatapoint<double> ();
+                    valDouble.UtcTimestamp = utcTime;
+                    valDouble.Tags.Add ("TestDate", today);
+                    valDouble.Tags.Add ("TestTime", now);
+                    valDouble.Fields.Add ("Doublefield", rand.NextDouble ());
+                    valDouble.Fields.Add ("Doublefield2", rand.NextDouble ());
+                    valDouble.MeasurementName = measurementName;
+                    valDouble.Precision = (TimePrecision) ( rand.Next () % 6 ) + 1;
+
+                    var valInt = new InfluxDatapoint<int> ();
+                    valInt.UtcTimestamp = utcTime;
+                    valInt.Tags.Add ("TestDate", today);
+                    valInt.Tags.Add ("TestTime", now);
+                    valInt.Fields.Add ("Intfield", rand.Next ());
+                    valInt.Fields.Add ("Intfield2", rand.Next ());
+                    valInt.MeasurementName = measurementName;
+                    valInt.Precision = (TimePrecision) ( rand.Next () % 6 ) + 1;
+
+                    var valBool = new InfluxDatapoint<bool> ();
+                    valBool.UtcTimestamp = utcTime;
+                    valBool.Tags.Add ("TestDate", today);
+                    valBool.Tags.Add ("TestTime", now);
+                    valBool.Fields.Add ("Booleanfield", DateTime.Now.Ticks % 2 == 0);
+                    valBool.MeasurementName = measurementName;
+                    valBool.Precision = (TimePrecision) ( rand.Next () % 6 ) + 1;
+
+                    var valString = new InfluxDatapoint<string> ();
+                    valString.UtcTimestamp = utcTime;
+                    valString.Tags.Add ("TestDate", today);
+                    valString.Tags.Add ("TestTime", now);
+                    valString.Fields.Add ("Stringfield", GenerateRandomString ());
+                    valString.MeasurementName = measurementName;
+                    valString.Precision = (TimePrecision) ( rand.Next () % 6 ) + 1;
+
+
+                    points.Add (valString);
+                    points.Add (valInt);
+                    points.Add (valDouble);
+                    points.Add (valBool);
+                }
+
+                var r = await client.PostPointsAsync (dbName, points);
+                Assert.IsTrue (points.TrueForAll (p => p.Saved == true), "PostPointsAsync did not save all points");
+
+            }
+            catch ( Exception e )
+            {
+
+                Assert.Fail ("Unexpected exception of type {0} caught: {1}",
+                            e.GetType (), e.Message);
+                return;
+            }
         }
     }
+
 }

AdysTech.InfluxDB.Client.Net/AdysTech.InfluxDB.Client.Net.csproj

@@ -42,7 +42,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="IInfluxDatapoint.cs" />
     <Compile Include="IInfluxDBClient.cs" />
+    <Compile Include="InfluxDatapoint.cs" />
     <Compile Include="InfluxDBClient.cs" />
     <Compile Include="DataContracts\InfluxJsonTypes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

AdysTech.InfluxDB.Client.Net/ExtensionMethods.cs

@@ -19,8 +19,8 @@ public static long ToEpoch(this DateTime time, TimePrecision precision)
                 case TimePrecision.Minutes: return (long) t.TotalMinutes;
                 case TimePrecision.Seconds: return (long) t.TotalSeconds;
                 case TimePrecision.Milliseconds: return (long) t.TotalMilliseconds;
-                case TimePrecision.Microseconds: return (long) t.TotalMilliseconds * 1000;
-                case TimePrecision.Nanoseconds: return (long) t.TotalMilliseconds * 1000 * 1000;
+                case TimePrecision.Microseconds: return (long) t.Ticks * ( TimeSpan.TicksPerMillisecond / 1000 );
+                case TimePrecision.Nanoseconds: return (long) t.Ticks * 100; //1 tick = 100 nano sec
             }
             return 0;
         }