flydata 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83cb9df24d4fe0b983b20bfd30d1798aa4cbecdd
-  data.tar.gz: a00a24a84acf688553503bf97b156acdd57fc8ab
+  metadata.gz: 281fa8038b28cccba7e12b76d72a5bab7af9d10b
+  data.tar.gz: 78895abe8bc0f92c7835ec9b0f7093e727a8b71f
 SHA512:
-  metadata.gz: 335e28547f000af29cf5df8d7a28632fe8fa5356298016f80819622c2a8299ae8469aa46a4e2ec8aa6179c472d151ea90583da1a7ab5f9367aec7668200c9ebc
-  data.tar.gz: 78049be459795e1eccb4b486c55e74989b8f2fae7cce9e5a8ce79236a12ad54d990550b30e71f9027e3ff299598d9f586a63fff8911ae159c6c0935f95e2bfeb
+  metadata.gz: d87649be6f3f5480fd1529e71a879c8b556f8a9d01aba06117d4a305883ae2734ca94e26d586d281af4aeda8bc2ac14e34e9064c1093bcae4a634559ddceebaf
+  data.tar.gz: bdba9b5af4a27d8129d2b8a7ff454de83daa2f6c09219a6a2d8bca09766fc86f473cd773a8575b2a52f65d3a23f6b27cbec057cb59ad3b454f5037c106be7ce4

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.4.1 ruby lib
+# stub: flydata 0.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2015-06-19"
+  s.date = "2015-06-23"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/fluent-plugins/mysql/truncate_table_query_handler.rb

@@ -3,7 +3,7 @@ require 'flydata/fluent-plugins/mysql/ddl_query_handler'
 
 module Mysql
   class TruncateTableQueryHandler < DdlQueryHandler
-    PATTERN = /^TRUNCATE TABLE/i
+    PATTERN = /^TRUNCATE/i
 
     def initialize(context)
       super

data/spec/flydata/fluent-plugins/mysql/binlog_query_dispatcher_spec.rb

@@ -51,12 +51,12 @@ EOT
     end
     let(:alter_query_handler) do
       r = double('alter_query_handler')
-      allow(r).to receive(:pattern).and_return(/^ALTER TABLE/i)
+      allow(r).to receive(:pattern).and_return(Mysql::AlterTableQueryHandler::PATTERN)
       r
     end
     let(:truncate_query_handler) do
       r = double('truncate_query_handler')
-      allow(r).to receive(:pattern).and_return(/^TRUNCATE TABLE/i)
+      allow(r).to receive(:pattern).and_return(Mysql::TruncateTableQueryHandler::PATTERN)
       r
     end
     let(:context) { double('context') }
@@ -201,36 +201,48 @@ EOS
       context "truncate table queries" do
         let(:correct_query_handler) { truncate_query_handler }
 
-        context "simple truncate query" do
-          let(:query) { <<EOS.gsub(/\n$/, '') }
-TRUNCATE table  users;
+        shared_examples "truncate table tests" do
+          context "simple truncate query" do
+            let(:query) { <<EOS.gsub(/\n$/, '') }
+TRUNCATE#{opt_table}  users;
 EOS
-          let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
-TRUNCATE table users;
+            let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+TRUNCATE#{opt_table} users;
 EOS
 
-          it_behaves_like "a dispatcher that calls query handler with correct query"
-        end
-        context "truncate query with dbname and table name and a comment in the beginning" do
-          let(:query) { <<EOS.gsub(/\n$/, '') }
+            it_behaves_like "a dispatcher that calls query handler with correct query"
+          end
+          context "truncate query with dbname and table name and a comment in the beginning" do
+            let(:query) { <<EOS.gsub(/\n$/, '') }
 # I am going to truncate this table
-truncate table flydata_sync.users;
+truncate#{opt_table} flydata_sync.users;
 EOS
-          let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
-truncate table flydata_sync.users;
+            let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+truncate#{opt_table} flydata_sync.users;
 EOS
 
-          it_behaves_like "a dispatcher that calls query handler with correct query"
-        end
-        context "truncate query with quoted dbname and table name with comments on the same line" do
-          let(:query) { <<EOS.gsub(/\n$/, '') }
-truncate table `flydata_sync`.`users`; /* 無国籍 */ -- 'SJIS is トラブルメーカー'
+            it_behaves_like "a dispatcher that calls query handler with correct query"
+          end
+          context "truncate query with quoted dbname and table name with comments on the same line" do
+            let(:query) { <<EOS.gsub(/\n$/, '') }
+truncate#{opt_table} `flydata_sync`.`users`; /* 無国籍 */ -- 'SJIS is トラブルメーカー'
 EOS
-          let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
-truncate table `flydata_sync`.`users`;
+            let(:normalized_query) { <<EOS.gsub(/\n$/, '') }
+truncate#{opt_table} `flydata_sync`.`users`;
 EOS
 
-          it_behaves_like "a dispatcher that calls query handler with correct query"
+            it_behaves_like "a dispatcher that calls query handler with correct query"
+          end
+        end
+
+        context "with table key word" do
+          let(:opt_table) { " table" }
+          include_examples "truncate table tests"
+        end
+
+        context "without table key word" do
+          let(:opt_table) { "" }
+          include_examples "truncate table tests"
         end
       end
     end

data/spec/flydata/fluent-plugins/mysql/ddl_query_handler_spec.rb

