influxdb-lineprotocol-parser 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e433f4f34e310f1886a551df2e5673f8f3ca4831f786cb22bb490b31740dc5
-  data.tar.gz: 5fd20ecf8b09f2fa682fff68dad78fdecd6c47c87f9cbe0d887ba57d4978565b
+  metadata.gz: e956120bd53a5f395ccc4fc687eb9a629a515930adbd3e87cdbd56baab31873a
+  data.tar.gz: 1d5dbe0f72cc134f389e4d0e09c6e969caf597218167d360042bad9ef0331061
 SHA512:
-  metadata.gz: e0273635beaf425e9d284219ac2e513bb3bc467fd10f65e6e9600e368743bfa26ac5e22edba50a50778e20313355dd3a1c79b9ecc6e89b8157626c3db3efe627
-  data.tar.gz: c8e24fde968761c85a6eecaa6d6a51bde1976a950b167bed45b53636e70644d5a18f9394bf857473d813df9bfa7915bd2f62a00d8e4f8257ec1173ce32b453cf
+  metadata.gz: cd0b6ef6ceb0dd5cc242e664f05dd4396a6b24f099315b2e57a2c97e3e71140ef9ccb10e603350c8c352737e0f426085b1f0d2b2768d99a8919e5d633e2123a9
+  data.tar.gz: ee0f7800da3759015a52d35e384cf13e7d88a0be34109cdbd2f569430a6204334724f10a06c1751b03122acdd57ae0b59374e7425c53c739135642e865d2bde9

data/lib/influxdb/lineprotocol/parser.rb

@@ -27,16 +27,20 @@ module InfluxDB
     # Line Protocol parser.
     #
     class Parser
-      def initialize(logger: nil, log_level: :warn, escapes: nil)
-        @log = logger || ::Logger.new(STDERR)
-        @log.level = log_level
+      def initialize(logger: nil, escapes: nil)
+        if logger
+          @log = logger
+        else
+          @log = ::Logger.new(STDERR)
+          @log.level = :warn
+        end
         case escapes
         when :compat
           @unescapes = InfluxDB::LineProtocol::CompatUnescapes.new
         else
           @unescapes = InfluxDB::LineProtocol::Unescapes.new
         end
-        enter_initial
+        enter_whitespace0
       end
 
       ##
@@ -64,7 +68,7 @@ module InfluxDB
             else
               points << @point
             end
-            enter_initial
+            enter_whitespace0
           end
         end
 
@@ -73,9 +77,9 @@ module InfluxDB
 
       private
 
-      def enter_initial
+      def enter_whitespace0
         @point = nil
-        @state = :initial
+        @state = :whitespace0
         @escaped = false
         @buf = nil
         @key = nil
@@ -114,7 +118,7 @@ module InfluxDB
 
 
 
-      def initial(buf, i, len)
+      def whitespace0(buf, i, len)
         # whitespace consumes TAB, SPACE, and NULL.
         # This method consumes NEWLINE, HASH, and COMMA.
         # BACKSLASH and EQUAL (of the special bytes) are valid measurement starts; they are not consumed.
@@ -123,7 +127,7 @@ module InfluxDB
         when nil # just whitespace
           len
         when COMMA
-          @log.error "initial: missing measurement"
+          @log.error "whitespace0: missing measurement"
           @state = :invalid
           i + 1
         when HASH # comment
@@ -133,7 +137,6 @@ module InfluxDB
           i + 1
         else
           # don't advance i because the byte belongs to measurement
-          @log.info "initial: start measurement at offset #{i}"
           @state = :measurement
           i
         end
@@ -162,9 +165,8 @@ module InfluxDB
               return i
             when SPACE # start of field set
               @point = {series: decode(buf, start, i-1), values: {}}
-              @state = :field_key
-              i, _ = whitespace(buf, i + 1, len)
-              return i
+              @state = :whitespace1
+              return i + 1
             else # part of measurement
               i += 1
             end
@@ -252,6 +254,21 @@ module InfluxDB
         i
       end
 
+      def whitespace1(buf, i, len)
+        i, c = whitespace(buf, i, len)
+        case c
+        when nil
+          len
+        when NEWLINE
+          @log.error("whitespace1: missing fields")
+          @state = :invalid
+          i
+        else
+          @state = :field_key
+          i
+        end
+      end
+
       def field_key(buf, i, len)
         start = i
         while i < len
@@ -340,7 +357,7 @@ module InfluxDB
               value = decode(buf, start, i-1)
               if value.nil?
                 @log.error("field value boolean: invalid boolean")
-                enter_initial
+                enter_whitespace0
                 return i + 1
               end
               @point[:values][@key] = value
@@ -356,8 +373,7 @@ module InfluxDB
               end
               @point[:values][@key] = value
               @key = nil
-              @state = :timestamp
-              i, _ = whitespace(buf, i + 1, len)
+              @state = :whitespace2
               return i
             else
               i += 1
