acts_as_shardable 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9466ea6e8a41550e3841d5c102b3b4d0e8eedb
-  data.tar.gz: 9435090d2a582ed16af98ddefaebfd7e856ca8ce
+  metadata.gz: 682f5dff4f95776b0c2a8d19e67d7521de209bb0
+  data.tar.gz: 9f1478defcf88c299bdba64aa6fec066c9b55bfe
 SHA512:
-  metadata.gz: cd4e8d246d4275f0de40694b306c6a1daaeec81a4f93ad6096dc8791efc9ca1db8d6fba65beeefe6a031fe9791f0029fcdcb9aa5b950ebcd31795b80b0ea90d9
-  data.tar.gz: 00ca76beffcd57f220e69409020bc5d3accfd6de3f4e1f317acdfc7717ce421b32826c8bd4ae05a6872e7bea39535f737f63bda026c96eafd14883dbe52fa176
+  metadata.gz: 4acf829b64e9391ded87d396a69daf4c20569850d76f51e967f6de2b8ab0acb22df8a74d42201030ac21330539838087f99ca78ba3bec3003ce1d633b6f30cb3
+  data.tar.gz: e1cc62c238ab080f94d802443289047d674222df0f871087d926e0095222bfa0c243f696d4467161565599d6277cd4e1c14ef1671c19180ea5c2c8eab7c3df4d

data/README.md

@@ -42,7 +42,7 @@ class CreateMod2Models < ActiveRecord::Migration
 
   def self.down
     shards.times do |i|
-      drop_table("cc_study_durations_%04d" % i)
+      drop_table("mod2_models_%04d" % i)
     end
   end
 

data/lib/acts_as_shardable.rb

@@ -24,37 +24,92 @@ module ActsAsShardable
       # Updates the associated record with values matching those of the instance attributes.
       # Returns the number of affected rows.
       define_method :_update_record do |attribute_names = self.attribute_names|
-        attributes_values = arel_attributes_with_values_for_update(attribute_names)
-        if attributes_values.empty?
-          0
+
+        was, is = changes[self.class.base_class.shard_method]
+
+        if was
+          # shard_column changed
+          table_was = self.class.base_class.sharding(was).table_name
+          table_is = self.class.base_class.sharding(is).table_name
+          raise WrongShardingError, "Please move from #{table_was} to #{table_is} manually."
         else
-          was, is = changes[self.class.base_class.shard_method]
-          if was
-            transaction do
-              self.class.base_class.sharding(is).unscoped.insert attributes_values
-
-              raise ReadOnlyRecord, "#{self.class.base_class.sharding(was)} is marked as readonly" if readonly?
-              destroy_associations
-              destroy_row if persisted?
-              @destroyed = true
-              freeze
-            end
+          # shard_column not changing
+          if locking_enabled?
+            lock_col = self.class.base_class.locking_column
+            previous_lock_value = self[lock_col]
+            self[lock_col] = previous_lock_value + 1
+
+            attribute_names += [lock_col].compact
+            attribute_names.uniq!
+
+            begin
+              relation = self.class.base_class.sharding(is).unscoped
+
+              affected_rows = relation.where(
+                  self.class.primary_key => id,
+                  lock_col => previous_lock_value,
+              ).update_all(
+                  Hash[attributes_for_update(attribute_names).map do |name|
+                    [name, _read_attribute(name)]
+                  end]
+              )
+
+              unless affected_rows == 1
+                raise ActiveRecord::StaleObjectError.new(self, "update")
+              end
+
+              affected_rows
 
-            1
+                # If something went wrong, revert the version.
+            rescue Exception
+              send(lock_col + '=', previous_lock_value)
+              raise
+            end
           else
-            self.class.base_class.sharding(public_send(self.class.base_class.shard_method)).unscoped._update_record attributes_values, id, id_was
+            attributes_values = arel_attributes_with_values_for_update(attribute_names)
+            if attributes_values.empty?
+              0
+            else
+              shard.unscoped._update_record attributes_values, id, id_was
+            end
           end
         end
       end
 
       private :_update_record
 
+
+      define_method :touch do |*names|
+        raise ActiveRecordError, "cannot touch on a new record object" unless persisted?
+
+        attributes = timestamp_attributes_for_update_in_model
+        attributes.concat(names)
+
+        unless attributes.empty?
+          current_time = current_time_from_proper_timezone
+          changes = {}
+
+          attributes.each do |column|
+            column = column.to_s
+            changes[column] = write_attribute(column, current_time)
+          end
+
+          changes[self.class.locking_column] = increment_lock if locking_enabled?
+
+          clear_attribute_changes(changes.keys)
+          primary_key = self.class.primary_key
+          shard.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
+        else
+          true
+        end
+      end
+
       # Creates a record with values matching those of the instance attributes
       # and returns its id.
       define_method :_create_record do |attribute_names = self.attribute_names|
         attributes_values = arel_attributes_with_values_for_create(attribute_names)
 
-        new_id = self.class.base_class.sharding(public_send(self.class.base_class.shard_method)).unscoped.insert attributes_values
+        new_id = shard.unscoped.insert attributes_values
         self.id ||= new_id if self.class.base_class.primary_key
 
         @new_record = false
@@ -63,6 +118,12 @@ module ActsAsShardable
 
       private :_create_record
 
+      define_method :shard do
+        self.class.base_class.sharding(self[self.class.base_class.shard_method])
+      end
+
+      private :shard
+
       self.class.send :define_method, :sharding do |column|
         i = column.to_i % shard_mod
         klass = "#{base_class.name.demodulize}_%04d" % i
@@ -81,7 +142,8 @@ module ActsAsShardable
                 self.const_get('ActiveRecord_Relation').class_exec do
                   def to_proto(*args)
                     msg_class = base_class.name.demodulize.pluralize
-                    Messages.const_get(msg_class).new(msg_class.underscore => map { |r| r.to_proto(*args) })
+                    module_name = base_class.name.deconstantize.constantize
+                    module_name::Messages.const_get(msg_class).new(msg_class.underscore => map { |r| r.to_proto(*args) })
                   end
                 end
               end
@@ -90,7 +152,12 @@ module ActsAsShardable
           end
         end
       end
+
+      define_method :real do
+        self.class.sharding(self[self.class.base_class.shard_method]).find(id)
+      end
     end
+
   end
 
 end

data/lib/acts_as_shardable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsShardable
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shardable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - scorix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler