4232: theoretical fix of slow API response when getting pipeline and job contents...

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 0444528b6bda671a4327ef39fff1918fabebf9d8..ec5f7dd5cc1dab9ac1629b3d05336f604e230b21 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -43,7 +43,7 @@ class Job < ArvadosModel
     t.add :log
     t.add :runtime_constraints
     t.add :tasks_summary
-    t.add :dependencies
+#    t.add :dependencies
     t.add :nondeterministic
     t.add :repository
     t.add :supplied_script_version
@@ -194,23 +194,23 @@ class Job < ArvadosModel
     end
   end
 
-  def dependencies
-    deps = {}
-    queue = self.script_parameters.values
-    while not queue.empty?
-      queue = queue.flatten.compact.collect do |v|
-        if v.is_a? Hash
-          v.values
-        elsif v.is_a? String
-          v.match(/^(([0-9a-f]{32})\b(\+[^,]+)?,?)*$/) do |locator|
-            deps[locator.to_s] = true
-          end
-          nil
-        end
-      end
-    end
-    deps.keys
-  end
+  # def dependencies
+  #   deps = {}
+  #   queue = self.script_parameters.values
+  #   while not queue.empty?
+  #     queue = queue.flatten.compact.collect do |v|
+  #       if v.is_a? Hash
+  #         v.values
+  #       elsif v.is_a? String
+  #         v.match(/^(([0-9a-f]{32})\b(\+[^,]+)?,?)*$/) do |locator|
+  #           deps[locator.to_s] = true
+  #         end
+  #         nil
+  #       end
+  #     end
+  #   end
+  #   deps.keys
+  # end
 
   def permission_to_update
     if is_locked_by_uuid_was and !(current_user and

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 28345d51f507e8eebe9f9baf9a7640f4460a1041..86bd9c92323ebf7954a2e3d7de77ab434c9cf005 100644 (file)
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -15,10 +15,10 @@ class PipelineInstance < ArvadosModel
 
   api_accessible :user, extend: :common do |t|
     t.add :pipeline_template_uuid
-    t.add :pipeline_template, :if => :pipeline_template
+    # t.add :pipeline_template, :if => :pipeline_template
     t.add :name
     t.add :components
-    t.add :dependencies
+    # t.add :dependencies
     t.add :properties
     t.add :state
     t.add :components_summary
@@ -39,9 +39,9 @@ class PipelineInstance < ArvadosModel
      (Complete = 'Complete'),
     ]
 
-  def dependencies
-    dependency_search(self.components).keys
-  end
+  # def dependencies
+  #   dependency_search(self.components).keys
+  # end
 
   # if all components have input, the pipeline is Ready
   def components_look_ready?