distribute_reads 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96dec398d9905bde755d83b504ec450047b11128
-  data.tar.gz: 63dc0b236f1829b9fb2df0400299a35713717766
+  metadata.gz: 731daba05fd408780f3548cac44ddeda0d4c0c7c
+  data.tar.gz: 403b13ce349e56794b0bdc3457222724f1da4f8b
 SHA512:
-  metadata.gz: c96152f662c6fca7f75a51d2db9ab75e236ccc15f0aa3543ff73084fb509a34642422b53727f856fc11992a1ab643ca5fbda4251e1d794a634633000111cb871
-  data.tar.gz: 3f5ac5f959d935953795fab5877e01f666fde7c6b77d0cce6b0e9e237afacf3cf57c5a56456cde598e0322a06c3c296fbb80c1d1810ab5c17115a5da070513e7
+  metadata.gz: 76250c6a063c2797328938254bdc0b9c18508929c11a969f9f03d05ada6fe419038d1d25b0772ba536a486f3daf2cfa58673c5ec637324d49ebcddfb04e625d5
+  data.tar.gz: 4e7289ee561734260874b0a4098f1f991d2ee4965132b59a2257530a3ad54d13510bf6ad3de9fb2c0498b1b9a058cd5f25b29995bc577891178dff05d32504c6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2
+
+- Raise `ArgumentError` when missing block
+- Improved lag query
+- Warn if returning `ActiveRecord::Relation`
+
 ## 0.1.1
 
 - Added method for jobs

data/lib/distribute_reads.rb

@@ -14,7 +14,12 @@ module DistributeReads
   def self.lag
     conn = ActiveRecord::Base.connection
     if %w(PostgreSQL PostGIS).include?(conn.adapter_name)
-      conn.execute("SELECT EXTRACT(EPOCH FROM NOW() - pg_last_xact_replay_timestamp()) AS lag").first["lag"].to_f
+      conn.execute(
+        "SELECT CASE
+          WHEN pg_last_xlog_receive_location() = pg_last_xlog_replay_location() THEN 0
+          ELSE EXTRACT (EPOCH FROM NOW() - pg_last_xact_replay_timestamp())
+        END AS lag"
+      ).first["lag"].to_f
     else
       raise "Option not supported with this adapter"
     end

data/lib/distribute_reads/global_methods.rb

@@ -1,6 +1,8 @@
 module DistributeReads
   module GlobalMethods
     def distribute_reads(max_lag: nil)
+      raise ArgumentError, "Missing block" unless block_given?
+
       if max_lag && DistributeReads.lag > max_lag
         raise DistributeReads::TooMuchLag, "Replica lag over #{max_lag} seconds"
       end
@@ -8,7 +10,9 @@ module DistributeReads
       previous_value = Thread.current[:distribute_reads]
       begin
         Thread.current[:distribute_reads] = true
-        yield
+        value = yield
+        warn "[distribute_reads] Call `to_a` inside block to execute query on replica" if value.is_a?(ActiveRecord::Relation) && !previous_value
+        value
       ensure
         Thread.current[:distribute_reads] = previous_value
       end

data/lib/distribute_reads/job_methods.rb

@@ -1,8 +1,8 @@
 module DistributeReads
   module JobMethods
-    def distribute_reads
+    def distribute_reads(max_lag: nil)
       around_perform do |job, block|
-        distribute_reads { block.call }
+        distribute_reads(max_lag: max_lag) { block.call }
       end
     end
   end

data/lib/distribute_reads/version.rb

@@ -1,3 +1,3 @@
 module DistributeReads
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distribute_reads
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: makara
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Scale database reads with replicas in Rails