extendi-cassandra_object 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb80f8a2bc136c5333d17e73df717ed4d2d33f8e28fa31ff30fdf7c8648e645
-  data.tar.gz: 57c5cb2c0939b8eca99790ac0b7f80a643e04617f31762138aea076a6e868bea
+  metadata.gz: 35c334a18f8c02dcc3fa80aedd61b32d750ad798199d4ead39c4fc5948cf6bc8
+  data.tar.gz: 5d31df130a07772d2334d0c8dc97d14cfd6dd6e7d2bf3f5369d5d84206698a34
 SHA512:
-  metadata.gz: ccdf0d3c0599fd1373d9dc214f5ebd3409acd43b80f27ace5951d5d31fad059bee0f8a78f719b2075fbe472e2639c1d4a7f510ad4570b49fa0e3db6f3fa2be34
-  data.tar.gz: c61f6366852d7bbff248c80dee0ae620c0b4b087ae4905b45982e255563f8c560fbfbee8d217cbf23292b9ef0c2395a392cb9470f154bb7da17820e32a703c23
+  metadata.gz: 4dce7aed3855ebacfef2b79df27b0b598ca3f7caaa144e468560acbf1b823435ed3564ecd12922909fda502f5f2db69562823fd4e304a533a13af5cf9352d339
+  data.tar.gz: f78455454cb989f92c9190a6c421570e3cbd402b7aa3613aa18d4a334c038ef65b3dafa054b477c0c5d7e5ddf9c587893cf1a69db4489f2aa6e8050b528efd30

data/.travis.yml

@@ -1,20 +1,21 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.4.1
-  - 2.4.2
   - 2.5.1
+  - 2.6.1
 env:
-  - CASSANDRA_VERSION=2.1.2
+  - SCYLLA_VERSION=3.0.2
   - CASSANDRA_VERSION=3.0.10
   - CASSANDRA_VERSION=3.9
-  - CASSANDRA_VERSION=2.1.2 ACTIVEMODEL_VERSION='< 5'
+  - SCYLLA_VERSION=3.0.2 ACTIVEMODEL_VERSION='< 5'
   - CASSANDRA_VERSION=3.0.10 ACTIVEMODEL_VERSION='< 5'
   - CASSANDRA_VERSION=3.9 ACTIVEMODEL_VERSION='< 5'
 
 jdk:
   - oraclejdk8
 
+services:
+  - docker
+
 before_install:
   - sudo apt-get install libjna-java
   - sudo apt-get install python-support
@@ -23,7 +24,21 @@ before_install:
   - sudo pip install ccm
 
 install:
-  - ccm create -n 1 -v $CASSANDRA_VERSION -i 127.0.0. -s -b test-cluster
-  - ccm start
-  - if [ -n "$ACTIVEMODEL_VERSION" ];then bundle add activemodel --version "$ACTIVEMODEL_VERSION"; fi
-  - bundle install
+  - |
+    if [ -n "$CASSANDRA_VERSION" ];then 
+      ccm create -n 1 -v $CASSANDRA_VERSION -i 127.0.0. -s -b test-cluster; 
+      ccm start;
+    fi
+    if [ -n "$SCYLLA_VERSION" ];then 
+      SCYLLA_IMAGE=scylladb/scylla:$SCYLLA_VERSION
+      docker pull $SCYLLA_IMAGE
+      docker run --name cassandra_test -d -p "9042:9042" -p "9160:9160" $SCYLLA_IMAGE
+      function check_scylla(){ docker exec -it cassandra_test nodetool status | grep UN; }
+      until check_scylla; do
+       echo "waiting..."
+      done
+    fi
+    if [ -n "$ACTIVEMODEL_VERSION" ];then 
+      bundle add activemodel --version "$ACTIVEMODEL_VERSION"; 
+    fi
+    bundle install

data/README.md

