makara 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2285d0c3c177997ec9e9d8568225f3a1ed1bdf28
-  data.tar.gz: 953d024813b8bd5bae579665a3988c5770f63d38
+  metadata.gz: 4dc4867024ed5527a9b0a499e4daff0c9c4bac5e
+  data.tar.gz: 170743d2e7f735b39fbcb477657643918c66cd32
 SHA512:
-  metadata.gz: dc7a2f84b22a57f83d1eb3ef4e615975e405f97b150b6b8d6c4e39b4833b4daa28036f7d838cd2062e64c4cc1ca015f519cf0d91c6c3a8f5f25ea85229e4e3e6
-  data.tar.gz: 528f91cff15ebd34a460d4f79f01679dd457641904df4834ae8179d735a461d23e8dfdae59971bffb019e62aaaabacb8aa36f440bd2165e5ca2835e58a69f8e4
+  metadata.gz: 8da212514ba19441a154323990544bb18ce0a3a39ff133f227bab84790e48b747f254b53d9a59c2aa93cfad0f0367fd03a44d3bcbe94a17874e7f2b084bec468
+  data.tar.gz: 731c52cd786a65d0a124edf94e1f721b69ec78cee0549d499b2cc35a5ac2210aa7ae87d8b22a3734829271ea538ed6b3cfb197fd1ebc2d4ce0f961d16e86afda

data/.travis.yml

@@ -1,11 +1,15 @@
 sudo: false
 language: ruby
 cache: bundler
+dist: precise
 
 services:
   - mysql
   - postgresql
 
+before_install:
+  - gem install bundler
+
 before_script:
   - mysql -e 'create database makara_test;'
   - psql -c 'create database makara_test;' -U postgres
@@ -17,6 +21,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5.0
   - ruby-head
   - jruby
 
@@ -43,8 +48,34 @@ matrix:
       rvm: 2.3
     - gemfile: gemfiles/ar30.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/ar31.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/ar32.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/ar40.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/ar41.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/ar30.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/ar31.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/ar32.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/ar40.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/ar41.gemfile
+      rvm: 2.5.0
     - gemfile: gemfiles/ar30.gemfile
       rvm: ruby-head
+    - gemfile: gemfiles/ar31.gemfile
+      rvm: ruby-head
+    - gemfile: gemfiles/ar32.gemfile
+      rvm: ruby-head
+    - gemfile: gemfiles/ar40.gemfile
+      rvm: ruby-head
+    - gemfile: gemfiles/ar41.gemfile
+      rvm: ruby-head
     - gemfile: gemfiles/ar50.gemfile
       rvm: 2.0
     - gemfile: gemfiles/ar50.gemfile
@@ -63,6 +94,10 @@ matrix:
       rvm: 2.1
     - gemfile: gemfiles/ar-head.gemfile
       rvm: 2.2
