ecco 0.6.0-java → 0.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e64a7e2957edb9c0e4ead0c0d3b3d7902c8d702f
-  data.tar.gz: 5256c067fd8cbb66da6f9986e8997137d381d34c
+  metadata.gz: 260dad691405d73f74f910b80431b25be925107d
+  data.tar.gz: f8fde912519a3b5f1c4bed8ad26adc9fa3481da0
 SHA512:
-  metadata.gz: c4c4f317f333fb97d499ceb30eaa2830fed76b7acaee63931ccc9d0ce5afc78427a92248547df4d4efbaa8af7348cad6cbe4a44a9e4b7a20f535a0fa7bbbe497
-  data.tar.gz: f6b0642858fef51f6e99df17a84906a11657857c0aedbf099e466d878ec27234ff8b7f73aaefd3ab6382e2025ecae0af3bdab8915bfc3616716228b91b50039a
+  metadata.gz: d22d6e6c108327f0b2de31bbaf65440ac8e8713ca1fa3e014fee4a0bb1e87a10e2f6748c2e2490a82781df28c9e814cc69d8c2fb61c90cbabcb25ac1b088fbb8
+  data.tar.gz: 35de29b97a50af44a2a5a63d6e8f6820e22612808503496a8904a33ac94f9859c75bba0abf17f9a587490d98d5e0918f39c30a9db38cc8776cc327946813b65a

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .env
 .vagrant
+*.retry

data/.travis.yml

@@ -1,23 +1,35 @@
 sudo: true
 
+dist: trusty
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
+    - haveged # Extra entropy
+
 language: ruby
 
+rvm:
+  - jruby-9.0.5.0
+
 services:
   - mysql
 
 before_install:
-  - rvm get head
-  - rvm use jruby-9.0.3.0 --install
+  - sudo service haveged start # Extra entropy too ensure quick start time for JRuby
   - printf "[mysqld]\nlog-bin=mysql-bin\nserver-id=1\nbinlog-format=ROW\n" | sudo tee /etc/mysql/conf.d/binlog.cnf
   - sudo service mysql restart
   - mysql -u root -e 'create database ecco_test;'
-  - gem install bundler -v 1.10.6
+  - gem install bundler
 
 env:
   global:
     - DATABASE_USER=root
     - DATABASE_PASS=""
     - DATABASE_URL=jdbc:mysql://localhost:3306/ecco_test
+    - JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false'
 
 script: bin/all_specs
 

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/twingly/ecco.svg?branch=master)](https://travis-ci.org/twingly/ecco)
 
-MySQL replication binlog parser using [mysql-binlog-connector-java].
+MySQL (version 5.5 and 5.6) replication binlog parser using [mysql-binlog-connector-java].
 
 ## Installation
 

data/Rakefile

@@ -1,11 +1,13 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+desc "Run non-integration specs"
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.exclude_pattern = "spec/integration/*_spec.rb"
 end
 
 namespace :spec do
+  desc "Run all specs (including integration)"
   RSpec::Core::RakeTask.new(:all)
 end
 

data/Vagrantfile

@@ -7,5 +7,8 @@ Vagrant.configure("2") do |config|
     end
 
     ubuntu.vm.network :forwarded_port, host: 3306, guest: 3306
+    ubuntu.vm.provider "virtualbox" do |vbox|
+      vbox.memory = 1024
+    end
   end
 end

data/lib/ecco/row_event_listener.rb

@@ -3,11 +3,12 @@ require "ecco/row_event"
 
 module Ecco
   class RowEventListener < EventListener
-    ROW_EVENTS = [
-      EventType::WRITE_ROWS,
-      EventType::UPDATE_ROWS,
-      EventType::DELETE_ROWS,
-    ]
+    # MySQL v1 and v2 row events
+    WRITE_EVENTS  = [EventType::WRITE_ROWS,  EventType::EXT_WRITE_ROWS]
+    UPDATE_EVENTS = [EventType::UPDATE_ROWS, EventType::EXT_UPDATE_ROWS]
+    DELETE_EVENTS = [EventType::DELETE_ROWS, EventType::EXT_DELETE_ROWS]
+
+    ROW_EVENTS  = WRITE_EVENTS + UPDATE_EVENTS + DELETE_EVENTS
 
     def table_event
       EventType::TABLE_MAP
@@ -26,9 +27,9 @@ module Ecco
         @table_map_event = event
       when *accepted_events
         row_event          = Ecco::RowEvent.new
-        row_event.type     = type.to_s
         row_event.table_id = data.get_table_id
         row_event.rows     = data.rows
+        row_event.type     = row_type_to_string(type)
 
         if @table_map_event
           table_event_data = @table_map_event.get_data
@@ -40,5 +41,17 @@ module Ecco
         @callback.call(row_event)
       end
     end
+
+    private
+
+    def row_type_to_string(type)
+      if WRITE_EVENTS.include?(type)
+        "WRITE_ROWS"
+      elsif UPDATE_EVENTS.include?(type)
+        "UPDATE_ROWS"
+      elsif DELETE_EVENTS.include?(type)
+        "DELETE_ROWS"
+      end
+    end
   end
 end

data/lib/ecco/save_event_listener.rb

@@ -6,8 +6,11 @@ module Ecco
       EventType::QUERY,
       EventType::ROTATE,
       EventType::WRITE_ROWS,
+      EventType::EXT_WRITE_ROWS,
       EventType::UPDATE_ROWS,
+      EventType::EXT_UPDATE_ROWS,
       EventType::DELETE_ROWS,
+      EventType::EXT_DELETE_ROWS,
     ]
 
     def accepted_events

data/lib/ecco/version.rb

@@ -1,4 +1,4 @@
 module Ecco
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
   MYSQL_BINLOG_CONNECTOR_VERSION = "0.2.4"
 end

data/vagrant/playbook.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  sudo: yes
+  become: yes
   tasks:
 
   - name: Update package cache
@@ -12,7 +12,7 @@
       - python-mysqldb
 
   - name: Install mysql server
-    apt: name=mysql-server state=present
+    apt: name=mysql-server-5.6 state=present
 
   - name: Copy mysql config file
     copy: src=files/ecco-my.cnf dest=/etc/mysql/conf.d/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecco
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: java
 authors:
 - Twingly AB
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement