right_support 2.0.4 → 2.1.0

data/lib/right_support/db/cassandra_model.rb

@@ -19,7 +19,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 begin
   require 'cassandra/0.8'
 
@@ -125,29 +124,78 @@ module RightSupport::DB
     class << self
 
       @@logger = nil
-      @@conn = nil
-      
+
+      attr_reader   :default_keyspace
       attr_accessor :column_family
-      attr_writer :keyspace
+      attr_accessor :custom_operation_exception
+
+      @@current_keyspace = nil
+
+      @@connections = {}
 
       def config
         @@config
       end
-      
+
       def config=(value)
         @@config = value
       end
-      
+
       def logger=(l)
         @@logger = l
       end
-      
+
       def logger
-        @@logger 
+        @@logger
       end
 
+      # Return current keyspaces name as Array of String
+      #
+      # === Return
+      # (Array):: keyspaces names
+
+      def keyspaces
+        @@connections.keys
+      end
+
+      # Returns current active keyspace.
+      #
+      # === Return
+      # keyspace(String):: current_keyspace or default_keyspace
+
       def keyspace
-        @keyspace + "_" + (ENV['RACK_ENV'] || 'development')
+        @@current_keyspace || @@default_keyspace
+      end
+
+      # Sets the default keyspace
+      #
+      # === Parameters
+      # keyspace(String):: Set the default keyspace
+
+      def keyspace=(kyspc)
+        @@default_keyspace = (kyspc + "_" + (ENV['RACK_ENV'] || 'development'))
+      end
+
+      # Execute given block in kyspc context
+      #
+      # === Parameters
+      # kyspc(String):: Keyspace context
+      # block(Proc):: Code that will be called in keyspace context
+
+      def with_keyspace(kyspc, &block)
+        @@current_keyspace = (kyspc + "_" + (ENV['RACK_ENV'] || 'development'))
+        begin
+          block.call
+        rescue Exception => e
+          if !self.custom_operation_exception.nil? && self.custom_operation_exception.kind_of?(Proc)\
+                && e.kind_of?(Thrift::Exception)
+            custom_operation_exception.call
+          else
+            raise e
+          end
+        ensure
+          @@current_keyspace = nil
+        end
       end
 
       # Client connected to Cassandra server
@@ -156,8 +204,8 @@ module RightSupport::DB
       #
       # === Return
       # (Cassandra):: Client connected to server
-      def conn
-        return @@conn if @@conn
+      def conn()
+        @@connections ||= {}
 
         # TODO remove hidden dependency on ENV['RACK_ENV'] (maybe require config= to accept a sub hash?)
         config = @@config[ENV["RACK_ENV"]]
@@ -167,9 +215,9 @@ module RightSupport::DB
         thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
           if defined? Thrift::BinaryProtocolAccelerated
 
-        @@conn = Cassandra.new(keyspace, config["server"], thrift_client_options)
-        @@conn.disable_node_auto_discovery!
-        @@conn
+        @@connections[self.keyspace] ||= Cassandra.new(self.keyspace, config["server"], thrift_client_options)
+        @@connections[self.keyspace].disable_node_auto_discovery!
+        @@connections[self.keyspace]
       end
 
       # Get row(s) for specified key(s)
@@ -185,7 +233,7 @@ module RightSupport::DB
       def all(k, opt = {})
         real_get(k, opt)
       end
-      
+
       # Get row for specified primary key and convert into object of given class
       # Unless :count is specified, a maximum of 100 columns are retrieved
       #
@@ -240,6 +288,37 @@ module RightSupport::DB
         end
       end
 
