workhorse 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4f3666d9865ea9578e5bb735c0889a3701be869f07fc52c971777e41dbae4e
-  data.tar.gz: 3fca0dcf3192f1bc954c8963eb272e4aadcba4a6d2616c57600fd5ae2003a3a0
+  metadata.gz: 3d89b887e87a7aad1c081461bd76a98dbf8b0e6f6b0aa6e221936d4d2fe7d745
+  data.tar.gz: 1786cfab5d08fd0c6d51158b2241db9766653e1410e391094b65587f17317fe5
 SHA512:
-  metadata.gz: c8437d30f0f38fee5cf2c709642af4a4a85439138ba4fbf07935a18577fdde01c1bcccdd14e84579cefee141393b878669702a835852f5ffddd9e2b39ad73699
-  data.tar.gz: d73c6f4432a64d9e26b1b010dc88ac5c9751cb7a7a99bce2b885e17f0b0967c540704a1d6af4a9cb4bd7e2b59dc89648a98c3de305090fa7d91ed11259c2c5aa
+  metadata.gz: d7563ef29ea4dde18f0b146f905296c0653710d04c0c539a7f50d3d86df48e8a2e82e97e478c46f884e812362d4332287630a44d901ff52e591232b5dceac266
+  data.tar.gz: 7727e7339918c20ab48c719174c4c90484dc723052a141c7bb1dd717e51adda9e6ff2fa622ce2fc555b7725ba9f08eaf369fb0019db5c821c88a3691a46ee1ce

data/.travis.yml

@@ -8,5 +8,5 @@ before_install:
   - mysql -e 'CREATE DATABASE workhorse;'
 script:
  - bundle install
- - bundle exec rake test
+ - bundle exec rake test TESTOPTS='--verbose'
  - bundle exec rubocop

data/CHANGELOG.md

@@ -1,31 +1,35 @@
 # Workhorse Change log
 
-## 0.3.6 - 2018-11-14
+## 0.3.7 – 2018-12-17
+
+* Fixed Oracle DB compatibility issues for jobs in multiple queues
+
+## 0.3.6 – 2018-11-14
 
 * Makes sure all exceptions are caught and handled properly, not only exceptions
   deriving from `StandardError`. In previous releases, this prevented some
   exceptions like syntax errors to be handled properly.
 
-## 0.3.5 - 2018-10-22
+## 0.3.5 – 2018-10-22
 
 * Adds global callback `on_exception` that allows custom exception handling /
   exception notification.
 
-## 0.3.4 - 2018-09-24
+## 0.3.4 – 2018-09-24
 
-* *Fixes #14
+* Fixes #14
 
 * Fixes crucial bug where multiple jobs of the same queue could be executed
   simultaneously.
 
 * Makes `Workhorse::DbJob` attributes accessible for earlier versions of rails.
 
-## 0.3.3 - 2018-02-26
+## 0.3.3 – 2018-02-26
 
 * Adds missing require for `concurrent` library that is required in some
   versions of Rails
 
-## 0.3.2 - 2018-02-23
+## 0.3.2 – 2018-02-23
 
 * Fixes a migration bug
 

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/workhorse/poller.rb

@@ -95,7 +95,7 @@ module Workhorse
       union_parts = []
       valid_queues.each do |queue|
         # Start with a fresh select, as we now know the allowed queues
-        select = valid_ordered_select
+        select = valid_ordered_select_id
         select = select.where(table[:queue].eq(queue))
 
         # Get the maximum amount possible for no-queue jobs. This gives us the
@@ -110,14 +110,17 @@ module Workhorse
 
       # Combine the jobs of each queue in a giant UNION chain. Arel does not
       # support this directly, as it does not generate parentheses around the
-      # subselects.
-      # Furthermore, add the alias directly instead of using Arel `as`, because
-      # it uses the keyword 'AS' in SQL generated for Oracle, which is invalid
-      # for table aliases.
+      # subselects. The parentheses are necessary because of the order clauses
+      # contained within.
+      # Additionally, each of the subselects and the final union select is given
+      # an alias to comply with MySQL requirements.
+      # These aliases are added directly instead of using Arel `as`, because it
+      # uses the keyword 'AS' in SQL generated for Oracle, which is invalid for
+      # table aliases.
       union_query_sql = '('
-      union_query_sql += '(' + union_parts.shift.to_sql + ')'
-      union_parts.each do |part|
-        union_query_sql += ' UNION (' + part.to_sql + ')'
+      union_query_sql += 'SELECT * FROM (' + union_parts.shift.to_sql + ') union_0'
+      union_parts.each_with_index do |part, idx|
+        union_query_sql += ' UNION SELECT * FROM (' + part.to_sql + ") union_#{idx + 1}"
       end
       union_query_sql += ') subselect'
 
@@ -127,7 +130,8 @@ module Workhorse
       else
         select = Arel::SelectManager.new(ActiveRecord::Base, Arel.sql(union_query_sql))
       end
-      select = order(select.project(Arel.star))
+      select = table.project(Arel.star).where(table[:id].in(select.project(:id)))
+      select = order(select)
 
       # Limit number of records
       select = agnostic_limit(select, limit)
@@ -145,12 +149,12 @@ module Workhorse
       return Workhorse::DbJob.find_by_sql(select.to_sql)
     end
 
-    # Returns a fresh Arel select manager containing all waiting jobs, ordered
-    # with {#order}.
+    # Returns a fresh Arel select manager containing the id of all waiting jobs,
+    # ordered with {#order}.
     #
     # @return [Arel::SelectManager] the select manager
-    def valid_ordered_select
-      select = table.project(table[Arel.star])
+    def valid_ordered_select_id
+      select = table.project(table[:id])
       select = select.where(table[:state].eq(:waiting))
       select = select.where(table[:perform_at].lteq(Time.now).or(table[:perform_at].eq(nil)))
       return order(select)
@@ -185,7 +189,7 @@ module Workhorse
     #
     # @return [Array] an array of unique queue names
     def valid_queues
-      select = valid_ordered_select
+      select = valid_ordered_select_id
 
       # Restrict queues that are currently in progress
       bad_states = [Workhorse::DbJob::STATE_LOCKED, Workhorse::DbJob::STATE_STARTED]

data/test/workhorse/worker_test.rb

@@ -150,6 +150,7 @@ class Workhorse::WorkerTest < WorkhorseTest
   def test_order_with_priorities
     Workhorse.enqueue BasicJob.new(some_param: 6, sleep_time: 0), priority: 4
     Workhorse.enqueue BasicJob.new(some_param: 4, sleep_time: 0), priority: 3
+    sleep 1
     Workhorse.enqueue BasicJob.new(some_param: 5, sleep_time: 0), priority: 3
     Workhorse.enqueue BasicJob.new(some_param: 3, sleep_time: 0), priority: 2
     Workhorse.enqueue BasicJob.new(some_param: 2, sleep_time: 0), priority: 1

data/workhorse.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 0.3.6 ruby lib
+# stub: workhorse 0.3.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2018-11-14"
+  s.date = "2018-12-17"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "workhorse.gemspec".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze
   s.test_files = ["test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.