proxysql_query_log-parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4966444a16781f8d1bd840ad809dcdd8f7a0252d1178769746ad0b96e7ec97d8
-  data.tar.gz: 3e7e50eb10a369739003f91b2e93b172378618707fc8678c5cd91dd898c876f1
+  metadata.gz: 92a8e1aa363f5f9ceb7939acbc2c81d279d9c68727ccba49398a067942c6f8cd
+  data.tar.gz: d8d882f082e4ad02d7d89236aec57363b72f2c9ba087d5382a4761c4464d4a48
 SHA512:
-  metadata.gz: a2fe520f18b3a260faeacf6c95a50f5274444383d3535e3a39b244ea6bc8b06e51ebdaa90297b2d170b514dc906796b391ba8933633454e1bc37d53a0ee0e644
-  data.tar.gz: 5aa401aa0ab2dbe5e009138b3a249e3da58cb190f0cf89981bced105599ba0185f3b66caaae4b341acc555d109e261e1d1cf8c91f41a03b62f96382f5d1f18a6
+  metadata.gz: cfea8ec9fd34500d72d2cdfed032a20b60595afcf16a8f3ee6927e8c59dfb737df669b454ceaa35c3257fe69187aca1c3f8fc0eac73c3f53cf83c5bd633ed1b8
+  data.tar.gz: 1f20f70b26c24d3d3dd7afd347682990ef31461b4785817a3c3d87ce026bb81f6b69d9b1a1f350c093529dc021718b494a918d24024c1ccb47bb80cf541ef685

data/lib/proxysql_query_log/parser.rb

@@ -4,6 +4,8 @@ require 'proxysql_query_log/parser/parser'
 require 'proxysql_query_log/parser/query'
 require 'proxysql_query_log/parser/version'
 
+UINT64_MAX = 18446744073709551615
+
 module ProxysqlQueryLog
 
 end

data/lib/proxysql_query_log/parser/parser.rb

@@ -9,12 +9,9 @@ module ProxysqlQueryLog
       queries = []
       
       while true
-        raw_total_bytes = io.read(1)
+        raw_total_bytes = io.read(8)
         break unless raw_total_bytes
-        total_bytes = raw_total_bytes.unpack1('C')
-        io.seek(7, IO::SEEK_CUR)
-        raw = io.read(total_bytes)
-        queries << parse(StringIO.new(raw, 'r+'))
+        queries << parse(io)
       end
       queries
     end
@@ -27,7 +24,9 @@ module ProxysqlQueryLog
         q.schema_name = parse_schema_name(io)
         q.client = parse_client(io)
         q.hid = parse_hid(io)
-        q.server = parse_server(io)
+        unless q.hid == UINT64_MAX
+          q.server = parse_server(io)
+        end
         q.start_time = parse_start_time(io)
         q.end_time = parse_end_time(io)
         q.digest = parse_digest(io)
@@ -98,12 +97,20 @@ module ProxysqlQueryLog
     end
 
     def read_encoded_length(io)
-      buf = io.read(1).unpack('C')
-      len = mysql_decode_length(buf[0])
+      buf = io.read(1).unpack1('C')
+      len = mysql_decode_length(buf)
       unless len == 0
-        buf2 = io.read(len-1).unpack('C*')
-        buf.concat(buf2)
-        return buf == 0 ? 0 : buf[0]
+        buf2 = case len
+               when 1
+                 buf
+               when 3
+                 (io.read(len-1) + ("\x00" * (9 - len))).unpack1('Q*')
+               when 4
+                 (io.read(3) + ("\x00")).unpack1('l*')
+               when 9
+                 io.read(8).unpack1('Q*')
+               end
+        return buf2
       end
     end
     

data/lib/proxysql_query_log/parser/version.rb

@@ -1,5 +1,5 @@
 module ProxysqlQueryLog
   class Parser
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxysql_query_log-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - r_takaishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler