perfectqueue 0.8.46 → 0.8.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e091df346ddc80d849184494788572dbbe07919e
-  data.tar.gz: 40533e8a9adf12acc69d85273675ba9043743c8b
+  metadata.gz: 68a42f45b43150785b9c0a0ad1e6757da6b8104f
+  data.tar.gz: 64b1df2f881992eaf48f1811b323966c35cdfccd
 SHA512:
-  metadata.gz: 253f1165eebc079a3ad181add6e6a516bb3457000de54172470a62a8ac26335208a1bbb135df77b1a8ad28ad82103426d8321f70954f357a5b94c410b6e7e15c
-  data.tar.gz: d37142ec6e8927b4708bb8f223d61ac3a5618ebccfae7b70239612883e0a1739c69c4910c2cc4390de12756268cad248ea34cdb2300a213e6bf348b87cf3a33c
+  metadata.gz: aa3effbb36e362da777ef15ab8aba0feb76471d150e7ae887cf299d90cf48d785f90b3f976907ad0e0fe6256ea7dd4bfa5198676e931a581778aae5c3dcfb677
+  data.tar.gz: 4235badb3ba5fdc97d570e14fed8c3d405c7b9d5fe98ee7962b7df3bc2bfef730a275aef241418d61fdc1d9a02e0b8401a8e5979a53af21c59428bd2be5ab5d3

data/.travis.yml

@@ -12,5 +12,9 @@ before_script:
 
 sudo: false
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 notifications:
   webhooks: http://td-beda.herokuapp.com/travisci_callback

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2016-04-15 version 0.8.47
+
+* require libraries before fork to help CoW
+* add FORCE INDEX to acquiring UPDATE query to avoid wrong index
+
 == 2016-03-23 version 0.8.46
 
 * Introduce new timeout model

data/lib/perfectqueue.rb

@@ -16,45 +16,39 @@
 #    limitations under the License.
 #
 
-module PerfectQueue
-  require 'json'
-  require 'thread'  # Mutex, CoditionVariable
+require 'json'
+require 'thread'  # Mutex, CoditionVariable
+require 'zlib'
+require 'stringio'
+require 'sequel'
+require 'logger'
+require 'fcntl'
 
-  {
-    :Application => 'perfectqueue/application',
-    :Backend => 'perfectqueue/backend',
-    :BackendHelper => 'perfectqueue/backend',
-    :BlockingFlag => 'perfectqueue/blocking_flag',
-    :Client => 'perfectqueue/client',
-    :DaemonsLogger => 'perfectqueue/daemons_logger',
-    :Engine => 'perfectqueue/engine',
-    :Model => 'perfectqueue/model',
-    :Queue => 'perfectqueue/queue',
-    :Runner => 'perfectqueue/runner',
-    :Task => 'perfectqueue/task',
-    :TaskWithMetadata => 'perfectqueue/task',
-    :AcquiredTask => 'perfectqueue/task',
-    :TaskMetadata => 'perfectqueue/task_metadata',
-    :TaskMonitor => 'perfectqueue/task_monitor',
-    :TaskMetadataAccessors => 'perfectqueue/task_metadata',
-    :TaskStatus => 'perfectqueue/task_status',
-    :Worker => 'perfectqueue/worker',
-    :Supervisor => 'perfectqueue/supervisor',
-    # SignalQueue is obsolete because it does not run with ruby >= 2.0.0.
-    # See ddbf04c9 and use SignalThread instead.
-    :SignalQueue => 'perfectqueue/signal_queue',
-    :SignalThread => 'perfectqueue/signal_thread',
-    :VERSION => 'perfectqueue/version',
-  }.each_pair {|k,v|
-    autoload k, File.expand_path(v, File.dirname(__FILE__))
-  }
-  [
-    'perfectqueue/multiprocess',
-    'perfectqueue/error',
-  ].each {|v|
-    require File.expand_path(v, File.dirname(__FILE__))
-  }
+require_relative 'perfectqueue/application'
+require_relative 'perfectqueue/backend'
+require_relative 'perfectqueue/backend/rdb_compat'
+require_relative 'perfectqueue/blocking_flag'
+require_relative 'perfectqueue/client'
+require_relative 'perfectqueue/daemons_logger'
+require_relative 'perfectqueue/engine'
+require_relative 'perfectqueue/model'
+require_relative 'perfectqueue/queue'
+require_relative 'perfectqueue/runner'
+require_relative 'perfectqueue/task_monitor'
+require_relative 'perfectqueue/task_metadata'
+require_relative 'perfectqueue/task_status'
+require_relative 'perfectqueue/task'
+require_relative 'perfectqueue/worker'
+require_relative 'perfectqueue/supervisor'
+require_relative 'perfectqueue/signal_thread'
+require_relative 'perfectqueue/version'
+require_relative 'perfectqueue/multiprocess/thread_processor'
+require_relative 'perfectqueue/multiprocess/child_process'
+require_relative 'perfectqueue/multiprocess/child_process_monitor'
+require_relative 'perfectqueue/multiprocess/fork_processor'
+require_relative 'perfectqueue/error'
 
