lhm-shopify 3.4.0 → 3.5.5

data/spec/unit/throttler_spec.rb

@@ -23,11 +23,11 @@ describe Lhm::Throttler do
       end
 
       it 'instantiates the time throttle' do
-        @mock.throttler.class.must_equal Lhm::Throttler::Time
+        value(@mock.throttler.class).must_equal Lhm::Throttler::Time
       end
 
       it 'returns 2 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 2
+        value(@mock.throttler.timeout_seconds).must_equal 2
       end
     end
 
@@ -37,11 +37,11 @@ describe Lhm::Throttler do
       end
 
       it 'instantiates the slave_lag throttle' do
-        @mock.throttler.class.must_equal Lhm::Throttler::SlaveLag
+        value(@mock.throttler.class).must_equal Lhm::Throttler::SlaveLag
       end
 
       it 'returns 20 seconds as allowed_lag' do
-        @mock.throttler.allowed_lag.must_equal 20
+        value(@mock.throttler.allowed_lag).must_equal 20
       end
     end
 
@@ -58,11 +58,11 @@ describe Lhm::Throttler do
       end
 
       it 'returns the instace given' do
-        @mock.throttler.must_equal @instance
+        value(@mock.throttler).must_equal @instance
       end
 
       it 'returns 0 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 0
+        value(@mock.throttler.timeout_seconds).must_equal 0
       end
     end
 
@@ -78,11 +78,11 @@ describe Lhm::Throttler do
       end
 
       it 'returns the instace given' do
-        @mock.throttler.must_equal @instance
+        value(@mock.throttler).must_equal @instance
       end
 
       it 'returns 0 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 0
+        value(@mock.throttler.timeout_seconds).must_equal 0
       end
     end
 
@@ -94,7 +94,7 @@ describe Lhm::Throttler do
       end
 
       it 'has the same class as given' do
-        @mock.throttler.class.must_equal @klass
+        value(@mock.throttler.class).must_equal @klass
       end
     end
 
@@ -106,7 +106,7 @@ describe Lhm::Throttler do
       end
 
       it 'has the same class as given' do
-        @mock.throttler.class.must_equal @klass
+        value(@mock.throttler.class).must_equal @klass
       end
     end
   end
@@ -114,11 +114,11 @@ describe Lhm::Throttler do
   describe '#throttler' do
 
     it 'returns the default Time based' do
-      @mock.throttler.class.must_equal Lhm::Throttler::Time
+      value(@mock.throttler.class).must_equal Lhm::Throttler::Time
     end
 
     it 'should default to 100 milliseconds' do
-      @mock.throttler.timeout_seconds.must_equal 0.1
+      value(@mock.throttler.timeout_seconds).must_equal 0.1
     end
   end
 end

data/spec/unit/unit_helper.rb

@@ -3,6 +3,8 @@
 require 'test_helper'
 
 module UnitHelper
+  LOG_EXPRESSION = /([\w]+),\s+\[([^\]\s]+)\s+#([^\]]+)]\s+(\w+)\s+--\s+(\w+)?:\s+(.+)/
+
   def fixture(name)
     File.read $fixtures.join(name)
   end
@@ -10,4 +12,15 @@ module UnitHelper
   def strip(sql)
     sql.strip.gsub(/\n */, "\n")
   end
+
+  def log_expression_message(msg)
+    msg.gsub(LOG_EXPRESSION) do |match|
+      severity  = $1
+      date      = $2
+      pid       = $3
+      label     = $4
+      app       = $5
+      message   = $6
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.5
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -28,6 +28,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -57,7 +71,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: after_do
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,7 +85,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,6 +126,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: toxiproxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Migrate large tables without downtime by copying to a temporary table
   in chunks. The old table is not dropped. Instead, it is moved to timestamp_table_name
   for verification.
@@ -124,22 +180,23 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- bin/.gitkeep
-- dbdeployer/config.json
-- dbdeployer/install.sh
 - dev.yml
-- gemfiles/ar-2.3_mysql.gemfile
-- gemfiles/ar-3.2_mysql.gemfile
-- gemfiles/ar-3.2_mysql2.gemfile
-- gemfiles/ar-4.0_mysql2.gemfile
-- gemfiles/ar-4.1_mysql2.gemfile
-- gemfiles/ar-4.2_mysql2.gemfile
-- gemfiles/ar-5.0_mysql2.gemfile
+- docker-compose.yml
+- gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_5.2.gemfile.lock
+- gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.0.gemfile.lock
+- gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_6.1.gemfile.lock
+- gemfiles/activerecord_7.0.0.alpha2.gemfile
+- gemfiles/activerecord_7.0.0.alpha2.gemfile.lock
 - lhm.gemspec
 - lib/lhm-shopify.rb
 - lib/lhm.rb
