influxdb-client 1.10.0.pre.1373 → 1.10.0.pre.1408

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee09c0b487146566919ffec3a0d716dd59fbe9b2e77c5239c69217bc224f74f7
-  data.tar.gz: 9b6037a92f586e4a9570ae73c99f6c8fdaff7775cc39fe45e44698d41668adaa
+  metadata.gz: '013876e9eaa68bd87570e052b14006ac79fd316ddaf0cf71173b8db024ea271e'
+  data.tar.gz: 24c018d6b548cd9d2acd1b6f7b179976862cd01dcf7e8b136fb3f4ef19bcaa74
 SHA512:
-  metadata.gz: 369c9541a691d5a61017199cefdf8cf02d897991bf96d1883bae59853146b2500c0b7dd4d3c778ffe2940e875338de56145f7eb993417298227e8b04339135db
-  data.tar.gz: c58c29b507c07a93c0ab9011aa2c5c8fbd390bc179687ee655cfcc68e53985889d0bd4f0e7262639ee3e04a5a4fe415a10007aeb659eebac9e8c2ea94da4c229
+  metadata.gz: c2b4774d72b7b64c6c5cafef67159fd3abb4b1f3d10d3d3c3d51950a12e27776ab216cc62216c4cf190d1718f7a7dabf20fd80db35e4ea01a53306d6331bafe9
+  data.tar.gz: 8bcced7536d8495664de2e5ed33da09f980934ae08b3a5bc867383c7edf768334c4bc3192ad1b7d8ccf628b662d5fa6c1342d04ab7844fabb66a160f86e9cce8

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 1.10.0 [unreleased]
 
+### Features
+ 1. [#59](https://github.com/influxdata/influxdb-client-ruby/pull/59): CSV parser is able to parse export from UI
+
 ## 1.9.0 [2020-10-30]
 
 ### Features

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

data/test/influxdb/flux_csv_parser_test.rb

@@ -424,4 +424,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre.1373
+  version: 1.10.0.pre.1408
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler