Merge branch 'master' of https://github.com/mozilla/datazilla into de…

…veloper-ui
mozilla · Nov 21, 2012 · 212712d · 212712d
2 parents 8403874 + 12cf0d9
commit 212712d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 44 deletions.
diff --git a/crontab.txt b/crontab.txt
@@ -2,11 +2,6 @@
 PYTHON_ROOT=/usr/bin/
 DATAZILLA_HOME=/usr/local/datazilla
 
-*/2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_summary_cache --build --cache --project stoneridge
-*/2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_summary_cache --build --cache --project b2g
-*/2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_summary_cache --build --cache --project jetperf
-*/2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_summary_cache --build --cache --project test
-
 */2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_test_collections --load --project stoneridge
 */2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_test_collections --load --project b2g
 */2 * * * * $PYTHON_ROOT/python $DATAZILLA_HOME/manage.py populate_test_collections --load --project jetperf

diff --git a/datazilla/controller/admin/collection.py b/datazilla/controller/admin/collection.py
@@ -39,6 +39,8 @@ def load_test_collection(project):
         id = ptm.set_test_collection(new_name, "")
         ptm.set_test_collection_map(id, product_names[ new_name ])
 
+    ptm.cache_ref_data()
+
     ptm.disconnect()
 
 def get_test_collection_name(product, version, branch):

diff --git a/datazilla/model/base.py b/datazilla/model/base.py
@@ -1013,8 +1013,7 @@ def set_test_collection(self, name, description):
 
         id = self._insert_data_and_get_id('set_test_collection',
                                           [ name,
-                                            description,
-                                            name ])
+                                            description ])
 
         return id
 

diff --git a/datazilla/model/sql/perftest.json b/datazilla/model/sql/perftest.json
@@ -271,8 +271,7 @@
       "set_test_collection":{
 
          "sql":"INSERT INTO `test_collection` (`name`, `description`)
-                VALUES (?, ?)
-                ON DUPLICATE KEY UPDATE `name`=?",
+                VALUES (?, ?)",
 
          "host":"master_host"
       },

diff --git a/datazilla/webapp/apps/datazilla/views.py b/datazilla/webapp/apps/datazilla/views.py
@@ -238,41 +238,6 @@ def _get_test_run_summary(project, method, request, dm):
 
     json_data = '{}'
 
-    #Commenting the use of memcache out for now, the shared memcache
-    #in production is failing to return the expected data.  This works
-    #in development so it's likely a configuration issue of some sort.
-    """
-    if product_ids and (not test_ids) and (not platform_ids):
-
-        if len(product_ids) > 1:
-            extend_list = { 'data':[], 'columns':[] }
-            for id in product_ids:
-                key = utils.get_summary_cache_key(project, str(id), time_key)
-
-                compressed_json_data = cache.get(key)
-
-                if compressed_json_data:
-                    json_data = zlib.decompress( compressed_json_data )
-                    data = json.loads( json_data )
-                    extend_list['data'].extend( data['data'] )
-                    extend_list['columns'] = data['columns']
-
-            json_data = json.dumps(extend_list)
-
-
-        else:
-            key = utils.get_summary_cache_key(
-                project,
-                str(product_ids[0]),
-                time_key,
-                )
-            compressed_json_data = cache.get(key)
-
-            if compressed_json_data:
-                json_data = zlib.decompress( compressed_json_data )
-
-    else:
-    """
     table = dm.get_test_run_summary(time_ranges[time_key]['start'],
                                      time_ranges[time_key]['stop'],
                                      product_ids,