@@ -11,22 +11,20 @@ CREATE TABLE keyspace.table (
     column1 text,
     value blob,
     PRIMARY KEY (key, column1)
-) WITH 
-    COMPACT STORAGE
-    AND CLUSTERING ORDER BY (column1 ASC)
-    AND bloom_filter_fp_chance = 0.001
-    AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
+) WITH bloom_filter_fp_chance = 0.01
+    AND caching = {'keys': 'ALL', 'rows_per_partition': 'ALL'}
     AND comment = ''
-    AND compaction = {'min_sstable_size': '52428800', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
-    AND compression = {'chunk_length_kb': '64', 'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
-    AND dclocal_read_repair_chance = 0.0
+    AND compaction = {'class': 'SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}
+    AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+    AND crc_check_chance = 1.0
+    AND dclocal_read_repair_chance = 0.1
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 1.0
-    AND speculative_retry = 'NONE';
+    AND read_repair_chance = 0.0
+    AND speculative_retry = '99.0PERCENTILE';
 ```
 
 You can also use the a custom schema structure with the possible options at [this link](https://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlCreateTable.html#tabProp):
@@ -39,20 +37,20 @@ CREATE TABLE keyspace.table (
     field2 varchar,
     field3 float,
     PRIMARY KEY (key)
-) WITH 
-    bloom_filter_fp_chance = 0.001
-    AND caching = {'keys':'ALL', 'rows_per_partition':'NONE'}'
+) WITH bloom_filter_fp_chance = 0.01
+    AND caching = {'keys': 'ALL', 'rows_per_partition': 'ALL'}
     AND comment = ''
-    AND compaction = {'min_sstable_size': '52428800', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
-    AND compression = {'chunk_length_kb': '64', 'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
-    AND dclocal_read_repair_chance = 0.0
+    AND compaction = {'class': 'SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}
+    AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+    AND crc_check_chance = 1.0
+    AND dclocal_read_repair_chance = 0.1
     AND default_time_to_live = 0
     AND gc_grace_seconds = 864000
     AND max_index_interval = 2048
     AND memtable_flush_period_in_ms = 0
     AND min_index_interval = 128
-    AND read_repair_chance = 1.0
-    AND speculative_retry = 'NONE';
+    AND read_repair_chance = 0.0
+    AND speculative_retry = '99.0PERCENTILE';
 ```
 
 ## Installation

data/extendi-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'extendi-cassandra_object'
-  s.version = '1.0.17'
+  s.version = '1.0.18'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ['Duccio Giovannelli', 'gotime']
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activemodel', '<= 5.2')
+  s.add_runtime_dependency('activemodel', '>= 4.2.0', '< 6.0.0')
   s.add_runtime_dependency('cassandra-driver', '>= 3.2.3')
   s.add_runtime_dependency('lz4-ruby', '>= 0.3.3')
 

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -30,19 +30,24 @@ module CassandraObject
             str << "ALLOW FILTERING" if @scope.klass.allow_filtering
             return [] << str.delete_if(&:blank?) * ' '
           end
-          @scope.id_values.map do |id|
-            str = [
-                "SELECT #{select_string} FROM #{@scope.klass.column_family}",
-                where_string_async(id)
-            ]
-            str << "ALLOW FILTERING" if @scope.klass.allow_filtering
-            str.delete_if(&:blank?) * ' '
-          end
+
+          str = [
+            "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+            where_string_async(@scope.id_values)
+          ]
+          str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
+          [str.delete_if(&:blank?) * ' ']
         end
 
-        def where_string_async(id)
+        def where_string_async(ids)
           wheres = @scope.where_values.dup.select.each_with_index { |_, i| i.even? }
-          wheres << "#{@scope._key} = '#{id}'" if !id.nil?
+          if ids.present?
+            wheres << if ids.size > 1
+                        "#{@scope._key} IN (#{ids.map { |id| "'#{id}'" }.join(',')})"
+                      else
+                        "#{@scope._key} = '#{ids.first}'"
+                      end
+          end
           "WHERE #{wheres * ' AND '}" if wheres.any?
         end
       end
@@ -266,7 +271,7 @@ module CassandraObject
               AND caching = '{\"keys\":\"ALL\", \"rows_per_partition\":\"NONE\"}'
               AND comment = ''
               AND compaction = {'min_sstable_size': '52428800', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
-              AND compression = {'chunk_length_kb': '64', 'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+              AND compression = {'chunk_length_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}
               AND dclocal_read_repair_chance = 0.0
               AND default_time_to_live = 0
               AND gc_grace_seconds = 864000
@@ -276,24 +281,24 @@ module CassandraObject
               AND read_repair_chance = 1.0
               AND speculative_retry = 'NONE';"
           else
-            "#{stmt} WITH read_repair_chance = 0.0
-              AND dclocal_read_repair_chance = 0.1
-              AND gc_grace_seconds = 864000
-              AND bloom_filter_fp_chance = 0.01
-              AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
+            "#{stmt} WITH bloom_filter_fp_chance = 0.01
+              AND caching = {'keys': 'ALL', 'rows_per_partition': 'ALL'}
               AND comment = ''
-              AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold' : 32, 'min_threshold' : 4 }
-              AND compression = { 'chunk_length_in_kb' : 64, 'class' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
+              AND compaction = {'class': 'SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}
+              AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+              AND crc_check_chance = 1.0
+              AND dclocal_read_repair_chance = 0.1
               AND default_time_to_live = 0
-              AND speculative_retry = '99PERCENTILE'
-              AND min_index_interval = 128
+              AND gc_grace_seconds = 864000
               AND max_index_interval = 2048
-              AND crc_check_chance = 1.0;
+              AND memtable_flush_period_in_ms = 0
+              AND min_index_interval = 128
+              AND read_repair_chance = 0.0
+              AND speculative_retry = '99.0PERCENTILE';
             "
           end
         end
       end
-
     end
   end
 end

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -26,34 +26,39 @@ module CassandraObject
 
           if @scope.id_values.empty?
             str = [
-                "SELECT #{select_string} FROM #{@scope.klass.column_family}",
-                where_string_async(nil)
+              "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+              where_string_async(nil)
             ]
             str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
             return [] << str.delete_if(&:blank?) * ' '
           end
-          @scope.id_values.map do |id|
-            str = [
-                "SELECT #{select_string} FROM #{@scope.klass.column_family}",
-                where_string_async(id)
-            ]
-            str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
-            str.delete_if(&:blank?) * ' '
-          end
+          str = [
+            "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+            where_string_async(@scope.id_values)
+          ]
+          str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
+          [str.delete_if(&:blank?) * ' ']
         end
 
-        def where_string_async(id)
+        def where_string_async(ids)
           conditions = []
-          conditions << "#{@adapter.primary_key_column} = '#{id}'" if !id.nil?
+
+          if ids.present?
+            conditions << if ids.size > 1
+                            "#{@adapter.primary_key_column} IN (#{ids.map { |id| "'#{id}'" }.join(',')})"
+                          else
+                            "#{@adapter.primary_key_column} = '#{ids.first}'"
+                          end
+          end
+
           select_values = @scope.select_values.select { |sv| sv != :column1 }
           if select_values.size > 0
             select_str = select_values.size > 1 ? "column1 IN (#{select_values.map { |sv| '?' }.join(',')})" : 'column1 = ?'
             conditions << select_str
           end
           conditions += @scope.where_values.select.each_with_index { |_, i| i.even? }
-          return conditions.any? ? "WHERE #{conditions.join(' AND ')}" : nil
+          conditions.any? ? "WHERE #{conditions.join(' AND ')}" : nil
         end
-
       end
 
       def primary_key_column
@@ -299,7 +304,7 @@ module CassandraObject
               AND caching = '{\"keys\":\"ALL\", \"rows_per_partition\":\"NONE\"}'
               AND comment = ''
               AND compaction = {'min_sstable_size': '52428800', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'}
-              AND compression = {'chunk_length_kb': '64', 'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+              AND compression = {'chunk_length_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}
               AND dclocal_read_repair_chance = 0.0
               AND default_time_to_live = 0
               AND gc_grace_seconds = 864000
@@ -309,19 +314,20 @@ module CassandraObject
               AND read_repair_chance = 1.0
               AND speculative_retry = 'NONE';"
           else
-            "#{stmt} WITH read_repair_chance = 0.0
-              AND dclocal_read_repair_chance = 0.1
-              AND gc_grace_seconds = 864000
-              AND bloom_filter_fp_chance = 0.01
-              AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
+            "#{stmt} WITH bloom_filter_fp_chance = 0.01
+              AND caching = {'keys': 'ALL', 'rows_per_partition': 'ALL'}
               AND comment = ''
-              AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold' : 32, 'min_threshold' : 4 }
-              AND compression = { 'chunk_length_in_kb' : 64, 'class' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
+              AND compaction = {'class': 'SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}
+              AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+              AND crc_check_chance = 1.0
+              AND dclocal_read_repair_chance = 0.1
               AND default_time_to_live = 0
-              AND speculative_retry = '99PERCENTILE'
-              AND min_index_interval = 128
+              AND gc_grace_seconds = 864000
               AND max_index_interval = 2048
-              AND crc_check_chance = 1.0;
+              AND memtable_flush_period_in_ms = 0
+              AND min_index_interval = 128
+              AND read_repair_chance = 0.0
+              AND speculative_retry = '99.0PERCENTILE';
             "
 
           end

data/lib/cassandra_object/attribute_methods.rb

@@ -5,9 +5,9 @@ module CassandraObject
 
     included do
       if ActiveModel::VERSION::STRING < '3.2'
-        attribute_method_suffix("", "=")
+        attribute_method_suffix('', '=')
       else
-        attribute_method_suffix("=")
+        attribute_method_suffix('=')
       end
 
       # (Alias for the protected read_attribute method).

data/lib/cassandra_object/persistence.rb

@@ -4,10 +4,10 @@ module CassandraObject
 
     included do
       class_attribute :batch_statements
+      attr_accessor :store_updated_at
     end
 
     module ClassMethods
-
       def ttl=(value)
         @ttl = value
       end

data/lib/cassandra_object/timestamps.rb

@@ -15,7 +15,11 @@ module CassandraObject
 
       before_update if: :changed? do
         if self.class.timestamps
-          self.updated_at = Time.current
+          if store_updated_at.present?
+            self.updated_at = store_updated_at
+          else
+            self.updated_at = Time.current
+          end
         end
       end
     end

data/test/unit/timestamps_test.rb

@@ -21,7 +21,30 @@ class CassandraObject::TimestampsTest < CassandraObject::TestCase
   test 'created_at sets only if nil' do
     time = 5.days.ago
     issue = Issue.create created_at: time
-
     assert_equal time, issue.created_at
   end
+
+  test 'set updated_at to now when not passed as an attribute' do
+    udate = 1.year.ago
+    issue = Issue.create(description: 'foo', updated_at: udate)
+    assert_equal udate, issue.updated_at
+    issue.update_attributes(description: 'test')
+    assert_not_equal udate, issue.updated_at
+  end
+
+  test 'set updated_at to passed value' do
+    issue = Issue.create(description: 'foo')
+    updated_at = issue.updated_at
+    new_updated_at = updated_at + 5.days
+    issue.update_attributes(description: 'bar', store_updated_at: new_updated_at)
+    assert_equal new_updated_at, issue.updated_at
+  end
+
+  test 'set updated_at to passed value even if is equal to the stored value' do
+    udate = 1.year.ago
+    issue = Issue.create(description: 'foo', updated_at: udate)
+    assert_equal udate, issue.updated_at
+    issue.update_attributes(description: 'bar', store_updated_at: issue.updated_at)
+    assert_equal udate, issue.updated_at
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
@@ -198,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel