Support non text time stamps like epoch and binary (#30)

Support non text time stamps like epoch and binary (#30), Fix #24, #29
AdysTech · Nov 11, 2017 · af7cd16 · af7cd16
1 parent 8e0e8ea
commit af7cd16
Show file tree

Hide file tree

Showing 27 changed files with 6,465 additions and 6,283 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -0,0 +1,12 @@
+## v0.9.0.0 [11/11/2017]
+
+### Release Notes
+Added the functionality to parse files with binary or epoch time stamps. `-typetype` parameter can be used to select between text, binary or epoch formats.
+
+### Features
+
+- [#30](https://github.com/AdysTech/Influxer/pull/30): Support non text time stamps like epoch and binary
+
+### Bugfixes
+
+- [#29](https://github.com/AdysTech/Influxer/issues/29): Fix Issues with arguments, Thanks to @R-Sommer 
diff --git a/Influxer.Test/Influxer.Test.csproj b/Influxer.Test/Influxer.Test.csproj
@@ -35,11 +35,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AdysTech.InfluxDB.Client.Net, Version=0.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AdysTech.InfluxDB.Client.Net.0.6.5\lib\net451\AdysTech.InfluxDB.Client.Net.dll</HintPath>
+    <Reference Include="AdysTech.InfluxDB.Client.Net, Version=0.6.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AdysTech.InfluxDB.Client.Net.0.6.7\lib\net451\AdysTech.InfluxDB.Client.Net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -67,18 +67,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="TestFiles\MicroSecSemicolonSeperated.txt" />
     <None Include="app.config" />
-    <None Include="TestSetup.ps1" />
+    <Content Include="TestFiles\binary.csv" />
+    <Content Include="TestFiles\epoch_s.csv" />
+    <Content Include="TestFiles\epoch_u.csv" />
     <None Include="packages.config" />
+    <None Include="TestSetup.ps1" />
     <None Include="TestFiles\HeaderlessText.txt" />
     <None Include="TestFiles\HeaderlessText.conf" />
     <None Include="TestFiles\Perfmon.csv" />
     <None Include="TestFiles\Simple-2.csv" />
     <None Include="TestFiles\Simple.csv" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="TestFiles\MicroSecSemicolonSeperated.txt" />
-  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

diff --git a/Influxer.Test/InfluxerTests.cs b/Influxer.Test/InfluxerTests.cs
@@ -64,6 +64,15 @@ public void TestAutoLayoutCommand()
             Assert.IsFalse(CommandLineProcessor.ProcessArguments(args), "Processing AutoLayout Command failed");
         }
 
+        [TestMethod]
+        public void TestExportCommand()
+        {
+            var args = new string[] {
+                "/export"
+            };
+            Assert.IsFalse(CommandLineProcessor.ProcessArguments(args), "Processing Export Command failed");
+        }
+
         [TestMethod]
         public async Task TestGenericHeaderless()
         {
@@ -83,7 +92,8 @@ public async Task TestGenericMicroSecPrecision()
                 "-format", "Generic",
                 "-TimeFormat", "yyyy-MM-dd-hh.mm.ss.ffffff",
                 "-Precision", "Microseconds",
-                "-splitter", ";" };
+                "-splitter", ";",
+                "-table" ,"MicroSecPrecision"};
             InfluxerConfigSection settings;
             CommandLineProcessor.ProcessArguments(args);
             settings = CommandLineProcessor.Settings;
@@ -101,6 +111,7 @@ public async Task TestGenericSimple()
             settings.InputFileName = Path.Combine(TestFilesPath, "Simple.csv");
             settings.InfluxDB.RetentionPolicy = "autogen";
             settings.GenericFile.TimeFormat = "yyyy-MM-dd m:ss";
+            settings.InfluxDB.Measurement = "simple";
             var client = await GetClientAsync(settings);
             var file = new GenericFile();
             var result = await file.ProcessGenericFile(settings.InputFileName, client);
@@ -125,7 +136,7 @@ public async Task TestGenericSimple2()
         [TestMethod]
         public void TestHelpCommand()
         {
-            var args = new string[] { "--help" };
+            var args = new string[] { "/?" };
             Assert.IsFalse(CommandLineProcessor.ProcessArguments(args), "Processing help command failed");
         }
 
@@ -135,6 +146,7 @@ public async Task TestPerfmonFile()
             var settings = InfluxerConfigSection.LoadDefault();
             settings.FileFormat = FileFormats.Perfmon;
             settings.InputFileName = Path.Combine(TestFilesPath, "Perfmon.csv");
+            settings.InfluxDB.PointsInSingleBatch = 2000;
             var client = await GetClientAsync(settings);
             var result = await new PerfmonFile().ProcessPerfMonLog(settings.InputFileName, client);
             //Debug.WriteLine (result.ToString ());
@@ -146,14 +158,66 @@ public async Task TestPerfmonFileMultiMeasurement()
         {
             var settings = InfluxerConfigSection.LoadDefault();
             settings.FileFormat = FileFormats.Perfmon;
-            settings.InfluxDB.RetentionDuration = (int)TimeSpan.FromDays(365).TotalMinutes;
+            settings.InfluxDB.RetentionDuration = (int)TimeSpan.FromDays(365*2).TotalMinutes;
             settings.InfluxDB.RetentionPolicy = "autogen1";
             settings.PerfmonFile.MultiMeasurements = true;
+
             settings.InputFileName = Path.Combine(TestFilesPath, "Perfmon.csv");
             var client = await GetClientAsync(settings);
             var result = await new PerfmonFile().ProcessPerfMonLog(settings.InputFileName, client);
             //Debug.WriteLine (result.ToString ());
             Assert.IsTrue(result.ExitCode == ExitCode.ProcessedWithErrors && result.PointsFound == 5347 && result.PointsFailed == 0, "Processing Perfmon file failed");
         }
+
+        [TestMethod]
+        public async Task TestBinary()
+        {
+            var args = new string[] { "-input", Path.Combine (TestFilesPath, "binary.csv"),
+                "-format", "Generic",
+                "-timetype", "binary",
+                "-Precision", "Microseconds",
+                "-table" ,"binary"};
+            InfluxerConfigSection settings;
+            CommandLineProcessor.ProcessArguments(args);
+            settings = CommandLineProcessor.Settings;
+            var client = await GetClientAsync(settings);
+            var result = await new GenericFile().ProcessGenericFile(settings.InputFileName, client);
+            //Debug.WriteLine (result.ToString ());
+            Assert.IsTrue(result.ExitCode == ExitCode.Success && result.PointsFound == 4 && result.PointsFailed == 0, "Processing a generic binary file failed");
+        }
+
+        [TestMethod]
+        public async Task TestEpoch()
+        {
+            var args = new string[] { "-input", Path.Combine (TestFilesPath, "epoch_u.csv"),
+                "-format", "Generic",
+                "-timetype", "epoch",
+                "-Precision", "Microseconds",
+                "-table" ,"epoch"};
+            InfluxerConfigSection settings;
+            CommandLineProcessor.ProcessArguments(args);
+            settings = CommandLineProcessor.Settings;
+            var client = await GetClientAsync(settings);
+            var result = await new GenericFile().ProcessGenericFile(settings.InputFileName, client);
+            //Debug.WriteLine (result.ToString ());
+            Assert.IsTrue(result.ExitCode == ExitCode.Success && result.PointsFound == 4 && result.PointsFailed == 0, "Processing a generic epoch file failed");
+        }
+
+        [TestMethod]
+        public async Task TestEpoch1()
+        {
+            var args = new string[] { "-input", Path.Combine (TestFilesPath, "epoch_s.csv"),
+                "-format", "Generic",
+                "-timetype", "epoch",
+                "-Precision", "Seconds",
+                "-table" ,"epoch"};
+            InfluxerConfigSection settings;
+            CommandLineProcessor.ProcessArguments(args);
+            settings = CommandLineProcessor.Settings;
+            var client = await GetClientAsync(settings);
+            var result = await new GenericFile().ProcessGenericFile(settings.InputFileName, client);
+            //Debug.WriteLine (result.ToString ());
+            Assert.IsTrue(result.ExitCode == ExitCode.Success && result.PointsFound == 4 && result.PointsFailed == 0, "Processing a generic epoch file failed");
+        }
     }
 }
diff --git a/Influxer.Test/TestFiles/HeaderlessText.conf b/Influxer.Test/TestFiles/HeaderlessText.conf
@@ -13,7 +13,7 @@
     },
     "RetentionDuration": 0,
     "RetentionPolicy": null,
-    "Measurement": "InfluxerData"
+    "Measurement": "Headerless"
   },
   "PerfmonFile": {
     "ColumnSplitter": ",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)",