sunspot 0.10.9 → 1.0.0

data/lib/sunspot/session_proxy/sharding_session_proxy.rb

@@ -0,0 +1,206 @@
+require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
+
+module Sunspot
+  module SessionProxy
+    # 
+    # This is a generic abstract implementation of a session proxy that allows
+    # Sunspot to be used with a distributed (sharded) Solr deployment. Concrete
+    # subclasses should implement the #session_for method, which takes a
+    # searchable object and returns a Session that points to the appropriate
+    # Solr shard for that object. Subclasses should also implement the
+    # #all_sessions object, which returns the collection of all sharded Session
+    # objects.
+    #
+    # The class is initialized with a session that points to the Solr instance
+    # used to perform searches. Searches will have the +:shards+ param injected,
+    # containing references to the Solr instances returned by #all_sessions.
+    #
+    # For more on distributed search, see:
+    # http://wiki.apache.org/solr/DistributedSearch
+    #
+    # The following methods are not supported (although subclasses may in some
+    # cases be able to support them):
+    #
+    # * batch
+    # * config
+    # * remove_by_id
+    # * remove_by_id!
+    # * remove_all with an argument
+    # * remove_all! with an argument
+    #
+    class ShardingSessionProxy < AbstractSessionProxy
+      not_supported :batch, :config, :remove_by_id, :remove_by_id!
+
+      # 
+      # +search_session+ is the session that should be used for searching.
+      #
+      def initialize(search_session = Sunspot.session.new)
+        @search_session = search_session
+      end
+
+      # 
+      # Return the appropriate shard session for the object.
+      #
+      # <strong>Concrete subclasses must implement this method.</strong>
+      #
+      def session_for(object)
+        raise NotImplementedError
+      end
+
+      # 
+      # Return all shard sessions.
+      #
+      # <strong>Concrete subclasses must implement this method.</strong>
+      #
+      def all_sessions
+        raise NotImplementedError
+      end
+
+      # 
+      # See Sunspot.index
+      #
+      def index(*objects)
+        using_sharded_session(objects) { |session, group| session.index(group) }
+      end
+
+      # 
+      # See Sunspot.index!
+      #
+      def index!(*objects)
+        using_sharded_session(objects) { |session, group| session.index!(group) }
+      end
+
+      # 
+      # See Sunspot.remove
+      #
+      def remove(*objects)
+        using_sharded_session(objects) { |session, group| session.remove(group) }
+      end
+
+      # 
+      # See Sunspot.remove!
+      #
+      def remove!(*objects)
+        using_sharded_session(objects) { |session, group| session.remove!(group) }
+      end
+
+      # 
+      # If no argument is passed, behaves like Sunspot.remove_all
+      #
+      # If an argument is passed, will raise NotSupportedError, as the proxy
+      # does not know which session(s) to which to delegate this operation.
+      #
+      def remove_all(clazz = nil)
+        if clazz
+          raise NotSupportedError, "Sharding session proxy does not support remove_all with an argument."
+        else
+          all_sessions.each { |session| session.remove_all }
+        end
+      end
+
+      # 
+      # If no argument is passed, behaves like Sunspot.remove_all!
+      #
+      # If an argument is passed, will raise NotSupportedError, as the proxy
+      # does not know which session(s) to which to delegate this operation.
+      #
+      def remove_all!(clazz = nil)
+        if clazz
+          raise NotSupportedError, "Sharding session proxy does not support remove_all! with an argument."
+        else
+          all_sessions.each { |session| session.remove_all! }
+        end
+      end
+
+      # 
+      # Commit all shards. See Sunspot.commit
+      #
+      def commit
+        all_sessions.each { |session| session.commit }
+      end
+
+      # 
+      # Commit all dirty sessions. Only dirty sessions will be committed.
+      #
+      # See Sunspot.commit_if_dirty
+      #
+      def commit_if_dirty
+        all_sessions.each { |session| session.commit_if_dirty }
+      end
+
+      # 
+      # Commit all delete-dirty sessions. Only delete-dirty sessions will be
+      # committed.
+      # 
+      # See Sunspot.commit_if_delete_dirty
+      #
+      def commit_if_delete_dirty
+        all_sessions.each { |session| session.commit_if_delete_dirty }
+      end
+
+      # 
+      # Instantiate a new Search object, but don't execute it. The search will
+      # have an extra :shards param injected into the query, which will tell the
+      # Solr instance referenced by the search session to search across all
+      # shards.
+      #
+      # See Sunspot.new_search
+      #
+      def new_search(*types)
+        shard_urls = all_sessions.map { |session| session.config.solr.url }
+        search = @search_session.new_search(*types)
+        search.build do
+          adjust_solr_params { |params| params[:shards] = shard_urls.join(',') }
+          # I feel a little dirty doing this.
+        end
+        search
+      end
+
+      # 
+      # Build and execute a new Search. The search will have an extra :shards
+      # param injected into the query, which will tell the Solr instance
+      # referenced by the search session to search across all shards.
+      #
+      # See Sunspot.search
+      #
+      def search(*types, &block)
+        new_search(*types).execute
+      end
+
+      # 
+      # True if any shard session is dirty. Note that directly using the
+      # #commit_if_dirty method is more efficient if that's what you're
+      # trying to do, since in that case only the dirty sessions are committed.
+      #
+      # See Sunspot.dirty?
+      #
+      def dirty?
+        all_sessions.any? { |session| session.dirty? }
+      end
+
+      # 
+      # True if any shard session is delete-dirty. Note that directly using the
+      # #commit_if_delete_dirty method is more efficient if that's what you're
+      # trying to do, since in that case only the delete-dirty sessions are
+      # committed.
+      #
+      def delete_dirty?
+        all_sessions.any? { |session| session.delete_dirty? }
+      end
+
+      private
+
+      # 
+      # Group the objects by which shard session they correspond to, and yield
+      # each session and is corresponding group of objects.
+      #
+      def using_sharded_session(objects)
+        grouped_objects = Hash.new { |h, k| h[k] = [] }
+        objects.flatten.each { |object| grouped_objects[session_for(object)] << object }
+        grouped_objects.each_pair do |session, group|
+          yield(session, group)
+        end
+      end
+    end
+  end
+end