@@ -414,8 +430,7 @@ module InfluxDB
               end
               @point[:values][@key] = value
               @key = nil
-              @state = :timestamp
-              i, _ = whitespace(buf, i + 1, len)
+              @state = :whitespace2
               return i
             else
               i += 1
@@ -475,8 +490,7 @@ module InfluxDB
             @state = :complete
             i + 1
           when SPACE
-            @state = :timestamp
-            i, _ = whitespace(buf, i, len)
+            @state = :whitespace2
             i
           else
             @state = :invalid
@@ -487,6 +501,21 @@ module InfluxDB
         end
       end
 
+      def whitespace2(buf, i, len)
+        i, c = whitespace(buf, i, len)
+        case c
+        when nil
+          len
+        when NEWLINE
+          @log.error("whitespace2: missing timestamp")
+          @state = :invalid
+          i
+        else
+          @state = :timestamp
+          i
+        end
+      end
+
       def timestamp(buf, i, len)
         start = i
         while i < len
@@ -508,7 +537,6 @@ module InfluxDB
                 return i
               end
               @point[:timestamp] = value
-              @key = nil
               @state = :complete
               return i + 1
             else
@@ -525,7 +553,7 @@ module InfluxDB
       def comment(buf, i, len)
         i = line_end(buf, i, len)
         if i < len
-          enter_initial
+          enter_whitespace0
           i += 1
         end
         i
@@ -534,7 +562,7 @@ module InfluxDB
       def invalid(buf, i, len)
         i = line_end(buf, i, len)
         if i < len
-          enter_initial
+          enter_whitespace0
           i += 1
         end
         i
@@ -581,11 +609,11 @@ module InfluxDB
         when :measurement
           @unescapes.unescape(:measurement, str)
         when :tag_key
-          str
+          @unescapes.unescape(:tag_key, str)
         when :tag_value
-          str
+          @unescapes.unescape(:tag_value, str)
         when :field_key
-          str
+          @unescapes.unescape(:field_key, str)
         when :field_value_boolean
           case str
           when 't', 'T', 'true', 'True'
@@ -598,7 +626,7 @@ module InfluxDB
           end
         when :field_value_numeric
           case str
-          when /^[+-]?[0-9]*\.[0-9]*([eE][+-]?[0-9]+)?$/
+          when /^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/
             str.to_f
           when /^[+-]?[0-9]+[ui]$/
             str.to_i
@@ -607,7 +635,7 @@ module InfluxDB
             nil
           end
         when :field_value_string
-          str
+          @unescapes.unescape(:string, str)
         when :timestamp
           case str
           when /^-?[0-9]+$/
@@ -639,27 +667,49 @@ module InfluxDB
     end # Parser
 
     class CompatUnescapes
-      def unescape(field, value)
+      def unescape(field, str)
         case field
         when :measurement
-          value.gsub(/\\([, ])/, '\\1')
-          # escaped comma anywhere
-          # escaped space anywhere
+          # escaped comma or space anywhere
+          str.gsub(/\\([, ])/, '\\1')
+        when :tag_key, :tag_value, :field_key
+          # escaped comma, equals, or space anywhere
+          str.gsub(/\\([,= ])/, '\\1')
+        when :string
+          # escaped quote anywhere
+          str.gsub(/\\"/, '"')
         end
       end
     end
 
     class Unescapes
-      def unescape(field, value)
+      def unescape(field, str)
         case field
         when :measurement
           # 1. escaped hash, null, or tab at the beginning
           # 2. escaped comma, space, or newline anywhere
           # 3. escaped backslash at the end
-          value
+          str
               .sub(/^\\([#\0\t])/, '\\1')
               .gsub(/\\([, \n])/, '\\1')
               .sub(/\\\\$/, '\\')
+        when :tag_key, :tag_value
+          # 1. escaped comma, equals, newline, or space anywhere
+          # 2. escaped backslash at the end
+          str
+              .gsub(/\\([,=\n ])/, '\\1')
+              .sub(/\\\\$/, '\\')
+        when :field_key
+          # 1. escaped null or tab at beginning
+          # 2. escaped comma, equals, newline, or space anywhere
+          # 3. escaped backslash at the end
+          str
+              .sub(/^\\([\0\t])/, '\\1')
+              .gsub(/\\([,=\n ])/, '\\1')
+              .sub(/\\\\$/, '\\')
+        when :string
+          # escaped quote anywhere
+          str.gsub(/\\"/, '"')
         end
       end
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-lineprotocol-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mikko Värri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies: []
-description: 'Streaming parser for InfluxDB line protocol.
+description: 'Incremental (a.k.a streaming) parser for InfluxDB Line Protocol.
 
   '
 email: mikko@varri.fi
@@ -43,5 +43,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: InfluxDB line protocol parser
+summary: InfluxDB Line Protocol parser
 test_files: []