[ARVADOS] updated: 7ce745d5645dc49c2833c1c617fd488bf3a62307

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/log.rb                     |    4 ++++
 .../20140423132913_add_object_owner_to_logs.rb     |   18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

       via  7ce745d5645dc49c2833c1c617fd488bf3a62307 (commit)
       via  fb72864bb6f2ee3ca702b914c97d06a76e01ab0d (commit)
      from  cd08497d1c914cd75fd8be08f9f3ef3bc75485f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7ce745d5645dc49c2833c1c617fd488bf3a62307
Merge: fb72864 cd08497
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 1 13:16:10 2014 -0400

    Merge branch 'master' of git.clinicalfuture.com:arvados
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.


commit fb72864bb6f2ee3ca702b914c97d06a76e01ab0d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 1 13:15:54 2014 -0400

    Another go at migration, uses batched loading and transactions, should have
    improved performance.

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index e7e5c1a..e6969be 100644
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -63,6 +63,10 @@ class Log < ArvadosModel
     self.event_at ||= Time.now
   end
 
+  def log_start_state
+    # don't log start state on logs
+  end
+
   def log_change(event_type)
     # Don't log changes to logs.
   end
diff --git a/services/api/db/migrate/20140423132913_add_object_owner_to_logs.rb b/services/api/db/migrate/20140423132913_add_object_owner_to_logs.rb
index b8ca438..61724f2 100644
--- a/services/api/db/migrate/20140423132913_add_object_owner_to_logs.rb
+++ b/services/api/db/migrate/20140423132913_add_object_owner_to_logs.rb
@@ -4,13 +4,19 @@ class AddObjectOwnerToLogs < ActiveRecord::Migration
   def up
     add_column :logs, :object_owner_uuid, :string
     act_as_system_user do
-      Log.find_each do |log|
-        if log.properties[:new_attributes]
-          log.object_owner_uuid = log.properties[:new_attributes][:owner_uuid]
-        elsif log.properties[:old_attributes]
-          log.object_owner_uuid = log.properties[:old_attributes][:owner_uuid]
+      Log.find_in_batches(:batch_size => 500) do |batch|
+        upd = {}
+        ActiveRecord::Base.transaction do
+          batch.each do |log|
+            if log.properties["new_attributes"]
+              log.object_owner_uuid = log.properties['new_attributes']['owner_uuid']
+              log.save
+            elsif log.properties["old_attributes"]
+              log.object_owner_uuid = log.properties['old_attributes']['owner_uuid']
+              log.save
+            end
+          end
         end
-        log.save!
       end
     end
   end

-----------------------------------------------------------------------


hooks/post-receive
--