ecco 0.8.0-java → 1.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0f1adf6e5a97d969a6acf43b3ec6d083e7975e3e60f4684e46b672453dd7e1
-  data.tar.gz: de78c5aba80a3ff667d63408721723737e5ae731124c55f413b2c5f0fdb15f4c
+  metadata.gz: bcc0014afbb807fd4af02e4d2d28df3db7dabbc13b40aebca03902d1bb9ae2e4
+  data.tar.gz: 9985341f1e8b0d2f9c2c28825181463dcf19f87fa79cb6e66510ba040774a28d
 SHA512:
-  metadata.gz: 1ee74c54f9ab18d42046b00e7e6e48b7de8c761482a1a5840945ff77bdd3c618ed81721987a6873f76d99dc99835a373c872e8eeba68ed480995a898b6c250e8
-  data.tar.gz: 56a14190b670b5a8e02cd1d200f9aab042c3a471287c07a0f80372230a068d90de7c5e80c108f062fe918f8ccf4d383cc48a00edc3d0da474d924424c5d0d0dc
+  metadata.gz: b488e13f695d9d3f41ae1ee28b8d0630506130f66d8b992058c067a51f82a70d6528201c5c53889dbcede9b9b8e8216e953e846f7a15a7f1d279876e8f7ac2da
+  data.tar.gz: 950e8a354dfc1f2bbd72a638cc18a823d52f51c310a20e186df8b87ff192652e03349be27a91f9b3a9c8acc3bd337ffbb445ce303b01a259ba811f732b8ee233

data/.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    env:
+      JRUBY_OPTS: '-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -Xcompile.invokedynamic=false'
+      JAVA_OPTS: ${{ matrix.java_opts }}
+
+    runs-on: ubuntu-18.04
+
+    strategy:
+      matrix:
+        include:
+        - mysql: 5-7
+          java_opts: '-Djava.security.properties=docker/ecco-java.security' # Enable TLS 1.1, required by MySQL 5.7
+        - mysql: 8-0
+          java_opts: ''
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Start MySQL container
+      run: docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-${{ matrix.mysql }}.yml up -d
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: jruby-9.2.18.0
+        bundler-cache: true
+
+    - name: Run tests
+      run: bin/all_specs

data/CHANGELOG.md