@@ -149,6 +206,7 @@ files:
 - lib/lhm/chunker.rb
 - lib/lhm/cleanup/current.rb
 - lib/lhm/command.rb
+- lib/lhm/connection.rb
 - lib/lhm/entangler.rb
 - lib/lhm/intersection.rb
 - lib/lhm/invoker.rb
@@ -156,6 +214,7 @@ files:
 - lib/lhm/migration.rb
 - lib/lhm/migrator.rb
 - lib/lhm/printer.rb
+- lib/lhm/proxysql_helper.rb
 - lib/lhm/railtie.rb
 - lib/lhm/sql_helper.rb
 - lib/lhm/sql_retry.rb
@@ -168,6 +227,11 @@ files:
 - lib/lhm/throttler/time.rb
 - lib/lhm/timestamp.rb
 - lib/lhm/version.rb
+- scripts/helpers/wait-for-dbs.sh
+- scripts/mysql/reader/create_replication.sql
+- scripts/mysql/writer/create_test_db.sql
+- scripts/mysql/writer/create_users.sql
+- scripts/proxysql/proxysql.cnf
 - shipit.rubygems.yml
 - spec/.lhm.example
 - spec/README.md
@@ -188,20 +252,27 @@ files:
 - spec/integration/chunk_insert_spec.rb
 - spec/integration/chunker_spec.rb
 - spec/integration/cleanup_spec.rb
+- spec/integration/database.yml
 - spec/integration/entangler_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/invoker_spec.rb
 - spec/integration/lhm_spec.rb
 - spec/integration/lock_wait_timeout_spec.rb
 - spec/integration/locked_switcher_spec.rb
+- spec/integration/proxysql_spec.rb
+- spec/integration/sql_retry/db_connection_helper.rb
 - spec/integration/sql_retry/lock_wait_spec.rb
 - spec/integration/sql_retry/lock_wait_timeout_test_helper.rb
+- spec/integration/sql_retry/proxysql_helper.rb
+- spec/integration/sql_retry/retry_with_proxysql_spec.rb
 - spec/integration/table_spec.rb
+- spec/integration/toxiproxy_helper.rb
 - spec/test_helper.rb
 - spec/unit/atomic_switcher_spec.rb
 - spec/unit/chunk_finder_spec.rb
 - spec/unit/chunk_insert_spec.rb
 - spec/unit/chunker_spec.rb
+- spec/unit/connection_spec.rb
 - spec/unit/entangler_spec.rb
 - spec/unit/intersection_spec.rb
 - spec/unit/lhm_spec.rb

data/dbdeployer/config.json

@@ -1,32 +0,0 @@
-{
- 	"version": "1.8.0",
- 	"sandbox-home": "./dbdeployer/sandboxes",
- 	"sandbox-binary": "./dbdeployer/binaries",
- 	"use-sandbox-catalog": true,
- 	"master-slave-base-port": 11000,
- 	"group-replication-base-port": 12000,
- 	"group-replication-sp-base-port": 13000,
- 	"fan-in-replication-base-port": 14000,
- 	"all-masters-replication-base-port": 15000,
- 	"multiple-base-port": 16000,
- 	"group-port-delta": 125,
- 	"mysqlx-port-delta": 10000,
- 	"master-name": "master",
- 	"master-abbr": "m",
- 	"node-prefix": "node",
- 	"slave-prefix": "slave",
- 	"slave-abbr": "s",
- 	"sandbox-prefix": "msb_",
- 	"master-slave-prefix": "rsandbox_",
- 	"group-prefix": "group_msb_",
- 	"group-sp-prefix": "group_sp_msb_",
- 	"multiple-prefix": "multi_msb_",
- 	"fan-in-prefix": "fan_in_msb_",
- 	"all-masters-prefix": "all_masters_msb_",
- 	"reserved-ports": [
- 		1186,
- 		3306,
- 		33060
- 	],
- 	"timestamp": "Mon Jul 16 17:36:55 AST 2018"
- }

data/dbdeployer/install.sh