+      # Get all rows for specified secondary key
+      #
+      # === Parameters
+      # index(String):: Name of secondary index
+      # key(String):: Index value that each selected row is required to match
+      # columns(Array|nil):: Names of columns to be retrieved, defaults to all
+      # opt(Hash):: Request options with only :consistency used
+      #
+      # === Return
+      # (OrderedHash):: Rows retrieved with each key, value is columns
+      def get_all_indexed_slices(index, key, columns = nil, opt = {})
+        rows = Cassandra::OrderedHash.new
+        start = ""
+        count = opt.delete(:count) || DEFAULT_COUNT
+        expr = do_op(:create_idx_expr, index, key, "EQ")
+        opt = opt[:consistency] ? {:consistency => opt[:consistency]} : {}
+        while true
+          clause = do_op(:create_idx_clause, [expr], start, count)
+          chunk = self.conn.get_indexed_slices(column_family, clause, columns, opt)
+          rows.merge!(chunk)
+          if chunk.size == count
+            # Assume there are more chunks, use last key as start of next get
+            start = chunk.keys.last
+          else
+          # This must be the last chunk
+            break
+          end
+        end
+        rows
+      end
+
       # Get all rows for specified secondary key
       #
       # === Parameters
@@ -382,16 +461,19 @@ module RightSupport::DB
         config = @@config[ENV["RACK_ENV"]]
         raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" unless config
 
+        return false if keyspace.nil?
+
         thrift_client_options = {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT}
         thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
           if defined? Thrift::BinaryProtocolAccelerated
 
-        @@conn = Cassandra.new(keyspace, config["server"], thrift_client_options)
-        @@conn.disable_node_auto_discovery!
+        connection = Cassandra.new(keyspace, config["server"], thrift_client_options)
+        connection.disable_node_auto_discovery!
+        @@connections[keyspace] = connection
         true
       end
 
-      # Cassandra ring for given keyspace
+      # Cassandra ring
       #
       # === Return
       # (Array):: Members of ring
@@ -422,7 +504,7 @@ module RightSupport::DB
       self.class.insert(key, attributes)
       true
     end
-    
+
     # Load object from Cassandra without modifying this object
     #
     # === Return

data/lib/right_support/net/http_client.rb

@@ -146,6 +146,10 @@ module RightSupport::Net
   # * :user and :password - for basic auth, will be replaced by a user/password available in the url
   # * :raw_response - return a low-level RawResponse instead of a Response
   # * :verify_ssl - enable ssl verification, possible values are constants from OpenSSL::SSL
+  #     * OpenSSL::SSL::VERIFY_NONE (default)
+  #     * OpenSSL::SSL::VERIFY_CLIENT_ONCE
+  #     * OpenSSL::SSL::VERIFY_PEER
+  #     * OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
   # * :timeout and :open_timeout - specify overall request timeout + socket connect timeout
   # * :ssl_client_cert, :ssl_client_key, :ssl_ca_file
   #

data/lib/right_support/rack/request_logger.rb

@@ -103,10 +103,11 @@ module RightSupport::Rack
         query_info,
         remote_addr,
         sess,
+        'Shard_id:' + (env['HTTP_X_SHARD'] || 'not set').to_s + ';',
         env["rack.request_uuid"] || ''
       ]
 
-      logger.info %Q{Processing %s "%s%s" (for %s)  %s  Request ID: %s} % params
+      logger.info %Q{Processing %s "%s%s" (for %s)  %s %s Request ID: %s} % params
     end
 
     # Log end of request
@@ -127,7 +128,7 @@ module RightSupport::Rack
       else
         '-'
       end
-      
+
       params = [
         duration,
         status,

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.0.4'
-  s.date    = '2012-05-01'
+  s.version = '2.1.0'
+  s.date    = '2012-06-16'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 4
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors: 
 - Tony Spataro
@@ -19,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 -07:00
-default_executable: 
+date: 2012-06-16 00:00:00 Z
 dependencies: []
 
 description: A toolkit of useful, reusable foundation code created by RightScale.
@@ -80,7 +79,6 @@ files:
 - lib/right_support/validation/openssl.rb
 - lib/right_support/validation/ssh.rb
 - right_support.gemspec
-has_rdoc: true
 homepage: https://github.com/rightscale/right_support
 licenses: []
 
@@ -112,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Reusable foundation code.