@@ -1,6 +1,42 @@
-# Change Log
+# Changelog
+
+## [v0.8.0](https://github.com/twingly/ecco/tree/v0.8.0) (2020-10-23)
+
+[Full Changelog](https://github.com/twingly/ecco/compare/v0.7.0...v0.8.0)
+
+**Implemented enhancements:**
+
+- Drop MySQL 5.5 support [\#45](https://github.com/twingly/ecco/issues/45)
+- Update Vagrant box to ubuntu/bionic64 [\#39](https://github.com/twingly/ecco/issues/39)
+
+**Closed issues:**
+
+- Update mysql-binlog-connector [\#18](https://github.com/twingly/ecco/issues/18)
+
+**Merged pull requests:**
+
+- Run tests on Travis CI against MySQL 5.6/5.7/8.0 [\#53](https://github.com/twingly/ecco/pull/53) ([Chrizpy](https://github.com/Chrizpy))
+- Update JRuby to 9.2.13.0 [\#50](https://github.com/twingly/ecco/pull/50) ([Chrizpy](https://github.com/Chrizpy))
+- Update mysql-binlog-connector-java to 0.21.0 [\#48](https://github.com/twingly/ecco/pull/48) ([walro](https://github.com/walro))
+- Drop JRuby 9.1 support [\#47](https://github.com/twingly/ecco/pull/47) ([walro](https://github.com/walro))
+- Drop offical support for MySQL 5.5 [\#46](https://github.com/twingly/ecco/pull/46) ([walro](https://github.com/walro))
+- Bump rake version [\#44](https://github.com/twingly/ecco/pull/44) ([walro](https://github.com/walro))
+- Update mysql-binlog-connector-java to 0.20.1 [\#43](https://github.com/twingly/ecco/pull/43) ([roback](https://github.com/roback))
+- Run MySQL 5.6 in Docker on Travis CI [\#42](https://github.com/twingly/ecco/pull/42) ([walro](https://github.com/walro))
+- Replace Vagrant with Docker \(Compose\) [\#40](https://github.com/twingly/ecco/pull/40) ([walro](https://github.com/walro))
+- Update mysql-binlog-connector to 0.19.1 [\#38](https://github.com/twingly/ecco/pull/38) ([roback](https://github.com/roback))
+- Use JRuby 9.2.7.0 on Travis CI [\#37](https://github.com/twingly/ecco/pull/37) ([roback](https://github.com/roback))
+- Run Travis CI tests on 9.2.6.0 [\#36](https://github.com/twingly/ecco/pull/36) ([walro](https://github.com/walro))
+- Update mysql-binlog-connector to 0.19.0 [\#35](https://github.com/twingly/ecco/pull/35) ([roback](https://github.com/roback))
+- Update mysql-binlog-connector dependency to 0.18.0 [\#34](https://github.com/twingly/ecco/pull/34) ([walro](https://github.com/walro))
+- Run latest JRuby on Travis and ensure we stick to bundler 1.x [\#33](https://github.com/twingly/ecco/pull/33) ([walro](https://github.com/walro))
+- Test with latest version of JRuby 9.2.x [\#31](https://github.com/twingly/ecco/pull/31) ([walro](https://github.com/walro))
+- Test with the latest rubies [\#30](https://github.com/twingly/ecco/pull/30) ([walro](https://github.com/walro))
+- Accessor methods for connect\_timeout and heartbeat\_interval [\#28](https://github.com/twingly/ecco/pull/28) ([roback](https://github.com/roback))
+- Update mysql-binlog-connector dependency to 0.16.1 [\#27](https://github.com/twingly/ecco/pull/27) ([walro](https://github.com/walro))
 
 ## [v0.7.0](https://github.com/twingly/ecco/tree/v0.7.0) (2016-10-07)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.6.1...v0.7.0)
 
 **Implemented enhancements:**
@@ -13,6 +49,7 @@
 - Add changelog [\#21](https://github.com/twingly/ecco/pull/21) ([dentarg](https://github.com/dentarg))
 
 ## [v0.6.1](https://github.com/twingly/ecco/tree/v0.6.1) (2016-07-18)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.6.0...v0.6.1)
 
 **Merged pull requests:**
@@ -22,6 +59,7 @@
 - Improve rake task description [\#17](https://github.com/twingly/ecco/pull/17) ([jage](https://github.com/jage))
 
 ## [v0.6.0](https://github.com/twingly/ecco/tree/v0.6.0) (2015-12-04)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.5.0...v0.6.0)
 
 **Closed issues:**
@@ -33,6 +71,7 @@
 - Implement Ecco::Client\#connected? [\#15](https://github.com/twingly/ecco/pull/15) ([jage](https://github.com/jage))
 
 ## [v0.5.0](https://github.com/twingly/ecco/tree/v0.5.0) (2015-11-26)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.4.1...v0.5.0)
 
 **Fixed bugs:**
@@ -46,6 +85,7 @@
 - Add \#on\_communication\_failure [\#9](https://github.com/twingly/ecco/pull/9) ([walro](https://github.com/walro))
 
 ## [v0.4.1](https://github.com/twingly/ecco/tree/v0.4.1) (2015-11-19)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.4.0...v0.4.1)
 
 **Implemented enhancements:**
@@ -58,6 +98,7 @@
 - Minor refactoring [\#6](https://github.com/twingly/ecco/pull/6) ([dentarg](https://github.com/dentarg))
 
 ## [v0.4.0](https://github.com/twingly/ecco/tree/v0.4.0) (2015-11-18)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.3.1...v0.4.0)
 
 **Implemented enhancements:**
@@ -69,9 +110,11 @@
 - Add integration tests [\#3](https://github.com/twingly/ecco/pull/3) ([roback](https://github.com/roback))
 
 ## [v0.3.1](https://github.com/twingly/ecco/tree/v0.3.1) (2015-11-09)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.3.0...v0.3.1)
 
 ## [v0.3.0](https://github.com/twingly/ecco/tree/v0.3.0) (2015-11-09)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.2.0...v0.3.0)
 
 **Merged pull requests:**
@@ -79,9 +122,13 @@
 - Implement basic functionality [\#1](https://github.com/twingly/ecco/pull/1) ([walro](https://github.com/walro))
 
 ## [v0.2.0](https://github.com/twingly/ecco/tree/v0.2.0) (2015-10-27)
+
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.1.0...v0.2.0)
 
 ## [v0.1.0](https://github.com/twingly/ecco/tree/v0.1.0) (2015-10-27)
 
+[Full Changelog](https://github.com/twingly/ecco/compare/2296b8e6dadf9b7c4daa6d8fbe08fc78de8f8fc4...v0.1.0)
+
+
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -1,8 +1,8 @@
 # Ecco
 
-[![Build Status](https://travis-ci.org/twingly/ecco.svg?branch=master)](https://travis-ci.org/twingly/ecco)
+[![GitHub Build Status](https://github.com/twingly/ecco/workflows/CI/badge.svg?branch=master)](https://github.com/twingly/ecco/actions)
 
-MySQL (5.6 and 5.7) replication binlog parser using [mysql-binlog-connector-java].
+MySQL (5.7 and 8.0) replication binlog parser using [mysql-binlog-connector-java].
 
 ## Installation
 
@@ -65,7 +65,7 @@ client.start
 
 To download a new version of [mysql-binlog-connector-java]
 
-    rake maven:dependencies
+    bundle exec rake maven:dependencies
 
 Note: You need Maven to download
 
@@ -96,9 +96,6 @@ Ecco includes multiple Docker Compose definitions that can be used for this, one
 Start the desired version before running the tests:
 
 ```shell
-# MySQL 5.6
-docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-5-6.yml up
-
 # MySQL 5.7
 docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-5-7.yml up
 
@@ -131,5 +128,5 @@ Make a commit with the changelog changes and push.
 
 The gem is available as open source under the terms of the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
-[mysql-binlog-connector-java]: https://github.com/shyiko/mysql-binlog-connector-java
+[mysql-binlog-connector-java]: https://github.com/osheroff/mysql-binlog-connector-java
 [GitHub Changelog Generator]: https://github.com/skywinder/github-changelog-generator/

data/docker/ecco-java.security

@@ -0,0 +1,3 @@
+jdk.tls.disabledAlgorithms=SSLv3, TLSv1, RC4, DES, MD5withRSA, \
+    DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
+    include jdk.disabled.namedCurves

data/ecco.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", ">= 2.1.0"
   spec.add_development_dependency "rake", "~> 12"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sequel"

data/lib/ecco/client.rb

@@ -3,6 +3,7 @@ require "ecco/row_event_listener"
 require "ecco/save_event_listener"
 require "ecco/lifecycle_failure_listener"
 require "ecco/error"
+require "forwardable"
 
 module Ecco
   class Client

data/lib/ecco/event_listener.rb

@@ -3,15 +3,35 @@ module Ecco
     include com.github.shyiko.mysql.binlog.BinaryLogClient::EventListener
     java_import com.github.shyiko.mysql.binlog.event.EventType
 
+    WRITE_EVENTS  = { EventType::WRITE_ROWS => "WRITE_ROWS", EventType::EXT_WRITE_ROWS => "WRITE_ROWS" }
+    UPDATE_EVENTS = { EventType::UPDATE_ROWS => "UPDATE_ROWS", EventType::EXT_UPDATE_ROWS => "UPDATE_ROWS" }
+    DELETE_EVENTS = { EventType::DELETE_ROWS => "DELETE_ROWS" , EventType::EXT_DELETE_ROWS => "DELETE_ROWS" }
+    QUERY_EVENTS  = { EventType::QUERY => "QUERY"}
+    ROTATE_EVENTS = { EventType::ROTATE => "ROTATE"}
+
+    TABLE_EVENT = EventType::TABLE_MAP
+
     attr_writer :callback
 
-    def initialize(client)
+    def initialize(client, events_of_interest)
       @client = client
+
+      @events_of_interest = events_of_interest.reduce(&:merge)
+      @accepted_events = @events_of_interest.keys
+
       @callback = Proc.new {}
     end
 
     def on_event(event)
       raise NotImplementedError
     end
+
+    def accepted_events
+      @accepted_events
+    end
+
+    def event_type_to_string(type)
+      @events_of_interest.fetch(type)
+    end
   end
 end

data/lib/ecco/row_event_listener.rb

@@ -3,19 +3,8 @@ require "ecco/row_event"
 
 module Ecco
   class RowEventListener < EventListener
-    # 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
-    end
-
-    def accepted_events
-      ROW_EVENTS
+    def initialize(client)
+      super(client, events_of_interest)
     end
 
     def on_event(event)
@@ -23,13 +12,13 @@ module Ecco
       type = event.get_header.get_event_type
 
       case type
-      when table_event
+      when TABLE_EVENT
         @table_map_event = event
       when *accepted_events
         row_event          = Ecco::RowEvent.new
         row_event.table_id = data.get_table_id
         row_event.rows     = data.rows
-        row_event.type     = row_type_to_string(type)
+        row_event.type     = event_type_to_string(type)
 
         if @table_map_event
           table_event_data = @table_map_event.get_data
@@ -44,14 +33,8 @@ module Ecco
 
     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
+    def events_of_interest
+      [WRITE_EVENTS, UPDATE_EVENTS, DELETE_EVENTS]
     end
   end
 end

data/lib/ecco/save_event_listener.rb

@@ -2,32 +2,26 @@ require "ecco/event_listener"
 
 module Ecco
   class SaveEventListener < EventListener
-    SAVE_EVENTS = {
-      EventType::QUERY           => "QUERY",
-      EventType::ROTATE          => "ROTATE",
-      EventType::WRITE_ROWS      => "WRITE_ROWS",
-      EventType::EXT_WRITE_ROWS  => "WRITE_ROWS",
-      EventType::UPDATE_ROWS     => "UPDATE_ROWS",
-      EventType::EXT_UPDATE_ROWS => "UPDATE_ROWS",
-      EventType::DELETE_ROWS     => "DELETE_ROWS",
-      EventType::EXT_DELETE_ROWS => "DELETE_ROWS",
-    }
-
-    def accepted_events
-      SAVE_EVENTS.keys
+    def initialize(client)
+      super(client, events_of_interest)
     end
 
     def on_event(event)
       type = event.get_header.get_event_type
-
       case type
       when *accepted_events
         filename        = @client.get_binlog_filename
         position        = @client.get_binlog_position
-        event_type_name = SAVE_EVENTS.fetch(type)
+        event_type_name = event_type_to_string(type)
 
         @callback.call(filename, position, event_type_name)
       end
     end
+
+    private
+
+    def events_of_interest
+      [WRITE_EVENTS, UPDATE_EVENTS, DELETE_EVENTS, QUERY_EVENTS, ROTATE_EVENTS]
+    end
   end
 end

data/lib/ecco/version.rb

@@ -1,4 +1,4 @@
 module Ecco
-  VERSION = "0.8.0"
-  MYSQL_BINLOG_CONNECTOR_VERSION = "0.21.0"
+  VERSION = "1.0.0"
+  MYSQL_BINLOG_CONNECTOR_VERSION = "0.25.1"
 end

data/pom.xml

@@ -12,9 +12,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.github.shyiko</groupId>
+      <groupId>com.zendesk</groupId>
       <artifactId>mysql-binlog-connector-java</artifactId>
-      <version>0.21.0</version>
+      <version>0.25.1</version>
     </dependency>
   </dependencies>
 </project>

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ecco
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: java
 authors:
 - Twingly AB
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.1.0
   name: bundler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: sequel
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: jdbc-mysql
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -98,10 +98,10 @@ files:
 - bin/all_specs
 - bin/console
 - bin/specs
-- docker-compose-mysql-5-6.yml
 - docker-compose-mysql-5-7.yml
 - docker-compose-mysql-8-0.yml
 - docker-compose-mysql-base.yml
+- docker/ecco-java.security
 - docker/ecco-my.cnf
 - ecco.gemspec
 - lib/ecco.rb
@@ -113,7 +113,7 @@ files:
 - lib/ecco/row_event_listener.rb
 - lib/ecco/save_event_listener.rb
 - lib/ecco/version.rb
-- lib/ext/mysql-binlog-connector-java-0.21.0.jar
+- lib/ext/mysql-binlog-connector-java-0.25.1.jar
 - pom.xml
 homepage: https://github.com/twingly/ecco
 licenses:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: MySQL replication binlog parser.

data/.travis.yml

@@ -1,34 +0,0 @@
-dist: bionic
-language: ruby
-services:
-  - docker
-
-addons:
-  apt:
-    packages:
-    - haveged # Extra entropy
-
-before_install:
-  - sudo service haveged start # Extra entropy to ensure quick start time for JRuby
-  - rvm get master
-  - rvm install jruby-9.2.13.0
-  - rvm use jruby-9.2.13.0
-  - gem install bundler -v '< 2'
-  - docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-$MYSQL_VERSION.yml up -d
-
-env:
-  global:
-    - JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -Xcompile.invokedynamic=false'
-  jobs:
-    - MYSQL_VERSION="5-6"
-    - MYSQL_VERSION="5-7"
-    - MYSQL_VERSION="8-0"
-
-jobs:
-  allow_failures:
-    - env: MYSQL_VERSION="8-0"
-
-script: bin/all_specs
-
-notifications:
-  email: false

data/docker-compose-mysql-5-6.yml

@@ -1,5 +0,0 @@
-version: "3.7"
-
-services:
-  db:
-    image: mysql:5.6