sessionm-cassandra_object 4.0.27 → 4.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c93aa37334ac497b7c97b5c0a1c04350502e230
-  data.tar.gz: 894c0e7ffac48271d0efa1b75defe0c67f7c3b47
+  metadata.gz: 23762bc97b24f059702d33a82198651dc12a5849
+  data.tar.gz: e5bdeca74f220ad8ade8f35a20b3751efd256eec
 SHA512:
-  metadata.gz: 4162a2b08feefbe4ed8cffa60826421344b6982f4e82b31627495dcf2e6dcfbe2f3af4cc666051918a868d2e410a9d97077f34c14e2d651c164206870a24684d
-  data.tar.gz: 936877179c08b6e3b3ffdf4d74d7384bc3da5e32dbafb29f4d361daa10b2a417be76e20fee99139858a7db7399aa495400112aee04a4882258eef77d9e899c70
+  metadata.gz: ffff8841ff8da649d139ddc24d54c0a28bbba823fbe25ec7a00cde71a3685bc33e2ac92b1973a09208f419ef0660a03a2ae840dc008bd4af57ed3f8120399a39
+  data.tar.gz: 88af7c90d6177d05afaf0d37f0eee2ecc563dd4ea9a48e3195d587dad18e88768f5f40389be12eedac86554de24c507cca1f14af4f9a33711feb4d79cf301312

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -99,8 +99,13 @@ module CassandraObject
 
           insert_into_options = ttl ? " USING TTL #{ttl}" : ''
 
+          key_fields = get_key_fields(column_family)
+          column_fields = get_column_fields(column_family)
+
+          key_parts = get_parts(column_family, key, key_fields)
           insert_query = values.map do |name, value|
-              "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{escape(key, key_type(column_family))}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
+            column_parts = get_parts(column_family, name, column_fields)
+            "  INSERT INTO \"#{column_family}\" (#{key_fields.map(&:first).join(', ')}, #{column_fields.map(&:first).join(', ')}, #{VALUE_FIELD}) VALUES (#{key_parts.map { |f, v| escape(v, get_type(column_family, f)) }.join(', ')}, #{column_parts.map { |f, v| escape(v, get_type(column_family, f)) }.join(', ')}, #{escape(value, value_type(column_family))})#{insert_into_options}"
           end.join("\n")
 
           if batch_mode?
@@ -118,12 +123,13 @@ module CassandraObject
           async = opts.try(:[], :async)
 
           columns = columns_options.flatten.compact
+          column_fields = get_column_fields(column_family)
 
           query =
             if columns.size == 1
-              "SELECT #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(columns.first, name_type(column_family))}"
+              "SELECT #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{key_clause(column_family, key)} AND #{column_clause(column_family, columns.first)}"
             else
-              "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
+              "SELECT #{column_fields.map(&:first).join(', ')}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{key_clause(column_family, key)}"
             end
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
@@ -132,7 +138,7 @@ module CassandraObject
           if columns.size == 1
             result.size > 0 ? result.first[VALUE_FIELD] : nil
           else
-            data = result.inject({}) { |hsh, row| hsh[row[NAME_FIELD]] = row[VALUE_FIELD]; hsh }
+            data = result.inject({}) { |hsh, row| hsh[column_string(row, column_fields)] = row[VALUE_FIELD]; hsh }
             columns.size > 0 ? data.slice(*columns.map(&:to_s)) : data
           end
         end
@@ -142,7 +148,7 @@ module CassandraObject
 
           name_fields = columns.map { |c| escape(c, name_type(column_family)) }.join(', ')
 
-          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
+          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{key_clause(column_family, key)};"
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           return result if async
@@ -158,7 +164,7 @@ module CassandraObject
 
           name_fields = columns.map { |c| "'#{c}'" }.join(', ')
 
-          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
+          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{key_clause(column_family, key)};"
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           return result if async
@@ -176,7 +182,7 @@ module CassandraObject
           fields = [fields] unless fields.is_a?(Array)
 
           fields.each do |field|
-            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(field, name_type(column_family))};"
+            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{key_clause(column_family, key)} AND #{column_clause(column_family, field)};"
             async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           end
         end
@@ -186,7 +192,7 @@ module CassandraObject
           fields = [fields] unless fields.is_a?(Array)
 
           hash.each do |field, by|
-            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(field, name_type(column_family))};"
+            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{key_clause(column_family, key)} AND #{column_clause(column_family, field)};"
             async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           end
         end
@@ -197,9 +203,9 @@ module CassandraObject
 
           query =
             if args.first.nil? || args.first.is_a?(Hash)
-              "DELETE FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))};"
+              "DELETE FROM \"#{column_family}\" WHERE #{key_clause(column_family, key)};"
             else
-              "DELETE \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(args.first, name_type(column_family))};"
+              "DELETE FROM \"#{column_family}\" WHERE #{key_clause(column_family, key)} AND #{column_clause(column_family, args.first)};"
             end
 
           async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
