queue_classic 3.2.0.RC1 → 4.0.0.pre.alpha1

data/README.md

@@ -1,41 +1,47 @@
 # queue_classic
+A simple, efficient worker queue for Ruby & PostgreSQL
 
-<p align="center">
-  <b>Simple, efficient worker queue for Ruby & PostgreSQL</b>
-  <br />
-  <a href="https://travis-ci.org/QueueClassic/queue_classic"><img src="http://img.shields.io/travis/QueueClassic/queue_classic/master.svg?style=flat" /></a>
+[![CircleCI](https://circleci.com/gh/QueueClassic/queue_classic/tree/master.svg?style=svg)](https://circleci.com/gh/QueueClassic/queue_classic/tree/master)
 
-  <a href="https://codeclimate.com/github/QueueClassic/queue_classic"><img src="http://img.shields.io/codeclimate/github/QueueClassic/queue_classic.svg?style=flat" /></a>
+[![Gem Version](http://img.shields.io/gem/v/queue_classic.svg?style=flat)](http://badge.fury.io/rb/queue_classic)
 
-  <a href="http://badge.fury.io/rb/queue_classic"><img src="http://img.shields.io/gem/v/queue_classic.svg?style=flat" alt="Gem Version" height="18"></a>
-</p>
+**IMPORTANT NOTE: This README is representing the current work for queue_classic, which is generally the pending next version. You can find the README for other versions:**
 
+You can always find the latest and previous releases here:
 
-**IMPORTANT NOTE REGARDING VERSIONS**
+https://github.com/QueueClassic/queue_classic/releases
 
-**This README is representing the current work for queue_classic edge [unstable]. You can find the README for other versions:**
+## What is queue_classic?
 
-- current release candidate: [v3.1.X](https://github.com/QueueClassic/queue_classic/tree/3-1-stable)
-- latest stable can be found: [v3.0.X](https://github.com/QueueClassic/queue_classic/tree/3-0-stable)
-- older stable: [v2.2.3](https://github.com/QueueClassic/queue_classic/tree/v2.2.3)
+queue_classic provides a simple interface to a PostgreSQL-backed message queue. queue_classic specializes in concurrent locking and minimizing database load while providing a simple, intuitive developer experience. queue_classic assumes that you are already using PostgreSQL in your production environment and that adding another dependency (e.g. redis, beanstalkd, 0mq) is undesirable.
 
+A major benefit is the ability to enqueue inside transactions, ensuring things are done only when your changes are commited.
 
-## What is queue_classic?
+## Other related projects
 
-queue_classic provides a simple interface to a PostgreSQL-backed message queue. queue_classic specializes in concurrent locking and minimizing database load while providing a simple, intuitive developer experience. queue_classic assumes that you are already using PostgreSQL in your production environment and that adding another dependency (e.g. redis, beanstalkd, 0mq) is undesirable.
+* [Queue Classic Plus](https://github.com/rainforestapp/queue_classic_plus) - adds support for retrying with specific exceptions, transaction processing of jobs, metric collection, etc
+* [Queue Classic Admin](https://github.com/QueueClassic/queue_classic_admin) - Admin interface for queue_classic
+* [Queue Classic Matchers](https://github.com/rainforestapp/queue_classic_matchers) - RSpec matchers for queue_classic
 
 ## Features
 
-* Leverage of PostgreSQL's listen/notify & row locking.
+* Leverage of PostgreSQL's listen/notify, skip locked, and row locking.
 * Support for multiple queues with heterogeneous workers.
 * JSON data format.
-* Forking workers.
 * Workers can work multiple queues.
-* Reduced row contention using a [relaxed FIFO](http://www.cs.tau.ac.il/~shanir/nir-pubs-web/Papers/Lock_Free.pdf) technique.
+* ~~Forking workers.~~ (currently apparently broken https://github.com/QueueClassic/queue_classic/issues/207, a WIP fix exists but isn't merged tested yet https://github.com/QueueClassic/queue_classic/pull/216)
+
+### Requirements
+
+For this version, the requirements are as follows:
+* Ruby 2.4, 2.5 or 2.6
+* Postgres ~> 9.6
+* Rubygem: pg ~> 0.17
 
-## Table of content
 
-* [Documentation](http://rubydoc.info/gems/queue_classic/2.2.3/frames)
+## Table of contents
+
+* [Documentation](https://www.rubydoc.info/gems/queue_classic/)
 * [Usage](#usage)
 * [Setup](#setup)
 * [Upgrade from earlier versions to V3.1](#upgrade-from-earlier-versions)
@@ -48,14 +54,14 @@ queue_classic provides a simple interface to a PostgreSQL-backed message queue.
 
 ## Usage
 
-There are 2 ways to use queue_classic.
+There are 2 ways to use queue_classic:
 
 * Producing Jobs
 * Working Jobs
 
 ### Producing Jobs
 
-The first argument is a string which represents a ruby object and a method name. The second argument(s) will be passed along as arguments to the method invocation defined by the first argument. The set of arguments will be encoded as JSON in the database.
+The first argument is a string which represents a ruby object and a method name. The second argument(s) will be passed along as arguments to the method defined by the first argument. The set of arguments will be encoded as JSON and stored in the database.
 
 ```ruby
 # This method has no arguments.
@@ -78,13 +84,13 @@ p_queue = QC::Queue.new("priority_queue")
 p_queue.enqueue("Kernel.puts", ["hello", "world"])
 ```
 
-There is also the possibility to schedule a job at a specified time in the future. It will not be worked off before that specified time.
+There is also the ability to schedule a job to run at a specified time in the future. The job will become processable after the specified time, and will be processed as-soon-as-possible.
 
 ```ruby
-# Specifying the job execution time exactly.
+# Specify the job execution time exactly
 QC.enqueue_at(Time.new(2024,01,02,10,00), "Kernel.puts", "hello future")
 
-# Specifying the job execution time as an offset in seconds.
+# Specify the job execution time as an offset in seconds
 QC.enqueue_in(60, "Kernel.puts", "hello from 1 minute later")
 ```
 
@@ -94,28 +100,33 @@ There are two ways to work jobs. The first approach is to use the Rake task. The
 
 #### Rake Task
 
-Require queue_classic in your Rakefile.
+Require queue_classic in your Rakefile:
 
 ```ruby
 require 'queue_classic'
 require 'queue_classic/tasks'
 ```
 
-Start the worker via the Rakefile.
+##### Work all queues
+Start the worker via the Rakefile:
+
 ```bash
 $ bundle exec rake qc:work
 ```
 
-Setup a worker to work a non-default queue.
+##### Work a single specific queue
+Setup a worker to work only a specific, non-default queue:
+
 ```bash
 $ QUEUE="priority_queue" bundle exec rake qc:work
 ```
 
-Setup a worker to work multiple queues.
+##### Work multiple queues
+In this scenario, on each iteration of the worker's loop, it will look for jobs in the first queue prior to looking at the second queue. This means that the first queue must be empty before the worker will look at the second queue.
+
 ```bash
 $ QUEUES="priority_queue,secondary_queue" bundle exec rake qc:work
 ```
-In this scenario, on each iteration of the worker's loop, it will look for jobs in the first queue prior to looking at the second queue. This means that the first queue must be empty before the worker will look at the second queue.
 
 #### Custom Worker
 
@@ -128,7 +139,6 @@ require 'queue_classic'
 FailedQueue = QC::Queue.new("failed_jobs")
 
 class MyWorker < QC::Worker
-
   # A job is a Hash containing these attributes:
   # :id Integer, the job id
   # :method String, containing the object and method
@@ -141,7 +151,7 @@ class MyWorker < QC::Worker
      # Do something with the job
      ...
   end
-  
+
   # This method will be called when an exception
   # is raised during the execution of the job.
   # First argument is the job that failed.
@@ -149,7 +159,6 @@ class MyWorker < QC::Worker
   def handle_failure(job, e)
     FailedQueue.enqueue(job[:method], *job[:args])
   end
-    
 end
 
 worker = MyWorker.new
@@ -158,13 +167,12 @@ trap('INT') { exit }
 trap('TERM') { worker.stop }
 
 loop do
-  job = worker.lock_job
-  Timeout::timeout(5) { worker.process(job) }
+  queue, job = worker.lock_job
+  Timeout::timeout(5) { worker.process(queue, job) }
 end
 ```
 
-The `qc:work` rake task uses `QC::Worker` by default. However, it's easy to
-inject your own worker class:
+The `qc:work` rake task uses `QC::Worker` by default. However, it's easy to inject your own worker class:
 
 ```ruby
 QC.default_worker_class = MyWorker
@@ -172,7 +180,7 @@ QC.default_worker_class = MyWorker
 
 ## Setup
 
-In addition to installing the rubygem, you will need to prepare your database. Database preparation includes creating a table and loading PL/pgSQL functions. You can issue the database preparation commands using `PSQL(1)` or use a database migration script.
+In addition to installing the rubygem, you will need to prepare your database. Database preparation includes creating a table and loading PL/pgSQL functions. You can issue the database preparation commands using `psql` or use a database migration script.
 
 ### Quick Start
 
@@ -187,28 +195,37 @@ $ ruby -r queue_classic -e "QC::Worker.new.work"
 
 ### Ruby on Rails Setup
 
-Declare dependencies in Gemfile.
+Declare dependencies in Gemfile:
+
 ```ruby
-source "https://rubygems.org"
-gem "queue_classic", "~> 3.0.0"
+source 'https://rubygems.org' do
+  gem 'queue_classic'
+end
 ```
 
-Add the database tables and stored procedures.
+Install queue_classic, which adds the needed migrations for the database tables and stored procedures:
 
-```
+```bash
 rails generate queue_classic:install
 bundle exec rake db:migrate
 ```
 
+#### Database connection
+
+Starting with with queue_classic 3.1, Rails is automatically detected and its connection is used. If you don't want to use the automatic database connection, set this environment variable to false: `export QC_RAILS_DATABASE=false`
+
+**Note on using ActiveRecord migrations:** If you use the migration, and you wish to use commands that reset the database from the stored schema (e.g. `rake db:reset`), your application must be configured with `config.active_record.schema_format = :sql` in `config/application.rb`. If you don't do this, the PL/pgSQL function that queue_classic creates will be lost when you reset the database.
+
 #### Active Job
 
-If you use Rails 4.2+, all you need to do is to set `config.active_job.queue_adapter = :queue_classic` in your `application.rb`. Everything else will be taken care for you. You can now use the Active Job functionality from now.
+If you use Rails 4.2+ and want to use Active Job, all you need to do is to set `config.active_job.queue_adapter = :queue_classic` in your `application.rb`. Everything else will be taken care for you. You can now use the Active Job functionality from now.
 
 Just for your information, queue_classic detects your database connection and uses it.
 
-### Rake Task Setup
 
-Alternatively, you can use the Rake task to prepare your database.
+### Plain Ruby Setup
+
+If you're not using rails, you can use the Rake task to prepare your database:
 
 ```bash
 # Creating the table and functions
@@ -218,35 +235,26 @@ $ bundle exec rake qc:create
 $ bundle exec rake qc:drop
 ```
 
-### Database connection
+#### Database connection
 
-#### Ruby on Rails
+By default, queue_classic will use the QC_DATABASE_URL falling back on DATABASE_URL. The URL must be in the following format: `postgres://username:password@localhost/database_name`. If you use Heroku's PostgreSQL service, this will already be set. If you don't want to set this variable, you can set the connection in an initializer. **QueueClassic will maintain its own connection to the database.** This may double the number of connections to your database.
 
-Starting with with queue_classic 3.1, Rails is automatically detected and its connection is used.
+## Upgrading from earlier versions
 
-If you don't want to use the automatic database connection, set this environment variable to false: `export QC_RAILS_DATABASE=false`
-
-**Note on using ActiveRecord migrations:** If you use the migration, and you wish to use commands that reset the database from the stored schema (e.g. `rake db:reset`), your application must be configured with `config.active_record.schema_format = :sql` in `config/application.rb`.  If you don't do this, the PL/pgSQL function that queue_classic creates will be lost when you reset the database.
-
-
-#### Other Ruby apps
-
-By default, queue_classic will use the QC_DATABASE_URL falling back on DATABASE_URL. The URL must be in the following format: `postgres://username:password@localhost/database_name`.  If you use Heroku's PostgreSQL service, this will already be set. If you don't want to set this variable, you can set the connection in an initializer. **QueueClassic will maintain its own connection to the database.** This may double the number of connections to your database.
-
-## Upgrade from earlier versions
 If you are upgrading from a previous version of queue_classic, you might need some new database columns and/or functions. Luckily enough for you, it is easy to do so.
 
 ### Ruby on Rails
 
-You just need to run those lines, which will copy the new required migrations:
+These two commands will add the newer migrations:
 
-```
+```bash
 rails generate queue_classic:install
 bundle exec rake db:migrate
 ```
+
 ### Rake Task
 
-This rake task will get you covered:
+This rake task will update you to the latest version:
 ```bash
 # Updating the table and functions
 $ bundle exec rake qc:update
@@ -256,30 +264,24 @@ $ bundle exec rake qc:update
 
 All configuration takes place in the form of environment vars. See [queue_classic.rb](https://github.com/QueueClassic/queue_classic/blob/master/lib/queue_classic.rb#L23-62) for a list of options.
 
-## JSON
-
-If you are running PostgreSQL 9.4 or higher, queue_classic will use the [jsonb](http://www.postgresql.org/docs/9.4/static/datatype-json.html) datatype for new tables. Versions 9.2 and 9.3 will use the `json` data type and versions 9.1 and lower will use the `text` data type.
-If you are updating queue_classic and are running PostgreSQL >= 9.4, run the following to switch to `jsonb`:
-```
-alter table queue_classic_jobs alter column args type jsonb using (args::jsonb);
-```
-
 ## Logging
 
 By default queue_classic does not talk very much.
 If you find yourself in a situation where you need to know what's happening inside QC, there are two different kind of logging you can enable: DEBUG and MEASURE.
 
 ### Measure
-This will output the time to process and that kind of thing. To enable it, set the `QC_MEASURE`:
 
-```
+This will output the time to process and some more statistics. To enable it, set the `QC_MEASURE`:
+
+```bash
 export QC_MEASURE="true"
 ```
 
 ### Debug
+
 You can enable the debug output by setting the `DEBUG` environment variable:
 
-```
+```bash
 export DEBUG="true"
 ```
 
@@ -287,31 +289,21 @@ export DEBUG="true"
 
 If you think you have found a bug, feel free to open an issue. Use the following template for the new issue:
 
-1. List Versions: Ruby, PostgreSQL, queue_classic.
+1. List your versions: Ruby, PostgreSQL, queue_classic.
 2. Define what you would have expected to happen.
 3. List what actually happened.
 4. Provide sample codes & commands which will reproduce the problem.
 
-If you have general questions about how to use queue_classic, send a message to the mailing list:
-
-https://groups.google.com/d/forum/queue_classic
-
 ## Hacking on queue_classic
 
-### Dependencies
-
-* Ruby 1.9.2
-* Postgres ~> 9.0
-* Rubygem: pg ~> 0.11.0
-* For JRuby, see [queue_classic_java](https://github.com/bdon/queue_classic_java)
-
 ### Running Tests
 
 ```bash
 $ bundle
 $ createdb queue_classic_test
 $ export QC_DATABASE_URL="postgres://username:pass@localhost/queue_classic_test"
-$ rake
+$ bundle exec rake                      # run all tests
+$ bundle exec ruby test/queue_test.rb   # run a single test
 ```
 
 ## License

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $:.unshift("lib")
 
 require "bundler/gem_tasks"

data/lib/generators/queue_classic/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 require 'active_record'
@@ -31,6 +33,10 @@ module QC
       if self.class.migration_exists?('db/migrate', 'update_queue_classic_3_1_0').nil?
         migration_template 'update_queue_classic_3_1_0.rb', 'db/migrate/update_queue_classic_3_1_0.rb'
       end
+
+      if self.class.migration_exists?('db/migrate', 'update_queue_classic_4_0_0').nil?
+        migration_template 'update_queue_classic_4_0_0.rb', 'db/migrate/update_queue_classic_4_0_0.rb'
+      end
     end
   end
 end

data/lib/generators/queue_classic/templates/add_queue_classic.rb

@@ -1,4 +1,6 @@
-class AddQueueClassic < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddQueueClassic < ActiveRecord::Migration[4.2]
   def self.up
     QC::Setup.create
   end

data/lib/generators/queue_classic/templates/update_queue_classic_3_0_0.rb

@@ -1,4 +1,6 @@
-class UpdateQueueClassic300 < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class UpdateQueueClassic300 < ActiveRecord::Migration[4.2]
   def self.up
     QC::Setup.update_to_3_0_0
   end

data/lib/generators/queue_classic/templates/update_queue_classic_3_0_2.rb

@@ -1,4 +1,6 @@
-class UpdateQueueClassic302 < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class UpdateQueueClassic302 < ActiveRecord::Migration[4.2]
   def self.up
     QC::Setup.update_to_3_0_0
   end

data/lib/generators/queue_classic/templates/update_queue_classic_3_1_0.rb

@@ -1,4 +1,6 @@
-class UpdateQueueClassic310 < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class UpdateQueueClassic310 < ActiveRecord::Migration[4.2]
   def self.up
     QC::Setup.update_to_3_1_0
   end

data/lib/generators/queue_classic/templates/update_queue_classic_4_0_0.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UpdateQueueClassic400 < ActiveRecord::Migration[4.2]
+  def self.up
+    QC::Setup.update_to_4_0_0
+  end
+
+  def self.down
+    QC::Setup.downgrade_from_4_0_0
+  end
+end

data/lib/queue_classic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "queue_classic/config"
 
 module QC
@@ -49,15 +51,7 @@ Please use the method QC.#{config_method} instead.
   end
 
   def self.default_conn_adapter
-    t = Thread.current
-    return t[:qc_conn_adapter] if t[:qc_conn_adapter]
-    adapter = if rails_connection_sharing_enabled?
-      ConnAdapter.new(ActiveRecord::Base.connection.raw_connection)
-    else
-      ConnAdapter.new
-    end
-
-    t[:qc_conn_adapter] = adapter
+    Thread.current[:qc_conn_adapter] ||= ConnAdapter.new(active_record_connection_share: rails_connection_sharing_enabled?)
   end
 
   def self.default_conn_adapter=(conn)
@@ -100,8 +94,7 @@ Please use the method QC.#{config_method} instead.
   # This will unlock all jobs any postgres' PID that is not existing anymore
   # to prevent any infinitely locked jobs
   def self.unlock_jobs_of_dead_workers
-    pid_column = default_conn_adapter.server_version < 90200 ? "procpid" : "pid"
-    default_conn_adapter.execute("UPDATE #{QC.table_name} SET locked_at = NULL, locked_by = NULL WHERE locked_by NOT IN (SELECT #{pid_column} FROM pg_stat_activity);")
+    default_conn_adapter.execute("UPDATE #{QC.table_name} SET locked_at = NULL, locked_by = NULL WHERE locked_by NOT IN (SELECT pid FROM pg_stat_activity);")
   end
 
   # private class methods

data/lib/queue_classic/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QC
   module Config
     # You can use the APP_NAME to query for
@@ -58,7 +60,6 @@ module QC
 
     # The worker class instantiated by QC's rake tasks.
     def default_worker_class
-
       @worker_class ||= (ENV["QC_DEFAULT_WORKER_CLASS"] && Kernel.const_get(ENV["QC_DEFAULT_WORKER_CLASS"]) ||
                          QC::Worker)