mysql_dump_slow 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f116ae111cbb94f437455ef3704daef1b40160d
-  data.tar.gz: 6389e35046f722c88446e8cc33dcf8bd12721387
+  metadata.gz: 5e44c57040c2a9cc336b30e839fd0c5c69fe37d4
+  data.tar.gz: 200d9f11707ca8670faa3a92daddae7cd88ccca8
 SHA512:
-  metadata.gz: 2d45533db841385baedadddb6555e683e9ce66d72204116ddd5c4cebb42c3dd3161cd69d2cae45fb0d6b230ab43e4759968bbe0156eabf5331ba0ce62c856fd0
-  data.tar.gz: bfbcfc19eb73b4d52007f2b74381430acfbbc7cdc6c9121a9db52b2c094df92ce385f8e22d9fc311791a51ea1c681e4d69221357e0f7d465f1590dcac287ef42
+  metadata.gz: e44086d502cd8d0e12ba9bf264bdf22d31b9a937eb99d48e0e04515587abceaf84c0c983a770b1e73bb1adc4cbaf5188af2c41c9dacefbe5576475aceea1fffd
+  data.tar.gz: f97b94b75c2c415e90ccdcdf45c775ad446c6afbb00ca46bc193c50ffe292bc5ff1ee875381753ff1ce36c4e3826648537db5a527cd419bc85acb5cc8201a691

data/lib/mysql_dump_slow/counter.rb

@@ -2,6 +2,8 @@ module MysqlDumpSlow
   class Counter
     attr_reader :abstract_query, :total_count, :total_query_time, :total_lock_time, :total_rows_sent, :user_hosts
 
+    TIME_BASE_SEC = Time.local(2000, 1, 1).to_i
+
     def initialize(abstract_query)
       @abstract_query = abstract_query
     end
@@ -46,12 +48,12 @@ Count: #{total_count}  Time=#{average_query_time/1000}s (#{total_query_time/1000
 
     def count_up_query_time(query_time)
       @total_query_time ||= 0
-      @total_query_time += time_to_ms(query_time)
+      @total_query_time += time_to_ms(query_time - TIME_BASE_SEC)
     end
 
     def count_up_lock_time(lock_time)
       @total_lock_time ||= 0
-      @total_lock_time += time_to_ms(lock_time)
+      @total_lock_time += time_to_ms(lock_time - TIME_BASE_SEC)
     end
 
     def count_up_rows_sent(rows_sent)
@@ -69,4 +71,3 @@ Count: #{total_count}  Time=#{average_query_time/1000}s (#{total_query_time/1000
     end
   end
 end
-

data/lib/mysql_dump_slow/sql.rb

@@ -0,0 +1,15 @@
+module MysqlDumpSlow
+  class Sql
+    def self.mask(sql)
+      sql.gsub(/\b\d+\b/, 'N')
+         .gsub(/\b0x[0-9A-Fa-f]+\b/, 'N')
+         .gsub(/''/, "'S'")
+         .gsub(/""/, '"S"')
+         .gsub(/(\\')/, '')
+         .gsub(/(\\")/, '')
+         .gsub(/'[^']+'/, "'S'")
+         .gsub(/"[^"]+"/, '"S"')
+         .gsub(/"[^"]+"/, '"S"')
+    end
+  end
+end

data/lib/mysql_dump_slow/summary.rb

@@ -13,16 +13,15 @@ module MysqlDumpSlow
       end.reverse
     end
 
-    def each
-      summary.each {|s| yield s }
+    def each(&block)
+      summary.each(&block)
     end
 
     private
 
     def summarize
-      parser = SQLParser::Parser.new
-      @logs.each do |log|
-        sql = parser.scan_str(log.sql_text).to_sql
+      @logs.find_each do |log|
+        sql = Sql.mask(log.sql_text)
         counter = summary.find{|s| s.abstract_query == sql }
         counter ||= ( summary << Counter.new(sql) ).last
         counter.count_up(log)

data/lib/mysql_dump_slow/version.rb

@@ -1,3 +1,3 @@
 module MysqlDumpSlow
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mysql_dump_slow.rb

@@ -1,6 +1,6 @@
 require "mysql_dump_slow/version"
 require "mysql_dump_slow/counter"
-require "mysql_dump_slow/masked_sql_parser"
+require "mysql_dump_slow/sql"
 require "mysql_dump_slow/summary"
 
 module MysqlDumpSlow

data/mysql_dump_slow.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sql-parser", "~> 0.0.2"
-
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mysql_dump_slow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - monochromegane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sql-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +84,7 @@ files:
 - bin/setup
 - lib/mysql_dump_slow.rb
 - lib/mysql_dump_slow/counter.rb
-- lib/mysql_dump_slow/masked_sql_parser.rb
+- lib/mysql_dump_slow/sql.rb
 - lib/mysql_dump_slow/summary.rb
 - lib/mysql_dump_slow/version.rb
 - mysql_dump_slow.gemspec

data/lib/mysql_dump_slow/masked_sql_parser.rb

@@ -1,11 +0,0 @@
-require "sql-parser"
-module SQLParser 
-  class SQLVisitor 
-    def visit_DateTime(o);         "'S'"; end
-    def visit_Date(o);             "'S'"; end
-    def visit_String(o);           "'S'"; end
-    def visit_ApproximateFloat(o);  'N';  end
-    def visit_Float(o);             'N';  end
-    def visit_Integer(o);           'N';  end
-  end
-end