+    - gemfile: gemfiles/ar-head.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/ar-head.gemfile
+      rvm: 2.4
   allow_failures:
     - gemfile: gemfiles/ar-head.gemfile
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,7 +1,29 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v0.3.8 - 2016-07-11
+## v0.3.9 - 2013-03-20
+[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.9...v0.3.10) 
+
+Fixed
+- Send nextval queries to master and show queries to replicas for Postgres [#173](https://github.com/taskrabbit/makara/pull/173) Andrew Kane
+- Fixes can't add a new key into hash during iteration error [#174](https://github.com/taskrabbit/makara/pull/174) Andrew Kane
+- Fix: an application freezes when a slave is down [#180](https://github.com/taskrabbit/makara/pull/180) Alexey P
+- Allow SELECTs that use common table expressions to go to replicas [#184](https://github.com/taskrabbit/makara/pull/184) Andrew Kane
+- Send advisory lock requests to the master [#198](https://github.com/taskrabbit/makara/pull/198) George Claghorn
+- Postgres exists query [#199](https://github.com/taskrabbit/makara/pull/199) Brian Leonard
+
+Documentation and Test
+- Clarify README's "What goes where" [#187](https://github.com/taskrabbit/makara/pull/187) Jan Sandbrink
+- Fix loading fixtures in Rails 5.2 [#192](https://github.com/taskrabbit/makara/pull/192) George Claghorn
+- Travis Upgrade [#199](https://github.com/taskrabbit/makara/pull/199) Brian Leonard
+
+## v0.3.9 - 2017-08-14
+[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.8...v0.3.9) 
+
+Changed
+- Add postgis support [#118](https://github.com/taskrabbit/makara/pull/118) Kevin Bacha
+
+## v0.3.8 - 2017-07-11
 
 [Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.7...v0.3.8) 
 

data/Gemfile

@@ -11,7 +11,7 @@ gem 'ruby-debug', :platform => :jruby
 gem 'rack', '1.6.0'
 
 gem 'mysql2', :platform => :ruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-postgis-adapter', :platform => :ruby
 gem 'rgeo', :platform => :ruby
 

data/README.md

@@ -120,7 +120,13 @@ By creating a makara database adapter which simply acts as a proxy we avoid any
 
 ### What goes where?
 
-Any `SELECT` statements will execute against your slave(s), anything else will go to master. The only edge case is `SET` operations which are sent to all connections. Execution of specific methods such as `connect!`, `disconnect!`, and `clear_cache!` are invoked on all underlying connections.
+In general: Any `SELECT` statements will execute against your slave(s), anything else will go to master.
+
+There are some edge cases:
+* `SET` operations will be sent to all connections
+* Execution of specific methods such as `connect!`, `disconnect!`, and `clear_cache!` are invoked on all underlying connections
+* Calls inside a transaction will always be sent to the master (otherwise changes from within the transaction could not be read back on most transaction isolation levels)
+* Locking reads (e.g. `SELECT ... FOR UPDATE`) will always be sent to the master
 
 ### Errors / blacklisting
 
@@ -165,7 +171,8 @@ The makara subconfig sets up the proxy with a few of its own options, then provi
 * disable_blacklist - do not blacklist node at any error, useful in case of one master
 * sticky - if a node should be stuck to once it's used during a specific context
 * master_ttl - how long the master context is persisted. generally, this needs to be longer than any replication lag
-* master_strategy - use a different strategy for picking the "current" node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
+* master_strategy - use a different strategy for picking the "current" master node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
+* slave_strategy - use a different strategy for picking the "current" slave node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
 * connection_error_matchers - array of custom error matchers you want to be handled gracefully by Makara (as in, errors matching these regexes will result in blacklisting the connection as opposed to raising directly).
 
 Connection definitions contain any extra node-specific configurations. If the node should behave as a master you must provide `role: master`. Any previous configurations can be overridden within a specific node's config. Nodes can also contain weights if you'd like to balance usage based on hardware specifications. Optionally, you can provide a name attribute which will be used in sql logging.

data/gemfiles/ar-head.gemfile

@@ -11,5 +11,14 @@ gem 'rack'
 gem 'timecop'
 gem 'mysql2', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar30.gemfile

@@ -12,8 +12,6 @@ gem 'i18n', '~> 0.5.0'
 gem 'mysql2', '0.2.11', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
 
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
@@ -28,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar31.gemfile

@@ -12,8 +12,7 @@ gem 'i18n', '~> 0.6.0'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
+
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 
@@ -27,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar32.gemfile

@@ -12,8 +12,7 @@ gem 'i18n', '~> 0.6.0'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
+
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 
@@ -27,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar40.gemfile

@@ -11,7 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar41.gemfile

@@ -11,7 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar42.gemfile

@@ -11,7 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar50.gemfile

@@ -11,5 +11,14 @@ gem 'rack'
 gem 'timecop'
 gem 'mysql2', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar51.gemfile

@@ -11,5 +11,14 @@ gem 'rack'
 gem 'timecop'
 gem 'mysql2', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/lib/active_record/connection_adapters/makara_abstract_adapter.rb

@@ -105,11 +105,11 @@ module ActiveRecord
       end
 
 
-      hijack_method :execute, :select_rows, :exec_query, :transaction
+      hijack_method :execute, :exec_query, :exec_no_cache, :exec_cache, :transaction
       send_to_all :connect, :reconnect!, :verify!, :clear_cache!, :reset!
 
-      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i].map(&:freeze).freeze
-      SQL_SLAVE_MATCHERS            = [/\A\s*select\s/i].map(&:freeze).freeze
+      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i, /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i].map(&:freeze).freeze
+      SQL_SLAVE_MATCHERS            = [/\A\s*(select|with.+\)\s*select)\s/i].map(&:freeze).freeze
       SQL_ALL_MATCHERS              = [/\A\s*set\s/i].map(&:freeze).freeze
       SQL_SKIP_STICKINESS_MATCHERS  = [/\A\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /\A\s*(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 

data/lib/makara/cache/memory_store.rb

@@ -4,6 +4,7 @@ module Makara
 
       def initialize
         @data = {}
+        @mutex = Mutex.new
       end
 
       def read(key)
@@ -20,7 +21,9 @@ module Makara
       protected
 
       def clean
-        @data.delete_if{|k,v| v[1] <= Time.now.to_i }
+        @mutex.synchronize do
+          @data.delete_if{|k,v| v[1] <= Time.now.to_i }
+        end
       end
 
     end

data/lib/makara/connection_wrapper.rb

@@ -146,10 +146,10 @@ module Makara
       # The new definition should allow for the proxy to intercept the invocation if required.
       @proxy.class.hijack_methods.each do |meth|
         extension << %Q{
-          def #{meth}(*args)
+          def #{meth}(*args, &block)
             _makara_hijack do |proxy|
               if proxy
-                proxy.#{meth}(*args)
+                proxy.#{meth}(*args, &block)
               else
                 super
               end

data/lib/makara/pool.rb

@@ -64,17 +64,14 @@ module Makara
       @connections.each do |con|
         next if con._makara_blacklisted?
         begin
-          if block
-            value = @proxy.error_handler.handle(con) do
+          ret = @proxy.error_handler.handle(con) do
+            if block
               yield con
+            else
+              con.send(method, *args)
             end
           end
 
-          if method
-            ret = con.send(method, *args)
-          else
-            ret = value
-          end
           one_worked = true
         rescue Makara::Errors::BlacklistConnection => e
           errors.insert(0, e)

data/lib/makara/proxy.rb

@@ -182,7 +182,6 @@ module Makara
 
       # for testing purposes
       pool = _appropriate_pool(method_name, args)
-
       yield pool
 
     rescue ::Makara::Errors::AllConnectionsBlacklisted, ::Makara::Errors::NoConnectionsAvailable => e

data/lib/makara/strategies/round_robin.rb

@@ -23,6 +23,8 @@ module Makara
       end
 
       def next
+        return safe_value(0, true) if single_one?
+
         idx = @current_idx
         begin
 
@@ -67,6 +69,10 @@ module Makara
       def should_shuffle?
         true
       end
+
+      def single_one?
+        false
+      end
     end
   end
 end

data/lib/makara/version.rb

@@ -3,7 +3,7 @@ module Makara
 
     MAJOR = 0
     MINOR = 3
-    PATCH = 9
+    PATCH = 10
     PRE = nil
 
     def self.to_s

data/spec/active_record/connection_adapters/makara_abstract_adapter_spec.rb

@@ -27,7 +27,16 @@ describe ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter do
     '    select * from users for update' => true,
     'select * from users lock in share mode' => true,
     'select * from users where name = "for update"' => false,
-    'select * from users where name = "lock in share mode"' => false
+    'select * from users where name = "lock in share mode"' => false,
+    'select nextval(\'users_id_seq\')' => true,
+    'select currval(\'users_id_seq\')' => true,
+    'select lastval()' => true,
+    'with fence as (select * from users) select * from fence' => false,
+    'with fence as (select * from felines) insert to cats' => true,
+    'select get_lock(\'foo\', 0)' => true,
+    'select release_lock(\'foo\')' => true,
+    'select pg_advisory_lock(12345)' => true,
+    'select pg_advisory_unlock(12345)' => true
   }.each do |sql, should_go_to_master|
 
     it "determines that \"#{sql}\" #{should_go_to_master ? 'requires' : 'does not require'} master" do

data/spec/active_record/connection_adapters/makara_mysql2_adapter_spec.rb

@@ -150,7 +150,7 @@ describe 'MakaraMysql2Adapter' do
 
     it 'should send reads to the slave' do
       # ensure the next connection will be the first one
-      connection.slave_pool.strategy.instance_variable_set('@current_idx', connection.slave_pool.connections.length)
+      allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
 
       con = connection.slave_pool.connections.first
       expect(con).to receive(:execute).with('SELECT * FROM users').once
@@ -158,6 +158,21 @@ describe 'MakaraMysql2Adapter' do
       connection.execute('SELECT * FROM users')
     end
 
+    it 'should send exists? to slave' do
+      next if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0 # query doesn't work?
+
+      allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
+      Test::User.exists? # flush other (schema) things that need to happen
+      
+      con = connection.slave_pool.connections.first
+      if (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 0)
+        expect(con).to receive(:execute).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
+      else
+        expect(con).to receive(:exec_query).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
+      end
+      Test::User.exists?
+    end
+
     it 'should send writes to master' do
       con = connection.master_pool.connections.first
       expect(con).to receive(:execute).with('UPDATE users SET name = "bob" WHERE id = 1')

data/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb

@@ -1,8 +1,16 @@
 # RGeo doesn't play well with JRuby and to avoid complicated test setup
 # we're only testing ActiveRecord version ~> 4.2
+# also rgeo only works on 2.1+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+require 'active_record'
+
+# TODO: test this in AR 5+ ?
+
 if RUBY_ENGINE == 'ruby' &&
     ActiveRecord::VERSION::MAJOR == 4 &&
-    ActiveRecord::VERSION::MINOR >= 2
+    ActiveRecord::VERSION::MINOR >= 2 &&
+    (rmajor > 2 || (rmajor == 2 && rminor >= 1))
 
   require 'spec_helper'
   require 'rgeo'
@@ -83,10 +91,7 @@ if RUBY_ENGINE == 'ruby' &&
 
       it 'should send reads to the slave' do
         # ensure the next connection will be the first one
-        connection.slave_pool
-                  .strategy
-                  .instance_variable_set('@current_idx',
-                                         connection.slave_pool.connections.length)
+        allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
 
         con = connection.slave_pool.connections.first
         expect(con).to receive(:execute).with('SELECT * FROM users').once

data/spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb

@@ -64,7 +64,7 @@ describe 'MakaraPostgreSQLAdapter' do
 
     it 'should send reads to the slave' do
       # ensure the next connection will be the first one
-      connection.slave_pool.strategy.instance_variable_set('@current_idx', connection.slave_pool.connections.length)
+      allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
 
       con = connection.slave_pool.connections.first
       expect(con).to receive(:execute).with('SELECT * FROM users').once
@@ -72,6 +72,22 @@ describe 'MakaraPostgreSQLAdapter' do
       connection.execute('SELECT * FROM users')
     end
 
+    it 'should send exists? to slave' do
+      next if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0 # query doesn't work?
+
+      allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
+      Test::User.exists? # flush other (schema) things that need to happen
+      
+      con = connection.slave_pool.connections.first
+      if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2) ||
+         (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 0)
+        expect(con).to receive(:exec_no_cache).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
+      else
+        expect(con).to receive(:exec_query).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
+      end
+      Test::User.exists?
+    end
+
     it 'should send writes to master' do
       con = connection.master_pool.connections.first
       expect(con).to receive(:execute).with('UPDATE users SET name = "bob" WHERE id = 1')

data/spec/cache_spec.rb

@@ -52,6 +52,28 @@ describe Makara::Cache do
       expect(data).not_to have_key('test')
     end
 
+    it 'has thread-safety' do
+      store = Makara::Cache::MemoryStore.new
+      previous_value = Thread.abort_on_exception
+
+      begin
+        Thread.abort_on_exception = true
+
+        workers = 2.times.map do
+          Thread.new do
+            100.times do |n|
+              store.write(n, 'value', expires_in: 0.5)
+              sleep(0.01)
+            end
+          end
+        end
+
+        expect { workers.map(&:join) }.to_not raise_error
+      ensure
+        Thread.abort_on_exception = previous_value
+      end
+    end
+
   end
 
 

data/spec/connection_wrapper_spec.rb

@@ -14,8 +14,11 @@ describe Makara::ConnectionWrapper do
   end
 
   it 'should invoke hijacked methods on the proxy when invoked directly' do
-    expect(proxy).to receive(:execute).with('test').once
-    connection.execute("test")
+    expect(proxy).to receive(:execute).with('test').once do |&block|
+      expect(block.call).to eq('Hello')
+    end
+
+    connection.execute('test') { 'Hello' }
   end
 
   it 'should have a default weight of 1' do

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ RSpec.configure do |config|
   require "#{File.dirname(__FILE__)}/support/pool_extensions"
   require "#{File.dirname(__FILE__)}/support/mock_objects"
   require "#{File.dirname(__FILE__)}/support/deep_dup"
+  require "#{File.dirname(__FILE__)}/support/user"
 
   config.include SpecHelpers
 
@@ -31,6 +32,7 @@ RSpec.configure do |config|
     Makara::Cache.store = :memory
     change_context
     allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:should_shuffle?){ false }
+    RSpec::Mocks.space.proxy_for(ActiveRecord::Base).reset # make sure not stubbed in some way
   end
 
   def change_context

data/spec/support/mysql2_database.yml

@@ -4,6 +4,7 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
   connect_timeout: 1
   read_timeout: 1
   write_timeout: 2

data/spec/support/mysql2_database_with_custom_errors.yml

@@ -4,6 +4,11 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
+  connect_timeout: 1
+  read_timeout: 1
+  write_timeout: 2
+
   makara:
     blacklist_duration: 2
     master_ttl: 5

data/spec/support/postgis_database.yml

@@ -4,6 +4,8 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
+
   makara:
     blacklist_duration: 2
     master_ttl: 5

data/spec/support/postgis_schema.rb

@@ -1,8 +1,11 @@
+conn = ActiveRecord::Base.connection
 
-ActiveRecord::Schema.define(:version => 20160518161227) do
-  execute "create extension if not exists postgis"
+conn.execute "create extension if not exists postgis"
 
-  create_table "towns", :force => true do |t|
+if conn.table_exists? "towns"
+  conn.execute("TRUNCATE TABLE towns")
+else
+  conn.create_table "towns", :force => true do |t|
     t.st_point "location"
   end
 end

data/spec/support/postgresql_database.yml

@@ -4,6 +4,8 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
+
   makara:
     blacklist_duration: 2
     master_ttl: 5

data/spec/support/schema.rb

@@ -1,9 +1,9 @@
-ActiveRecord::Schema.define(:version => 20130628161227) do
+conn = ActiveRecord::Base.connection
 
-  drop_table "users" if table_exists? "users"
-
-  create_table "users" do |t|
+if conn.table_exists? "users"
+  conn.execute("TRUNCATE TABLE users")
+else
+  conn.create_table "users" do |t|
     t.string   "name"
   end
-
 end

data/spec/support/user.rb

@@ -0,0 +1,5 @@
+module Test
+  class User < ::ActiveRecord::Base
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
+- spec/support/user.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -158,3 +159,4 @@ test_files:
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
+- spec/support/user.rb