+module PerfectQueue
   def self.open(config, &block)
     c = Client.new(config)
     begin

data/lib/perfectqueue/backend.rb

@@ -19,17 +19,8 @@
 module PerfectQueue
   module Backend
     def self.new_backend(client, config)
-      case config[:type]
-      when nil
-        raise ConfigError, "'type' option is not set"
-      when 'rdb_compat'
-        require_backend('rdb_compat')
-        RDBCompatBackend.new(client, config)
-      end
-    end
-
-    def self.require_backend(fname)
-      require File.expand_path("backend/#{fname}", File.dirname(__FILE__))
+      raise ConfigError, "'type' must be 'rdb_compat'" if config[:type] != 'rdb_compat'
+      RDBCompatBackend.new(client, config)
     end
   end
 
@@ -46,4 +37,3 @@ module PerfectQueue
     end
   end
 end
-

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -39,7 +39,6 @@ module PerfectQueue
       def initialize(client, config)
         super
 
-        require 'sequel'
         url = config[:url]
         @table = config[:table]
         unless @table
@@ -170,8 +169,6 @@ SQL
 
       def compress_data(data, compression)
         if compression == 'gzip'
-          require 'zlib'
-          require 'stringio'
           io = StringIO.new
           io.set_encoding(Encoding::ASCII_8BIT)
           gz = Zlib::GzipWriter.new(io)
@@ -243,7 +240,7 @@ SQL
             return nil
           end
 
-          sql = "UPDATE `#{@table}` SET timeout=? WHERE timeout <= ? AND id IN ("
+          sql = "UPDATE `#{@table}` FORCE INDEX (PRIMARY) SET timeout=? WHERE timeout <= ? AND id IN ("
           params = [sql, next_timeout, now]
           tasks.each {|t| params << t.key }
           sql << (1..tasks.size).map { '?' }.join(',')
@@ -410,8 +407,6 @@ SQL
           # automatic gzip decompression
           d.force_encoding('ASCII-8BIT') if d.respond_to?(:force_encoding)
           if d[0, 2] == GZIP_MAGIC_BYTES
-            require 'zlib'
-            require 'stringio'
             compression = 'gzip'
             gz = Zlib::GzipReader.new(StringIO.new(d))
             begin

data/lib/perfectqueue/blocking_flag.rb

@@ -20,7 +20,6 @@ module PerfectQueue
 
   class BlockingFlag
     def initialize
-      require 'thread'
       @set = false
       @mutex = Mutex.new
       @cond = ConditionVariable.new

data/lib/perfectqueue/daemons_logger.rb

@@ -18,8 +18,6 @@
 
 module PerfectQueue
 
-  require 'logger'
-
   class DaemonsLogger < Logger
     def initialize(dev, shift_age=0, shift_size=1048576)
       @stdout_hook = false

data/lib/perfectqueue/multiprocess/fork_processor.rb

@@ -24,7 +24,6 @@ module PerfectQueue
         @runner = runner
         @processor_id = processor_id
 
-        require 'fcntl'
         @stop = false
         @cpm = nil
         @last_fork_time = 0

data/lib/perfectqueue/signal_thread.rb

