oedipus 0.0.4 → 0.0.5

data/lib/oedipus/connection/pool.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+##
+# Oedipus Sphinx 2 Search.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+require "thread"
+
+module Oedipus
+  class Connection
+    # Provides a thread-safe pool of connections, with a specified TTL.
+    class Pool
+      # Initialize a new connection pool with the given options.
+      #
+      # @param [Hash] options
+      #   configuration for the pool
+      #
+      # @option [String] host
+      #   the host to use when allocating new connections
+      #
+      # @option [Fixnum] port
+      #   the port to use when allocating new connections
+      #
+      # @option [Fixnum] size
+      #   the maximum number of connections (defaults to 8)
+      #
+      # @option [Fixnum] ttl
+      #   the length of time for which any given connection should live
+      def initialize(options)
+        @host = options[:host]
+        @port = options[:port]
+
+        @size = options.fetch(:size, 8)
+        @ttl  = options.fetch(:ttl, 60)
+
+        @available = []
+        @used      = {}
+        @expiries  = {}
+        @condition = ConditionVariable.new
+        @lock      = Mutex.new
+
+        sweeper
+      end
+
+      # Acquire a connection from the pool, for the duration of a block.
+      #
+      # The release of the connection is done automatically.
+      #
+      # @yields [Oedipus::Mysql]
+      #   a connection object
+      def acquire
+        instance = nil
+        begin
+          @lock.synchronize do
+            if instance = @available.pop
+              @used[instance] = instance
+            elsif @size > (@available.size + @used.size)
+              instance = new_instance
+            else
+              @condition.wait(@lock)
+            end
+          end
+        end until instance
+
+        yield instance
+      ensure
+        release(instance)
+      end
+
+      private
+
+      def release(instance)
+        @lock.synchronize do
+          @available << @used.delete(instance) if instance
+          @condition.broadcast
+        end
+      end
+
+      def new_instance
+        Oedipus::Mysql.new(@host, @port).tap do |instance|
+          @used[instance]     = instance
+          @expiries[instance] = Time.now + @ttl
+        end
+      end
+
+      # Close connections past their ttl (runs in a new Thread)
+      def sweeper
+        Thread.new(@expiries, @available) do |exp, avail|
+          loop do
+            sleep 15
+            @lock.synchronize {
+              avail.each do |instance|
+                if exp[instance] < Time.now
+                  avail.delete(instance)
+                  exp.delete(instance)
+                  instance.close
+                end
+              end
+            }
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/oedipus/connection.rb

@@ -65,11 +65,21 @@ module Oedipus
     #   a Hash containing :host and :port
     #
     # The connection will be established on initialization.
+    #
+    # The underlying implementation uses a thread-safe connection pool.
     def initialize(options)
       options = options.kind_of?(String) ?
         Hash[ [:host, :port].zip(options.split(":")) ] :
         options
-      @conn = Oedipus::Mysql.new(options[:host], options[:port].to_i)
+
+      @pool = Pool.new(
+        host: options[:host],
+        port: options[:port].to_i,
+        size: options.fetch(:pool_size, 8),
+        ttl:  60
+      )
+
+      assert_valid_pool
     end
 
     # Acess a specific index for querying.
@@ -96,7 +106,7 @@ module Oedipus
     #
     # Note that SphinxQL does not support prepared statements.
     def multi_query(sql)
-      @conn.query(sql)
+      @pool.acquire { |conn| conn.query(sql) }
     end
 
     # Execute a single read query.
@@ -109,7 +119,7 @@ module Oedipus
     #
     # Note that SphinxQL does not support prepared statements.
     def query(sql)
-      @conn.query(sql).first
+      @pool.acquire { |conn| conn.query(sql).first }
     end
 
     # Execute a non-read query.
@@ -122,7 +132,13 @@ module Oedipus
     #
     # Note that SphinxQL does not support prepared statements.
     def execute(sql)
-      @conn.execute(sql)
+      @pool.acquire { |conn| conn.execute(sql) }
+    end
+
+    private
+
+    def assert_valid_pool
+      @pool.acquire { nil }
     end
   end
 end

data/lib/oedipus/version.rb

@@ -8,5 +8,5 @@
 ##
 
 module Oedipus
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/oedipus.rb

@@ -29,6 +29,7 @@ require "oedipus/query_builder"
 
 require "oedipus/connection_error"
 require "oedipus/connection"
+require "oedipus/connection/pool"
 
 require "oedipus/index"
 

data/spec/integration/connection_spec.rb

@@ -23,8 +23,6 @@ describe Oedipus::Connection do
 
   before(:each) { empty_indexes }
 
-  let(:conn) { Oedipus::Connection.new(searchd_host) }
-
   describe "#initialize" do
     context "with a hosname:port string" do
       context "on successful connection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12876920 !ruby/object:Gem::Requirement
+  requirement: &14417400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12876920
+  version_requirements: *14417400
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &12831220 !ruby/object:Gem::Requirement
+  requirement: &14717600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12831220
+  version_requirements: *14717600
 description: ! "== Sphinx 2 Comes to Ruby\n\nOedipus brings full support for Sphinx
   2 to Ruby:\n\n  - real-time indexes (insert, replace, update, delete)\n  - faceted
   search (variations on a base query)\n  - multi-queries (multiple queries executed
@@ -70,6 +70,7 @@ files:
 - lib/oedipus/comparison/outside.rb
 - lib/oedipus/comparison/shortcuts.rb
 - lib/oedipus/connection.rb
+- lib/oedipus/connection/pool.rb
 - lib/oedipus/connection_error.rb
 - lib/oedipus/index.rb
 - lib/oedipus/query_builder.rb
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 765099216142211442
+      hash: 4166348847258820467
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 765099216142211442
+      hash: 4166348847258820467
 requirements: []
 rubyforge_project: oedipus
 rubygems_version: 1.8.11