@@ -227,15 +233,21 @@ module CassandraObject
         def get_slice(column_family, key, column, start, finish, count, reversed, consistency, opts={})
           opts[:consistency] = consistency
 
-          query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
-          query << " AND #{NAME_FIELD} = #{escape(column, name_type(column_family))}" if column
-          query << " AND #{NAME_FIELD} >= #{escape(start, name_type(column_family))}" unless start.empty?
-          query << " AND #{NAME_FIELD} <= #{escape(finish, name_type(column_family))}" unless finish.empty?
-          query << " ORDER BY #{NAME_FIELD} #{reverse_comparator(column_family) ? 'ASC' : 'DESC'}" if reversed
+          column_fields = get_column_fields(column_family)
+
+          query = "SELECT #{column_fields.map(&:first).join(', ')}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{key_clause(column_family, key)}"
+          query << " AND #{column_clause(column_family, column)}" if column
+          query << " AND #{column_clause(column_family, start, '>=')}" unless start.empty?
+          query << " AND #{column_clause(column_family, finish, '<=')}" unless finish.empty?
+          if reversed
+            direction = reverse_comparator(column_family) ? 'ASC' : 'DESC'
+            query << " ORDER BY "
+            query << column_fields.map { |f, _| "#{f} #{direction}" }.join(', ')
+          end
           query << " LIMIT #{count}"
 
           self.execute(query, execute_options(opts)).inject({}) do |results, row|
-            results[decode(row[NAME_FIELD], name_type(column_family))] = decode(row[VALUE_FIELD], value_type(column_family))
+            results[column_string(row, column_fields)] = decode(row[VALUE_FIELD], value_type(column_family))
             results
           end
         end
@@ -329,32 +341,87 @@ CQL
         end
 
         def key_type(column_family)
-          self.cluster.keyspace(keyspace).table(column_family).column(KEY_FIELD).type.kind
+          get_type(column_family, KEY_FIELD)
         end
 
         def name_type(column_family)
-          self.cluster.keyspace(keyspace).table(column_family).column(NAME_FIELD).type.kind
+          get_type(column_family, NAME_FIELD)
         end
 
         def value_type(column_family)
-          self.cluster.keyspace(keyspace).table(column_family).column(VALUE_FIELD).type.kind
+          get_type(column_family, VALUE_FIELD)
+        end
+
+        def get_type(column_family, field)
+          cluster.keyspace(keyspace).table(column_family).column(field).type.kind
+        end
+
+        def get_key_fields(column_family)
+          cluster.keyspace(keyspace).table(column_family).columns.select { |c| c.name =~ /^key/ }.map { |c| [c.name, c.type.kind] }
+        end
+
+        def get_column_fields(column_family)
+          cluster.keyspace(keyspace).table(column_family).columns.select { |c| c.name =~ /^column/ }.map { |c| [c.name, c.type.kind] }
         end
 
         def reverse_comparator(column_family)
           self.cluster.keyspace(keyspace).table(column_family).send(:clustering_order).first == :desc
         end
 
+        def get_parts(column_family, val, fields)
+          val =
+            if fields.size > 1
+              Cassandra::Composite.new_from_packed(val.dup).parts
+            else
+              [val]
+            end
+
+          fields.each_with_index.map { |(field, type), idx| [field, normalize_composite_key_part(val[idx], type), type] }
+        end
+
+        def key_clause(column_family, val)
+          clause(column_family, val, get_key_fields(column_family))
+        end
+
+        def column_clause(column_family, val, operator='=')
+          clause(column_family, val, get_column_fields(column_family), operator)
+        end
+
+        def clause(column_family, val, fields, operator='=')
+          if operator == '='
+            get_parts(column_family, val, fields).map { |field, val, type| "#{field} #{operator} #{escape(val, type)}" }.join(' AND ')
+          else
+            field, val, type = get_parts(column_family, val, fields).first
+            "#{field} #{operator} #{escape(val, type)}"
+          end
+        end
+
         def escape(str, type)
           case type
           when :timeuuid
             convert_str_to_timeuuid str
           when :blob
             convert_str_to_hex str
+          when :int, :bigint
+            str
           else
             "'#{str}'"
           end
         end
 
+        def normalize_composite_key_part(val, type)
+          case type
+          when :timeuuid
+            SimpleUUID::UUID.new(val).to_s
+          when :int
+            val.unpack('N').first
+          when :bigint
+            Cassandra::Long.new(val).to_i
+          else
+            val
+          end
+        end
+
         def decode(val, type)
           case type
           when :timeuuid
@@ -373,6 +440,15 @@ CQL
         def convert_str_to_hex(str)
           '0x' << str.unpack('H*').first
         end
+
+        def column_string(row, fields)
+          if fields.size > 1
+            parts = fields.map { |f, t| decode(row[f], t) }
+            Cassandra::Composite.new(*parts).to_s
+          else
+            row[NAME_FIELD]
+          end
+        end
       end
     end
   end

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.27'
+  s.version = '4.0.28'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.27
+  version: 4.0.28
 platform: ruby
 authors:
 - Doug Youch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com