data/lib/sunspot/session_proxy/thread_local_session_proxy.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
+
+module Sunspot
+  module SessionProxy
+    # 
+    # This class implements a session proxy that creates a different Session
+    # object for each thread. Any multithreaded application should use this
+    # proxy.
+    #
+    class ThreadLocalSessionProxy < AbstractSessionProxy
+      # The configuration with which the thread-local sessions are initialized.
+      attr_reader :config
+
+      delegate :batch, :commit, :commit_if_delete_dirty, :commit_if_dirty, :delete_dirty?, :dirty?, :index, :index!, :new_search, :remove, :remove!, :remove_all, :remove_all!, :remove_by_id, :remove_by_id!, :search, :to => :session
+
+      # 
+      # Optionally pass an existing Sunspot::Configuration object. If none is
+      # passed, a default configuration is used; it can then be modified using
+      # the #config attribute.
+      #
+      def initialize(config = Sunspot::Configuration.new)
+        @config = config
+      end
+
+      def session #:nodoc:
+        Thread.current[:sunspot_session] ||= Session.new(config)
+      end
+    end
+  end
+end

data/lib/sunspot/session_proxy.rb

@@ -0,0 +1,71 @@
+module Sunspot
+  # 
+  # This module contains several Session Proxy implementations, which can be
+  # used to decorate one or more Session objects and add extra functionality.
+  # The user can also implement their own Session Proxy classes; a Session Proxy
+  # must simply implement the same public API as the Sunspot::Session class.
+  #
+  # When implementing a session proxy, some methods of Session may not be
+  # practical, or even logical, to implement. In this case, the method should
+  # raise a Sunspot::SessionProxy::NotSupportedError (several methods in the
+  # built-in session proxies raise this error).
+  #
+  # To use a session proxy in normal Sunspot usage, you can use the
+  # Sunspot.session= method, which will cause Sunspot to delegate all of its
+  # session-related class methods (most of them) to the proxy. Session proxies
+  # can also easily be chained, although the details of chaining depend on the
+  # proxy implementation.
+  #
+  # ===== Example: Chain a MasterSlaveSessionProxy with a ThreadLocalSessionProxy
+  #
+  #   master_session = Sunspot::SessionProxy::ThreadLocalSessionProxy.new
+  #   slave_session = Sunspot::SessionProxy::ThreadLocalSessionProxy.new
+  #   master_session.config.solr.url = 'http://master-solr.local:9080/solr'
+  #   slave_session.config.solr.url = 'http://slave-solr.local:9080/solr'
+  #   Sunspot.session = Sunspot::SessionProxy::MasterSlaveSessionProxy.new(master_session, slave_session)
+  #
+  module SessionProxy
+    NotSupportedError = Class.new(StandardError)
+
+    autoload(
+      :ThreadLocalSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'thread_local_session_proxy'
+      )
+    )
+    autoload(
+      :MasterSlaveSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'master_slave_session_proxy'
+      )
+    )
+    autoload(
+      :ShardingSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'sharding_session_proxy'
+      )
+    )
+    autoload(
+      :ClassShardingSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'class_sharding_session_proxy'
+      )
+    )
+    autoload(
+      :IdShardingSessionProxy,
+      File.join(
+        File.dirname(__FILE__),
+        'session_proxy',
+        'id_sharding_session_proxy'
+      )
+    )
+  end
+end

