From c2dfe42e3a64d7272af694f4caeb52d7abb03416 Mon Sep 17 00:00:00 2001 From: Adarsha <8618235+mvadu@users.noreply.github.com> Date: Sun, 5 Apr 2020 07:46:55 -0700 Subject: [PATCH] Revert "Framework and core version upgrade, Fix #84, #90 and #91 (#93)" This reverts commit fffc8fc623c1d08363558dd5ae3c807f8460c405. --- .gitignore | 1 - .vscode/settings.json | 36 ++++++++++++++ CHANGELOG.md | 25 +++------- appveyor.yml | 18 +++---- .../AdysTech.InfluxDB.Client.Net.Core.csproj | 20 ++++---- .../AdysTech.InfluxDB.Client.Net.csproj | 12 ++--- .../AdysTech.InfluxDB.Client.Net.nuspec | 10 ++-- .../Properties/AssemblyInfo.cs | 6 +-- .../packages.config | 4 ++ src/DataStructures/InfluxContinuousQuery.cs | 37 +++++++------- src/DataStructures/InfluxDBClient.cs | 48 ++----------------- src/DataStructures/InfluxDatapoint.cs | 2 +- src/DataStructures/InfluxValueField.cs | 4 +- .../ServiceUnavailableException.cs | 4 -- ...sTech.InfluxDB.Client.Net.Core.Test.csproj | 2 +- 15 files changed, 100 insertions(+), 129 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/AdysTech.InfluxDB.Client.Net/packages.config diff --git a/.gitignore b/.gitignore index 30b3aec..8ff2b63 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ *.suo *.user *.sln.docstates -.vscode # Build results [Dd]ebug/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..500864b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,36 @@ +{ + "cSpell.enabledLanguageIds": [ + "asciidoc", + "c", + "cpp", + "csharp", + "css", + "git-commit", + "go", + "handlebars", + "haskell", + "html", + "jade", + "java", + "javascript", + "javascriptreact", + "json", + "jsonc", + "latex", + "less", + "markdown", + "php", + "plaintext", + "pug", + "python", + "restructuredtext", + "rust", + "scala", + "scss", + "text", + "typescript", + "typescriptreact", + "yaml", + "yml" + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 1097aaf..ae3aa67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,7 @@ -## v0.15.0 [04/01/2020] - -### Release Notes -Migrate to .net core 3.1. I have also moved the base .Net framework to 4.6 (long overdue). If there are anyone still using 4.5.1 I am sorry, its high time you upgrade. Bug & Performance fixes. - -### Bugfixes - -- [#90](https://github.com/AdysTech/InfluxDB.Client.Net/issues/90): PostPointsAsync method is so slow in linux os -- [#91](https://github.com/AdysTech/InfluxDB.Client.Net/issues/91): StatusCode Forbidden not considered in GetAsync() -- [#84](https://github.com/AdysTech/InfluxDB.Client.Net/issues/84): Execute Continuous Query every seconds - ## v0.11.0 [02/01/2020] ### Release Notes -Option to add a retention policy with infinite duration - Thanks to @jasase +Option to add a rentention policy with infinite duration - Thanks to @jasase Handle truncated responses due to "max-row-limit", (flag "partial=true"). Thanks to @tbraun-hk ### Bugfixes @@ -96,7 +85,7 @@ Fix escape sequence to match InfluxDB documentation ### Bugfixes -- [#42](https://github.com/AdysTech/InfluxDB.Client.Net/issues/42): Stop changing column header case to Camel case +- [#42](https://github.com/AdysTech/InfluxDB.Client.Net/issues/42): Stop chnaging column header case to Camel case - [#48](https://github.com/AdysTech/InfluxDB.Client.Net/issues/48): Incorrect escape sequence for string values with space - [#50](https://github.com/AdysTech/InfluxDB.Client.Net/issues/50): Missing quotes for retention policy name @@ -118,7 +107,7 @@ Allow non ASCII passwords, escape double quotes (Thanks to [@siavelis](https://g ## v0.6.1 [6/03/2017] ### Release Notes -Allow points to be passed without explicitly setting time or precision. It also fixes an issue with previous implementation of the chunking support. +Allow points to be passed without explictly setting time or precision. It also fixes an issue with previopus implementation of the chunking support. ### Bugfixes @@ -131,7 +120,7 @@ Allow points to be passed without explicitly setting time or precision. It also ### Breaking Change -- Library will silently drop points older than retention period. This is similar to InfluDB behavior where it will reject those points with an `{"error":"partial write: points beyond retention policy dropped=225"}` +- Library will silently drop points older than retention period. This is similar to InfluDB behavios where it will reject those points with an `{"error":"partial write: points beyond retention policy dropped=225"}` ## v0.6.1 [3/28/2017] @@ -167,7 +156,7 @@ This version adds support for .Net Core. Minor release to fix a blocking bug with data series with microsecond precision. ### Breaking Change -- `InfluxDBClient` now implements `IDisposable`, so plan to expect few warnings in your code. Similarly custom exceptions from this library are marked as `Serializable` +- `InfluxDBClient` now implements `IDispobale`, so plan to expect few warnings in your code. Similarly custom exceptions from this library are marked as `Serializable` ### Bugfixes @@ -179,12 +168,12 @@ Minor release to fix a blocking bug with data series with microsecond precision. ### Release Notes This version is a precursor to enable support for .Net Core. This restructures the solution folders, makes the unit tests truly independent of each other. It also supports deleting Continuous Queries. As of now it still does not support the .NBet Core as there are few open issues (e.g. [#3199](https://github.com/dotnet/cli/issues/3199), [#147](https://github.com/aspnet/Tooling/issues/147)) which are rooted in .Net Core's dependency on `xproj` model. Once they move to `csproj` these issues will be resolved, and this library will support .Net Core as well via .Net Standard (1.6+) PCL. Final goal is to have same set of source files, which gets complied as normal .Net 4.5 class library, and a PCL for the Core. -This version moves away from `JavaScriptSerializer` to [Json.NET](https://github.com/JamesNK/Newtonsoft.Json). Functionally this is a transparent change. But this is required as former is not supported in .Net Core. +This version moves away from `JavaScriptSerializer` to [Json.NET](https://github.com/JamesNK/Newtonsoft.Json). Functionally this is a transparent chnage. But this is required as former is not supported in .Net Core. ### Features - [#16](https://github.com/AdysTech/InfluxDB.Client.Net/issues/16): Create / Delete Continuous Query -- QueryMultiSeriesAsync returns the time in a `DateTime` object if the series has one. The method also supports different epoch precisions in query results now. +- QueryMultiSeriesAsync returns the time in a `DateTime` object if the series has one. The method also supports different epoch precisoins in query results now. ### Breaking Change diff --git a/appveyor.yml b/appveyor.yml index 54a30ea..bd99090 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,36 +1,30 @@ version: 0.{build} -image: Visual Studio 2019 - +image: Visual Studio 2017 pull_requests: do_not_increment_build_number: true - branches: only: - master - before_build: - nuget restore - dotnet restore - build: verbosity: minimal publish_nuget: true publish_nuget_symbols: true use_snupkg_format: true - before_test: - ps: tests\InfluxDB.Client.Net.TestSetup.ps1 - +after_test: +- ps: Get-ChildItem -include "AdysTech.InfluxDB.Client.Net.Core*nupkg" | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } deploy: - provider: NuGet api_key: - secure: x3I/stoKSfZBfSgc91uX34lkSU+Qs7XfgVJVSSKZsgeqKpz3WLIye9Ys6Gv7jpoo + secure: nlBDuJJE7GoAtSvHKJDjdutExvlEQErL8Q9gFqmhURY4xUgFT946cs2mLeQ2Qezi on: branch: master - - artifacts: - - path: '*.nupkg' + - path: 'src\**\*.nupkg' name: NuGet Packages - - path: '*.snupkg' + - path: 'src\**\*.snupkg' name: NuGet Symbol Packages \ No newline at end of file diff --git a/src/AdysTech.InfluxDB.Client.Net.Core/AdysTech.InfluxDB.Client.Net.Core.csproj b/src/AdysTech.InfluxDB.Client.Net.Core/AdysTech.InfluxDB.Client.Net.Core.csproj index 82ac4f6..8bf6de1 100644 --- a/src/AdysTech.InfluxDB.Client.Net.Core/AdysTech.InfluxDB.Client.Net.Core.csproj +++ b/src/AdysTech.InfluxDB.Client.Net.Core/AdysTech.InfluxDB.Client.Net.Core.csproj @@ -1,14 +1,14 @@  - netstandard2.1 + netstandard2.0 .Net client for InfluxDB. Supports all InfluxDB version from 0.9 onwards. Supports both .Net 4.6.1+ and .Net Core 2.0+. AdysTech.InfluxDB.Client.Net AdysTech AdysTech;mvadu - 0.15.0.0 + 0.11.1.0 AdysTech.InfluxDB.Client.Net.Core - © AdysTech 2016-2020 + © AdysTech 2016-2019 https://github.com/AdysTech/InfluxDB.Client.Net https://github.com/AdysTech/InfluxDB.Client.Net True @@ -17,11 +17,11 @@ This is a feature rich .Net client for InfluxDB. All methods are exposed as Async methods, so that the calling thread will not be blocked. It currently supports -1. Connecting using credentials -2. Querying all existing databases -3. Creating new database -4. Querying for the whole DB structure (hierarchical structure of all measurements, and fields) -5. Writing single, multiple values to db +1. Connecting using credentials +2. Querying all existing databases +3. Creating new database +4. Querying for the whole DB structure (hierarchical structure of all measurements, and fields) +5. Writing single, multiple values to db 6.  Retention policy management 7.  Post data to specific retention policies 8.  Query for all Continuous Queries @@ -29,8 +29,8 @@ It currently supports 10. Chunking Support in queries 11. Drop databases, measurements or points 12. Get series count or points count for a measurement - 0.15.0.0 - 0.15.0.0 + 0.11.1.0 + 0.11.1.0 InfluxDB Influx TSDB TimeSeries InfluxData Chunking retention RetentionPolicy MIT diff --git a/src/AdysTech.InfluxDB.Client.Net/AdysTech.InfluxDB.Client.Net.csproj b/src/AdysTech.InfluxDB.Client.Net/AdysTech.InfluxDB.Client.Net.csproj index 3ab460c..6e28cbe 100644 --- a/src/AdysTech.InfluxDB.Client.Net/AdysTech.InfluxDB.Client.Net.csproj +++ b/src/AdysTech.InfluxDB.Client.Net/AdysTech.InfluxDB.Client.Net.csproj @@ -9,8 +9,7 @@ Properties AdysTech.InfluxDB.Client.Net AdysTech.InfluxDB.Client.Net - v4.6 - win + v4.5.1 512 @@ -32,6 +31,9 @@ 4 + + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + @@ -115,11 +117,7 @@ - - - - 12.0.3 - +