myslog 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80788f037295ef11c3170012ebc5b2796190bb71
-  data.tar.gz: c89207a4068ada4490f8973ca7026d398b8bb9ec
+  metadata.gz: 01ae65979b5ba26faf80d43e15c9a0f8178e0f61
+  data.tar.gz: 8e4c38a14bf1fdd953ee165423e5fea39395fed0
 SHA512:
-  metadata.gz: 5c6800cf04a879821b1fcab7f2d0d244f2230fff976b599426734893c0f316c3d3c0fbe62bad227f8ede031736b74e99ee775dfa273371bd465f9db06a080dac
-  data.tar.gz: 91ada3731ba6290a078a1768c2127274f700681490030697b335228f2c13bfd83fef58f15206ffe9484052cc3db09205a36b1defa657c483f495fd0f0b31b086
+  metadata.gz: 781f661946cde324e8ae78e5ee30aaed434478d07344b3abe699fc6993d5b18e1d93e1685b88f0026c0e3be97438bddb063c8562361474c2e4b048b2d330e4aa
+  data.tar.gz: 8d4965c1611b43bbc04a1d911da3d0e2ae6a978bf621e80c057cd2add85ebd0b9ba00693071c452ef8919a94537e8505a61ffb728a00749f097831c3b6f68c62

data/.travis.yml

@@ -1,3 +1,5 @@
+before_install:
+- gem update bundler
 language: ruby
 rvm:
 - 1.9.3

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.1.0
+
+- [#11] Support MySQL 5.7

data/lib/myslog.rb

@@ -52,6 +52,8 @@ class MySlog
         elems = record[2..-1].strip().split " "
         if elems.size == 3 && elems[0] == "Time:"
           response[:date] = Time.parse(elems[1]+" "+elems[2])
+        elsif elems.size == 2 && elems[0] == "Time:"
+          response[:date] = Time.parse(elems[1][0..9]+" "+elems[1][11..18])
         else
           elems.each_with_index do |elem,i|
             if elem.include?(":") && !elems[i+1].include?(":")

data/myslog.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.name          = "myslog"
-  spec.version       = "0.0.11"
+  spec.version       = "0.1.0"
   spec.authors       = ["taka84u9"]
   spec.email         = ["taka84u9@gmail.com"]
   spec.summary       = "MySQL slow query parser."
   spec.description   = "MySQL slow query parser."
-  spec.homepage      = "https://github.com/taka84u9/myslog"
+  spec.homepage      = "https://github.com/yuku-t/myslog"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]

data/spec/myslog_spec.rb

@@ -41,6 +41,18 @@ use webtie;
           tm.to_id = 21259 and
           tm.to_group = 'retard_user' and
           tms.description = 'new';
+# Time: 2016-01-29T05:45:46.299805Z
+# User@Host: root[root] @ localhost []  Id:     2
+# Query_time: 1.000537  Lock_time: 0.000000 Rows_sent: 1  Rows_examined: 0
+SET timestamp=1455094924;
+select sleep(1);
+# Time: 2016-02-10T18:02:16.411200+09:00
+# User@Host: root[root] @ localhost []  Id:     2
+# Query_time: 2.000361  Lock_time: 0.000000 Rows_sent: 1  Rows_examined: 0
+use mysql;
+SET timestamp=1455094936;
+select
+sleep(2);
     EOF
   end
 
@@ -97,6 +109,19 @@ use webtie;
       expect(record[0]).to eq(
           "# Time: 010626 10:44:51"
       )
+
+      record = results[4]
+      expect(record.size).to eq(4)
+      expect(record[0]).to eq(
+          "# Time: 2016-01-29T05:45:46.299805Z"
+      )
+
+      record = results[5]
+      expect(record.size).to eq(4)
+      expect(record[0]).to eq(
+          "# Time: 2016-02-10T18:02:16.411200+09:00"
+      )
+      
     end
   end
 
@@ -151,6 +176,76 @@ use webtie;
       end
     end
 
+    context "given full log by UTC in MySQL5.7 and later" do
+      describe "response" do
+        before :each do
+          @date = Time.at(1317619058)
+          @user = "root[root]"
+          @host = "localhost"
+          @host_ip = ""
+          @query_time = 0.000270
+          @lock_time = 0.000097
+          @rows_sent = 1
+          @rows_examined = 0
+          @sql = "SET timestamp=1317619058; SELECT * FROM life;"
+          @lines = [
+            "# Time: #{@date.strftime("%y-%m-%dT%H:%M:%S.%6N")}Z",
+            "# User@Host: #{@user} @ #{@host} [#{@host_ip}]",
+            "# Query_time: #{@query_time}  Lock_time: #{@lock_time}  Rows_sent: #{@rows_sent}  Rows_examined: #{@rows_examined}",
+            @sql
+          ]
+          @response = @myslog.parse_record(@lines)
+        end
+
+        it "should have expected values" do
+          expect(@response[:date].to_i).to     eq(@date.to_i)
+          expect(@response[:user]).to          eq(@user)
+          expect(@response[:host]).to          eq(@host)
+          expect(@response[:host_ip]).to       eq(@host_ip)
+          expect(@response[:query_time]).to    eq(@query_time)
+          expect(@response[:lock_time]).to     eq(@lock_time)
+          expect(@response[:rows_sent]).to     eq(@rows_sent)
+          expect(@response[:rows_examined]).to eq(@rows_examined)
+          expect(@response[:sql]).to           eq(@sql.strip)
+        end
+      end
+    end
+
+    context "given full log by JST in MySQL5.7 and later" do
+      describe "response" do
+        before :each do
+          @date = Time.at(1317619058)
+          @user = "root[root]"
+          @host = "localhost"
+          @host_ip = ""
+          @query_time = 0.000270
+          @lock_time = 0.000097
+          @rows_sent = 1
+          @rows_examined = 0
+          @sql = "SET timestamp=1317619058; SELECT * FROM life;"
+          @lines = [
+            "# Time: #{@date.strftime("%y-%m-%dT%H:%M:%S.%6N")}+09:00",
+            "# User@Host: #{@user} @ #{@host} [#{@host_ip}]",
+            "# Query_time: #{@query_time}  Lock_time: #{@lock_time}  Rows_sent: #{@rows_sent}  Rows_examined: #{@rows_examined}",
+            @sql
+          ]
+          @response = @myslog.parse_record(@lines)
+        end
+
+        it "should have expected values" do
+          expect(@response[:date].to_i).to     eq(@date.to_i)
+          expect(@response[:user]).to          eq(@user)
+          expect(@response[:host]).to          eq(@host)
+          expect(@response[:host_ip]).to       eq(@host_ip)
+          expect(@response[:query_time]).to    eq(@query_time)
+          expect(@response[:lock_time]).to     eq(@lock_time)
+          expect(@response[:rows_sent]).to     eq(@rows_sent)
+          expect(@response[:rows_examined]).to eq(@rows_examined)
+          expect(@response[:sql]).to           eq(@sql.strip)
+        end
+      end
+    end
+
     context "given partial log" do
       describe "response" do
         before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myslog
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - taka84u9
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - ".coverrails.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -70,7 +71,7 @@ files:
 - myslog.gemspec
 - spec/myslog_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/taka84u9/myslog
+homepage: https://github.com/yuku-t/myslog
 licenses: []
 metadata: {}
 post_install_message: 
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: MySQL slow query parser.