@@ -1,64 +0,0 @@
-set -e
-mkdir -p ./dbdeployer/sandboxes
-mkdir -p ./dbdeployer/binaries
-
-if [ -z "$(uname | grep Darwin)" ]; then
-  OS=linux
-  set -x
-else
-  OS=osx
-fi
-
-echo "Checking if dbdeployer is installed"
-if ! [ -x "$(command -v ./bin/dbdeployer)" ]; then
-  echo "Not installed...starting install"
-  VERSION=1.56.0
-  origin=https://github.com/datacharmer/dbdeployer/releases/download/v$VERSION
-  filename=dbdeployer-$VERSION.$OS
-  wget -q $origin/$filename.tar.gz
-  tar -xzf $filename.tar.gz
-  chmod +x $filename
-  sudo mv $filename ./bin/dbdeployer
-  rm $filename.tar.gz
-else
-  echo "Installation found!"
-fi
-
-
-echo "Checking if mysql 5.7.22 is available for dbdeployer"
-if [ -z "$(./bin/dbdeployer --config ./dbdeployer/config.json --sandbox-binary "./dbdeployer/binaries" available | grep 5.7.22)" ]; then
-  echo "Not found..."
-
-  if [ "$OS" = "linux" ]; then
-    MYSQL_FILE=mysql-5.7.22-linux-glibc2.12-x86_64.tar.gz
-  else
-    MYSQL_FILE=mysql-5.7.22-macos10.13-x86_64.tar.gz
-  fi
-
-  if [ ! -f $MYSQL_FILE ]; then
-    echo "Downloading $MYSQL_FILE...(this may take a while)"
-    wget -q "https://dev.mysql.com/get/Downloads/MySQL-5.7/$MYSQL_FILE"
-  fi
-
-  echo "Setting up..."
-  ./bin/dbdeployer unpack $MYSQL_FILE --verbosity 0 --config ./dbdeployer/config.json --sandbox-binary "./dbdeployer/binaries"
-  rm $MYSQL_FILE
-else
-  echo "mysql 5.7.22 found!"
-fi
-
-echo "Forcing new replication setup..."
-./bin/dbdeployer deploy replication 5.7.22 --nodes 2 --force --config ./dbdeployer/config.json --sandbox-binary "./dbdeployer/binaries" --sandbox-home "./dbdeployer/sandboxes"
-./bin/dbdeployer global status --config ./dbdeployer/config.json --sandbox-binary "./dbdeployer/binaries" --sandbox-home "./dbdeployer/sandboxes"
-
-echo "Setting up database.yml"
-DATABASE_YML=spec/integration/database.yml
-echo "master:" > $DATABASE_YML
-cat ./dbdeployer/sandboxes/rsandbox_5_7_22/master/my.sandbox.cnf | grep -A 4 client | tail -n 4 | sed -e 's/  * = /: /' -e 's/^/  /' >> $DATABASE_YML
-
-echo "slave:" >> $DATABASE_YML
-cat ./dbdeployer/sandboxes/rsandbox_5_7_22/node1/my.sandbox.cnf | grep -A 4 client | tail -n 4 | sed -e 's/  * = /: /' -e 's/^/  /' >> $DATABASE_YML
-
-cat $DATABASE_YML
-
-echo "You are ready to run the integration test suite..."

data/gemfiles/ar-2.3_mysql.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql", "~> 2.8.1"
-gem "activerecord", "~> 2.3.18"
-gem "iconv", "~> 1.0.4"
-gemspec :path=>"../"

data/gemfiles/ar-3.2_mysql.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql", "~> 2.8.1"
-gem "activerecord", "~> 3.2.2"
-gemspec :path=>"../"

data/gemfiles/ar-3.2_mysql2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.11"
-gem "activerecord", "~> 3.2.2"
-gemspec :path=>"../"

data/gemfiles/ar-4.0_mysql2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.17"
-gem "activerecord", "~> 4.0.13"
-gemspec :path=>"../"

data/gemfiles/ar-4.1_mysql2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.17"
-gem "activerecord", "~> 4.1.9"
-gemspec :path=>"../"

data/gemfiles/ar-4.2_mysql2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.17"
-gem "activerecord", "~> 4.2.0"
-gemspec :path=>"../"

data/gemfiles/ar-5.0_mysql2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.4.5"
-gem "activerecord", "~> 5.0.2"
-gemspec :path=>"../"