data/lib/sunspot/setup.rb

@@ -4,15 +4,16 @@ module Sunspot
   # contents are built using the Sunspot.setup method.
   #
   class Setup #:nodoc:
+    attr_reader :class_object_id
     def initialize(clazz)
-      @clazz = clazz
+      @class_object_id = clazz.object_id
       @class_name = clazz.name
       @field_factories, @text_field_factories, @dynamic_field_factories,
         @field_factories_cache, @text_field_factories_cache,
         @dynamic_field_factories_cache = *Array.new(6) { Hash.new }
       @stored_field_factories_cache = Hash.new { |h, k| h[k] = [] }
       @dsl = DSL::Fields.new(self)
-      add_field_factory(:class, Type::ClassType)
+      add_field_factory(:class, Type::ClassType.instance)
     end
 
     def type_names
@@ -41,7 +42,7 @@ module Sunspot
     #
     def add_text_field_factory(name, options = {}, &block)
       stored = options[:stored]
-      field_factory = FieldFactory::Static.new(name, Type::TextType, options, &block)
+      field_factory = FieldFactory::Static.new(name, Type::TextType.instance, options, &block)
       @text_field_factories[name] = field_factory
       @text_field_factories_cache[field_factory.name] = field_factory
       if stored
@@ -57,9 +58,13 @@ module Sunspot
     # field_factories<Array>:: Array of dynamic field objects
     # 
     def add_dynamic_field_factory(name, type, options = {}, &block)
+      stored = options[:stored]
       field_factory = FieldFactory::Dynamic.new(name, type, options, &block)
       @dynamic_field_factories[field_factory.signature] = field_factory
       @dynamic_field_factories_cache[field_factory.name] = field_factory
+      if stored
+        @stored_field_factories_cache[field_factory.name] << field_factory
+      end
     end
 
     # 
@@ -93,7 +98,7 @@ module Sunspot
     # Builder method for evaluating the setup DSL
     #
     def setup(&block)
-      @dsl.instance_eval(&block)
+      Util.instance_eval_or_call(@dsl, &block)
     end
 
     # 
@@ -105,7 +110,7 @@ module Sunspot
       else
         raise(
           UnrecognizedFieldError,
-          "No field configured for #{@clazz.name} with name '#{field_name}'"
+          "No field configured for #{@class_name} with name '#{field_name}'"
         )
       end
     end
@@ -122,7 +127,7 @@ module Sunspot
         else
           raise(
             UnrecognizedFieldError,
-            "No text field configured for #{@clazz.name} with name '#{field_name}'"
+            "No text field configured for #{@class_name} with name '#{field_name}'"
           )
         end
       [text_field]
@@ -132,9 +137,13 @@ module Sunspot
     # Return one or more stored fields (can be either attribute or text fields)
     # for the given name.
     #
-    def stored_fields(field_name)
+    def stored_fields(field_name, dynamic_field_name = nil)
       @stored_field_factories_cache[field_name.to_sym].map do |field_factory|
-        field_factory.build
+        if dynamic_field_name
+          field_factory.build(dynamic_field_name)
+        else
+          field_factory.build
+        end
       end
     end
 
@@ -144,7 +153,7 @@ module Sunspot
     def dynamic_field_factory(field_name)
       @dynamic_field_factories_cache[field_name.to_sym] || raise(
         UnrecognizedFieldError,
-        "No dynamic field configured for #{@clazz.name} with name '#{field_name}'"
+        "No dynamic field configured for #{@class_name} with name '#{field_name}'"
       )
     end
 
@@ -304,7 +313,12 @@ module Sunspot
       # Sunspot::Setup:: New or existing setup for this class
       #
       def for!(clazz) #:nodoc:
-        setups[clazz.name.to_sym] ||= new(clazz)
+        setup = setups[clazz.name.to_sym]
+        if setup && setup.class_object_id == clazz.object_id
+          setup
+        else
+          setups[clazz.name.to_sym] = new(clazz)
+        end
       end
 
       private