@@ -19,8 +19,6 @@ module PerfectQueue
 
   class SignalThread < Thread
     def initialize(&block)
-      require 'thread'
-
       @handlers = {}
 
       @mutex = Mutex.new

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.46"
+  VERSION = "0.8.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.46
+  version: 0.8.47
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -112,14 +112,12 @@ files:
 - lib/perfectqueue/engine.rb
 - lib/perfectqueue/error.rb
 - lib/perfectqueue/model.rb
-- lib/perfectqueue/multiprocess.rb
 - lib/perfectqueue/multiprocess/child_process.rb
 - lib/perfectqueue/multiprocess/child_process_monitor.rb
 - lib/perfectqueue/multiprocess/fork_processor.rb
 - lib/perfectqueue/multiprocess/thread_processor.rb
 - lib/perfectqueue/queue.rb
 - lib/perfectqueue/runner.rb
-- lib/perfectqueue/signal_queue.rb
 - lib/perfectqueue/signal_thread.rb
 - lib/perfectqueue/supervisor.rb
 - lib/perfectqueue/task.rb
@@ -202,3 +200,4 @@ test_files:
 - spec/task_metadata_spec.rb
 - spec/task_monitor_spec.rb
 - spec/task_spec.rb
+has_rdoc: false

data/lib/perfectqueue/multiprocess.rb

@@ -1,31 +0,0 @@
-#
-# PerfectQueue
-#
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-module PerfectQueue
-  module Multiprocess
-    {
-      :ChildProcess => 'multiprocess/child_process',
-      :ChildProcessMonitor => 'multiprocess/child_process_monitor',
-      :ForkProcessor => 'multiprocess/fork_processor',
-      :ThreadProcessor => 'multiprocess/thread_processor',
-    }.each_pair {|k,v|
-      autoload k, File.expand_path(v, File.dirname(__FILE__))
-    }
-  end
-end
-

data/lib/perfectqueue/signal_queue.rb

@@ -1,122 +0,0 @@
-#
-# PerfectQueue
-#
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-module PerfectQueue
-
-  # SignalQueue is obsolete because it does not run with ruby >= 2.0.0.
-  # See ddbf04c9 and use SignalThread instead.
-  class SignalQueue
-    def self.start(&block)
-      st = new(&block)
-      st.start
-      return st
-    end
-
-    def initialize(&block)
-      require 'thread'
-
-      @handlers = {}
-      @queue = []
-      @mutex = Mutex.new
-      @cond = ConditionVariable.new
-      @finished = false
-
-      block.call(self) if block
-    end
-
-    def trap(sig, command=nil, &block)
-      sig = sig.to_sym
-      old = @handlers[sig]
-
-      if block
-        Kernel.trap(sig) do
-          enqueue(sig)
-        end
-        @handlers[sig] = block
-
-      else
-        Kernel.trap(sig, command)
-        @handlers.delete(sig)
-      end
-
-      old
-    end
-
-    def start
-      @thread = Thread.new(&method(:run))
-    end
-
-    def join
-      @thread.join
-    end
-
-    def stop
-      @finished = true
-      enqueue(nil)  # TODO causes recursive lock?
-    end
-
-    def shutdown
-      stop
-      join
-    end
-
-    def run
-      @owner_thread = Thread.current
-      until @finished
-        h = nil
-        @mutex.synchronize do
-          while @queue.empty?
-            @cond.wait(@mutex, 0.5)
-          end
-          sig = @queue.shift
-          if sig == nil
-            @finished = true
-          else
-            h = @handlers[sig]
-          end
-        end
-
-        begin
-          h.call if h
-        rescue
-          STDERR.print "#{$!}\n"
-          $!.backtrace.each {|bt|
-            STDERR.print "\t#{bt}\n"
-            STDERR.flush
-          }
-        end
-      end
-    end
-
-    private
-    def enqueue(sig)
-      if Thread.current == @owner_thread
-        @queue << sig
-        if @mutex.locked?
-          @cond.signal
-        end
-      else
-        @mutex.synchronize do
-          @queue << sig
-          @cond.signal
-        end
-      end
-    end
-  end
-
-end