influxdb-client 2.8.0.pre.5729 → 2.8.0.pre.6014

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b30371fb8850853e21cfafeb46e0aa054060cfe740e32c0064e3a5d6af29b67
-  data.tar.gz: 19c9bfeaeb7c61dfded00dd2eaa293e25a4384528b507c130b453c8d315d5241
+  metadata.gz: 630a979d3ca39c4a90ac470965c6700124ee996de1923e5176225b8370024a40
+  data.tar.gz: 4160657f219e8c69a1dc1dd0b72769039807543a6c324195d4d559aa058b2bc6
 SHA512:
-  metadata.gz: f1a7a5374c3a722f8cffae085cf92438f198cb0c6747eca069d066a6c5e7f9d6bbe0c875a9bfe6de0e9855bf063728f1707d0ecbe1cc270682cf974272d68772
-  data.tar.gz: '05971d819ada2ff62de2bf77f023048256d00d16bd157d2839ae893c2625be4e94f82859599347b02a2d164a971ed7858c9fb44c47410af63f81e68af014c877'
+  metadata.gz: 6eb28fb15cbd64fddd0380558517b0c593aa6a5824611554586c3973e728e83f4dc11fe68d2e5e69fd86dbba0d347b25c9ec60f7adef9fb03f92e03df547167d
+  data.tar.gz: 5568e0d31e6d3dcbcef095291382628df4f9dfd189a28184a21dac42f225442ce03844ee8705c32db9e495bcdf78635f66cf758c2fd8432d5a15da0d3f4541f4

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 2.8.0 [unreleased]
 
+### Features
+1. [#118](https://github.com/influxdata/influxdb-client-ruby/pull/118): Added `FluxRecord.row` which stores response data in a array
+
 ## 2.7.0 [2022-07-29]
 
 ### Features

data/lib/influxdb2/client/flux_csv_parser.rb

@@ -125,8 +125,8 @@ module InfluxDB2
       token = csv[0]
 
       # start new table
-      if ((ANNOTATIONS.include? token) && !@start_new_table) ||
-         (@response_mode == InfluxDB2::FluxResponseMode::ONLY_NAMES && @table.nil?)
+      if ((ANNOTATIONS.include? token) && !@start_new_table) || (@response_mode ==
+        InfluxDB2::FluxResponseMode::ONLY_NAMES && @table.nil?)
 
         # Return already parsed DataFrame
         @start_new_table = true
@@ -187,6 +187,12 @@ module InfluxDB2
         column.label = csv[i]
         i += 1
       end
+
+      duplicates = table.columns.group_by { :label }.select { |_k, v| v.size > 1 }
+
+      warning = "The response contains columns with duplicated names: #{duplicates.keys.join(', ')}
+You should use the 'FluxRecord.row to access your data instead of 'FluxRecord.values' hash."
+      puts warning unless duplicates.empty?
     end
 
     def _parse_values(csv)
@@ -234,7 +240,9 @@ module InfluxDB2
       table.columns.each do |flux_column|
         column_name = flux_column.label
         str_val = csv[flux_column.index + 1]
-        record.values[column_name] = _to_value(str_val, flux_column)
+        value = _to_value(str_val, flux_column)
+        record.values[column_name] = value
+        record.row.push(value)
       end
 
       record

data/lib/influxdb2/client/flux_table.rb

@@ -26,6 +26,7 @@ module InfluxDB2
       @columns = []
       @records = []
     end
+
     attr_reader :columns, :records
 
     # A table's group key is subset of the entire columns dataset that assigned to the table.
@@ -46,11 +47,14 @@ module InfluxDB2
   class FluxRecord
     # @param [Integer] table the index of table which contains the record
     # @param [Hash] values tuple of values
-    def initialize(table, values: nil)
+    # @param [Array] row record columns
+    def initialize(table, values: nil, row: nil)
       @table = table
       @values = values || {}
+      @row = row || []
     end
-    attr_reader :table, :values
+
+    attr_reader :table, :values, :row
     attr_writer :table
 
     # @return [Time] the inclusive lower time bound of all records
@@ -93,6 +97,7 @@ module InfluxDB2
       @group = group
       @default_value = default_value
     end
+
     attr_reader :index, :label, :data_type, :group, :default_value
     attr_writer :index, :label, :data_type, :group, :default_value
   end

data/test/influxdb/flux_csv_parser_test.rb

@@ -506,4 +506,24 @@ class FluxCsvParserErrorTest < MiniTest::Test
     assert_equal '11', tables[0].records[0].values['value1']
     assert_equal 'west', tables[0].records[0].values['region']
   end
+
+  def test_parse_duplicate_column_names
+    data = '#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double
+#group,false,false,true,true,false,true,true,false
+#default,_result,,,,,,,
+ ,result,table,_start,_stop,_time,_measurement,location,result
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:33.746Z,my_measurement,Prague,25.3
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:39.299Z,my_measurement,Prague,25.3
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:40.454Z,my_measurement,Prague,25.3'
+
+    tables = InfluxDB2::FluxCsvParser.new(data, stream: false, response_mode: InfluxDB2::FluxResponseMode::ONLY_NAMES)
+                                     .parse
+                                     .tables
+    assert_equal 1, tables.size
+    assert_equal 8, tables[0].columns.size
+    assert_equal 3, tables[0].records.size
+    assert_equal 7, tables[0].records[0].values.size
+    assert_equal 8, tables[0].records[0].row.size
+    assert_equal 25.3, tables[0].records[0].row[7]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 2.8.0.pre.5729
+  version: 2.8.0.pre.6014
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler