Browse Source

Speedup optimizations to get bulk loader to work faster. Slowness problems were caused by core modules that set search_path and checked for existence of chado database on every query

spficklin 12 years ago
parent
commit
88c5a5ee89
3 changed files with 515 additions and 513 deletions
  1. 508 508
      tripal_core/api/tripal_core.api.inc
  2. 6 4
      tripal_core/tripal_core.module
  3. 1 1
      tripal_core/tripal_launch_jobs.php

File diff suppressed because it is too large
+ 508 - 508
tripal_core/api/tripal_core.api.inc


+ 6 - 4
tripal_core/tripal_core.module

@@ -28,10 +28,12 @@ function tripal_core_init() {
   // variable is always set.  In the case where a view needs to query the
   // chado schema when it is local to the Drupal database.  Otherwise the
   // search_path isn't set.  When tripal_db_set_active is called it
-  // automatically sets the serach path if chado is local to the
+  // automatically sets the search path if chado is local to the
   // Drupal database
-  $previous = tripal_db_set_active('chado');
-  tripal_db_set_active($previous);
+//  $previous = tripal_db_set_active('chado');
+//  tripal_db_set_active($previous);
+  tripal_db_set_chado_search_path('chado');
+
 
   // create the 'tripal' controlled volcabulary in chado but only if it doesn't already exist, and
   // only if the chado database is present.
@@ -64,7 +66,7 @@ function tripal_core_init() {
   db_query("SET DATESTYLE TO '%s'", 'MDY');
   
   // make sure the current version of chado is set
-  tripal_core_set_chado_version();
+  tripal_core_set_chado_version();  
   
 }
 

+ 1 - 1
tripal_core/tripal_launch_jobs.php

@@ -39,7 +39,7 @@ $user = user_load(array('name' => $username));
 
 
 fwrite($stdout, "Tripal Job Launcher\n");
-fwrite($stdout,"Running as user '$username'\n";
+fwrite($stdout, "Running as user ' . $username . '\n");
 fwrite($stdout, "-------------------\n");
 
 tripal_jobs_launch($do_parallel);

Some files were not shown because too many files changed in this diff