influxdb-client 1.10.0.pre.1356 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44f6709dfa6aac3adca2d8f399f3a34aa0b4c8e76891395a9b89b928f29bc29
-  data.tar.gz: 7467d6cc9cd23cf2e9a9d0511e6bfb3873b72c7131fb54459b87819f1ba2c617
+  metadata.gz: 8027476de30b385d27485ff85014ae02f85cd5530fa49b740465ccccf2f1fd6e
+  data.tar.gz: 494d0bfe0d990fc9855a60a425e9cc3085e1011cf8005b0c1b4be144db4767a8
 SHA512:
-  metadata.gz: 0c4b03378fcd81f238dc7ac51cc5ae783831406488e9515e4b09897c5fd191244b2ef76c3433e8c3196182ecbd633b595ee19a7aafd46db6fedc9d8120b605e3
-  data.tar.gz: b37ae36f551635ef57db5a898d9b6ee1d4219735eff9782668e8d518cb8684e143d3ac496e84662f85cf4d5e1bdcfe73b29b0069070ff0a96a2ed8d7c823d6a9
+  metadata.gz: 78623c34c15f9e2c53fee332d61206a4aa50d62fae16b3bd175177c72ee8022de3d4fc49d1af7560e8d53943602a823ce697c39c2afdf7f664b458af0e0253d8
+  data.tar.gz: a883e0ca1b808e7768c9f48ddef40311b5ff40f3f6b0d87030d8b3135a77854e5489e9c74155b7d9a1f6bf9d47bca004cd40ffc6130956b89ed8eee4ab075cf7

data/.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:2.0.0-rc"
+        default: &default-influxdb-image "influxdb:v2.0.2"
     docker:
       - image: << parameters.ruby-image >>
       - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.10.0 [unreleased]