@@ -27,24 +27,34 @@ EOS
           expect(subject.table_info(record)).to eq({db_name: "testdb2", table_name: "testtable2"})
         end
       end
-      context "truncate table query with no db name" do
-        let(:normalized_query) { "TRUNCATE TABLE apps ;" }
-        it do
-          expect(subject.table_info(record)).to eq({db_name: "testdb", table_name: "apps"})
+      shared_examples "truncate table queries" do
+        context "truncate table query with no db name" do
+          let(:normalized_query) { "TRUNCATE#{opt_table} apps ;" }
+          it do
+            expect(subject.table_info(record)).to eq({db_name: "testdb", table_name: "apps"})
+          end
         end
-      end
-      context "truncate table query with db name" do
-        let(:normalized_query) { "truncate table `testdb1`.`apps1`;" }
-        it do
-          expect(subject.table_info(record)).to eq({db_name: "testdb1", table_name: "apps1"})
+        context "truncate table query with db name" do
+          let(:normalized_query) { "truncate#{opt_table} `testdb1`.`apps1`;" }
+          it do
+            expect(subject.table_info(record)).to eq({db_name: "testdb1", table_name: "apps1"})
+          end
         end
-      end
-      context "truncate table query with quoted db name" do
-        let(:normalized_query) { "truncate table testdb2.apps2;" }
-        it do
-          expect(subject.table_info(record)).to eq({db_name: "testdb2", table_name: "apps2"})
+        context "truncate table query with quoted db name" do
+          let(:normalized_query) { "truncate#{opt_table} testdb2.apps2;" }
+          it do
+            expect(subject.table_info(record)).to eq({db_name: "testdb2", table_name: "apps2"})
+          end
         end
       end
+      context "truncate table query with table key word" do
+        let(:opt_table) { " TABLE" }
+        include_examples "truncate table queries"
+      end
+      context "truncate table query without table key word" do
+        let(:opt_table) { "" }
+        include_examples "truncate table queries"
+      end
       context "query does not match DDL_TABLE_QUERY" do #This should not happen, ideally
         let(:normalized_query) { "CREATE TRIGGER mytrigger BEFORE INSERT ON TABLE_1 FOR EACH ROW SET NEW.MY_DATETIME_COLUMN = NOW();" }
         it do

data/spec/flydata/fluent-plugins/mysql/truncate_query_handler_spec.rb

@@ -7,36 +7,71 @@ module Mysql
     include_context "query handler context"
 
     describe '#process' do
-      let(:truncate_query) { "TRUNCATE TABLE foo" }
-      let(:expected_record) do
-        {
-          table_name: table,
-          query: truncate_query,
-          type: :truncate_table,
-          respect_order: true,
-          src_pos: "#{current_binlog_file}\t#{next_position - event_length}",
-          table_rev: table_rev,
-          seq: seq,
-          v: flydata_record_version
-        }
-      end
+      let(:truncate_query) { "TRUNCATE table foo" }
+
       before do
         allow(record).to receive(:[]).with("query").and_return(truncate_query)
         allow(record).to receive(:[]).with("normalized_query").and_return(truncate_query)
       end
-      context "for a non append only table" do
-        it "should call Fluent's emit with appropriate params" do
-          expect(Fluent::Engine).to receive(:emit).with(tag, timestamp, expected_record)
-          expect(subject.process(record))
+
+      shared_examples "process truncate queries correctly" do
+        let(:expected_record) do
+          {
+            table_name: table,
+            query: truncate_query,
+            type: :truncate_table,
+            respect_order: true,
+            src_pos: "#{current_binlog_file}\t#{next_position - event_length}",
+            table_rev: table_rev,
+            seq: seq,
+            v: flydata_record_version
+          }
         end
-      end
-      context "for an append only table" do
-        before do
-          allow(context).to receive(:omit_events).and_return({ table => [:delete, :truncate_table] })
+
+        context "for a non append only table" do
+          it "should call Fluent's emit with appropriate params" do
+            expect(Fluent::Engine).to receive(:emit).with(tag, timestamp, expected_record)
+            expect(subject.process(record))
+          end
+        end
+        context "for an append only table" do
+          before do
+            allow(context).to receive(:omit_events).and_return({ table => [:delete, :truncate_table] })
+          end
+          it "should not call Fluent's emit" do
+            expect(Fluent::Engine).to receive(:emit).never
+            expect(subject.process(record))
+          end
         end
+      end
+
+      shared_examples "skip processing queries" do
         it "should not call Fluent's emit" do
           expect(Fluent::Engine).to receive(:emit).never
-          expect(subject.process(record))
+          subject.process(record)
+        end
+      end
+
+      context "truncate queries with table keyword" do
+        let(:truncate_query) { "TRUNCATE table foo" }
+        include_examples "process truncate queries correctly"
+      end
+      context "truncate queries without table keyword" do
+        let(:truncate_query) { "TRUNCATE foo" }
+        include_examples "process truncate queries correctly"
+      end
+      context "truncate queries with db name" do
+        let(:table) { "var" }
+        let(:database) { "testdb" }
+
+        context 'when db exists' do
+          let(:truncate_query) { "TRUNCATE #{database}.#{table}" }
+          include_examples "process truncate queries correctly"
+        end
+
+        context 'when db doesn not exists' do
+          let(:truncate_query) { "TRUNCATE dummydb.#{table}" }
+          include_examples "skip processing queries"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client