+## 1.10.0 [2020-12-04]
+
+### Features
+1. [#59](https://github.com/influxdata/influxdb-client-ruby/pull/59): CSV parser is able to parse export from UI
+
+### CI
+1. [#62](https://github.com/influxdata/influxdb-client-ruby/pull/62): Updated default docker image to v2.0.2
+
+### Bug Fixes
+1. [#61](https://github.com/influxdata/influxdb-client-ruby/pull/61): Query results has precision with nanosecond, e.g. '1970-01-01T00:00:00.000123456+00:00'
 
 ## 1.9.0 [2020-10-30]
 

data/README.md

@@ -23,7 +23,7 @@ The client can be installed manually or with bundler.
 To install the client gem manually:
 
 ```
-gem install influxdb-client -v 1.9.0
+gem install influxdb-client -v 1.10.0
 ```
 
 ## Usage
@@ -194,7 +194,7 @@ The data could be written as:
 
 1. `String` that is formatted as a InfluxDB's line protocol
 1. `Hash` with keys: name, tags, fields and time
-1. [Data Point](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb/client/point.rb#L28) structure
+1. [Data Point](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/point.rb#L28) structure
 1. `Array` of above items
 
 ```ruby
@@ -274,7 +274,7 @@ Server availability can be checked using the `client.health` method. That is equ
 
 ### InfluxDB 1.8 API compatibility
 
-[InfluxDB 1.8.0 introduced forward compatibility APIs](https://docs.influxdata.com/influxdb/latest/tools/api/#influxdb-2-0-api-compatibility-endpoints) for InfluxDB 2.0. This allow you to easily move from InfluxDB 1.x to InfluxDB 2.0 Cloud or open source.
+[InfluxDB 1.8.0 introduced forward compatibility APIs](https://docs.influxdata.com/influxdb/v1.8/tools/api/#influxdb-2-0-api-compatibility-endpoints) for InfluxDB 2.0. This allow you to easily move from InfluxDB 1.x to InfluxDB 2.0 Cloud or open source.
 
 The following forward compatible APIs are available:
 

data/bin/influxdb-restart.sh

@@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
 DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="2.0.0-rc"
+DEFAULT_INFLUXDB_V2_VERSION="v2.0.2"
 INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
 INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}

data/lib/influxdb2/client/flux_csv_parser.rb

@@ -54,6 +54,7 @@ module InfluxDB2
       @table_id = -1
       @start_new_table = false
       @table = nil
+      @groups = []
       @parsing_state_error = false
 
       @closed = false
@@ -102,14 +103,20 @@ module InfluxDB2
 
     private
 
+    ANNOTATION_DATATYPE = '#datatype'.freeze
+    ANNOTATION_GROUP = '#group'.freeze
+    ANNOTATION_DEFAULT = '#default'.freeze
+    ANNOTATIONS = [ANNOTATION_DATATYPE, ANNOTATION_GROUP, ANNOTATION_DEFAULT].freeze
+
     def _parse_line(csv)
       token = csv[0]
 
       # start new table
-      if token == '#datatype'
+      if (ANNOTATIONS.include? token) && !@start_new_table
         # Return already parsed DataFrame
         @start_new_table = true
         @table = InfluxDB2::FluxTable.new
+        @groups = []
 
         @tables[@table_index] = @table unless @stream
 
@@ -120,13 +127,13 @@ module InfluxDB2
       end
 
       #  # datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string
-      if token == '#datatype'
+      if token == ANNOTATION_DATATYPE
         _add_data_types(@table, csv)
 
-      elsif token == '#group'
-        _add_groups(@table, csv)
+      elsif token == ANNOTATION_GROUP
+        @groups = csv
 
-      elsif token == '#default'
+      elsif token == ANNOTATION_DEFAULT
         _add_default_empty_values(@table, csv)
       else
         _parse_values(csv)
@@ -170,6 +177,7 @@ module InfluxDB2
     def _parse_values(csv)
       # parse column names
       if @start_new_table
+        _add_groups(@table, @groups)
         _add_column_names_and_tags(@table, csv)
         @start_new_table = false
         return
@@ -236,7 +244,7 @@ module InfluxDB2
       when 'base64Binary'
         Base64.decode64(str_val)
       when 'dateTime:RFC3339', 'dateTime:RFC3339Nano'
-        Time.parse(str_val).to_datetime.rfc3339
+        Time.parse(str_val).to_datetime.rfc3339(9)
       else
         str_val
       end

data/test/influxdb/flux_csv_parser_test.rb

@@ -155,10 +155,33 @@ class FluxCsvParserTest < MiniTest::Test
     tables = InfluxDB2::FluxCsvParser.new(data).parse.tables
     records = tables[0].records
 
-    assert_equal Time.parse('1970-01-01T00:00:10Z').to_datetime.rfc3339, records[0].values['value']
+    assert_equal _parse_time('1970-01-01T00:00:10Z'), records[0].values['value']
     assert_nil records[1].values['value']
   end
 
+  def test_mapping_rfc3339_nano
+    data = "#group,false,false,true,true,false,false,true,true,true,true,true,true\n" \
+      '#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,' \
+      "string,string,string,string,string,string\n" \
+      "#default,mean,,,,,,,,,,,\n" \
+      ",result,table,_start,_stop,_time,_value,_field,_measurement,language,license,name,owner\n" \
+      ',,0,2020-11-02T07:29:49.55050738Z,2020-12-02T07:29:49.55050738Z,2020-11-02T09:00:00Z,9,' \
+      "stars,github_repository,Ruby,MIT License,influxdb-client-ruby,influxdata\n"
+
+    tables = InfluxDB2::FluxCsvParser.new(data).parse.tables
+    records = tables[0].records
+
+    assert_equal 9, records[0].values['_value']
+    start = Time.parse(records[0].values['_start'])
+    assert_equal 2020, start.year
+    assert_equal 11, start.month
+    assert_equal 2, start.day
+    assert_equal 7, start.hour
+    assert_equal 29, start.min
+    assert_equal 49, start.sec
+    assert_equal '55050738', start.strftime('%8N')
+  end
+
   def test_mapping_duration
     data = '#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339' \
       ",dateTime:RFC3339,long,string,string,string,duration\n" \
@@ -209,7 +232,7 @@ class FluxCsvParserTest < MiniTest::Test
   private
 
   def _parse_time(time)
-    Time.parse(time).to_datetime.rfc3339
+    Time.parse(time).to_datetime.rfc3339(9)
   end
 
   def _assert_record(flux_record, values: nil, size: 0, value: nil)
@@ -324,6 +347,32 @@ class FluxCsvParserErrorTest < MiniTest::Test
     assert_equal 'Unable to parse CSV response. FluxTable definition was not found.', error.message
   end
 
+  def test_response_with_error
+    data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n" \
+    "#group,false,false,true,true,true,true,false,false,true\n" \
+    "#default,t1,,,,,,,,\n" \
+    ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n" \
+    ",,0,value,python,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test1\n" \
+    ",,0,value,python,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test1\n" \
+    ",,0,value,python,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test1\n" \
+    ",,0,value,python,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test1\n" \
+    "\n" \
+    "#datatype,string,string\n" \
+    "#group,true,true\n" \
+    "#default,,\n" \
+    ",error,reference\n" \
+    ',"engine: unknown field type for value: xyz",'
+
+    parser = InfluxDB2::FluxCsvParser.new(data)
+
+    error = assert_raises InfluxDB2::FluxQueryError do
+      parser.parse
+    end
+
+    assert_equal 'engine: unknown field type for value: xyz', error.message
+    assert_equal 0, error.reference
+  end
+
   def test_multiple_queries
     data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n" \
       "#group,false,false,true,true,true,true,false,false,true\n" \
@@ -398,4 +447,21 @@ class FluxCsvParserErrorTest < MiniTest::Test
     assert_equal 7, tables[0].records.size
     assert_equal 7, tables[1].records.size
   end
+
+  def test_parse_export_from_ui
+    data = "#group,false,false,true,true,true,true,true,true,false,false\n" \
+   "#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,double,dateTime:RFC3339\n" \
+   "#default,mean,,,,,,,,,\n" \
+   ",result,table,_start,_stop,_field,_measurement,city,location,_value,_time\n" \
+   ",,0,1754-06-26T11:30:27.613654848Z,2040-10-27T12:13:46.485Z,temp,weather,Lon,us,30,1975-09-01T16:59:54.5Z\n" \
+   ",,1,1754-06-26T11:30:27.613654848Z,2040-10-27T12:13:46.485Z,temp,weather,Lon,us,86,1975-09-01T16:59:54.5Z\n"
+
+    tables = InfluxDB2::FluxCsvParser.new(data).parse.tables
+    assert_equal 2, tables.size
+    assert_equal 1, tables[0].records.size
+    assert_equal false, tables[0].columns[0].group
+    assert_equal false, tables[0].columns[1].group
+    assert_equal true, tables[0].columns[2].group
+    assert_equal 1, tables[1].records.size
+  end
 end

data/test/influxdb/query_api_integration_test.rb

@@ -55,4 +55,25 @@ class QueryApiIntegrationTest < MiniTest::Test
     assert_equal 2, record.value
     assert_equal 'level', record.field
   end
+
+  def test_parsed_time_precision
+    now = Time.now.utc
+    measurement = 'h2o_query_' + now.to_i.to_s + now.nsec.to_s
+
+    @client.create_write_api.write(data: InfluxDB2::Point.new(name: measurement)
+                                             .add_field('value', 10)
+                                             .time(123_456, InfluxDB2::WritePrecision::NANOSECOND))
+
+    result = @client.create_query_api.query(query: 'from(bucket: "my-bucket") |> range(start: 0, stop: now()) '\
+          "|> filter(fn: (r) => r._measurement == \"#{measurement}\")")
+
+    assert_equal 1, result.size
+
+    records = result[0].records
+    assert_equal 1, records.size
+
+    record = records[0]
+    assert_equal 10, record.value
+    assert_equal '1970-01-01T00:00:00.000123456+00:00', record.values['_time']
+  end
 end

data/test/influxdb/query_api_test.rb

@@ -67,7 +67,7 @@ class QueryApiTest < MiniTest::Test
 
     record1 = result[0].records[0]
 
-    assert_equal Time.parse('1970-01-01T00:00:10Z').to_datetime.rfc3339, record1.time
+    assert_equal Time.parse('1970-01-01T00:00:10Z').to_datetime.rfc3339(9), record1.time
     assert_equal 'mem', record1.measurement
     assert_equal 10, record1.value
     assert_equal 'free', record1.field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre.1356
+  version: 1.10.0
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,9 +198,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: