Devserver: have a separate ObjectStore namespace (both memcache and datastore)

chrome/common/extensions/docs/server2/server_instance.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from fnmatch import fnmatch
 import logging
 import mimetypes
 import os
 
 from api_data_source import APIDataSource
 from api_list_data_source import APIListDataSource
 from appengine_blobstore import AppEngineBlobstore
 from appengine_url_fetcher import AppEngineUrlFetcher
+from appengine_wrappers import GetAppVersion
 from branch_utility import BranchUtility
 from caching_file_system import CachingFileSystem
 from compiled_file_system import CompiledFileSystem
 from example_zipper import ExampleZipper
 from file_system import FileNotFoundError
 from github_file_system import GithubFileSystem
 from intro_data_source import IntroDataSource
 from local_file_system import LocalFileSystem
 from object_store_creator import ObjectStoreCreator
 from offline_file_system import OfflineFileSystem
@@ skipping 20 matching lines @@
 
   @staticmethod
   @memoize
   def GetOrCreateOffline(channel):
     '''Gets/creates a local ServerInstance, meaning that only resources local to
     the server - memcache, object store, etc, are queried. This amounts to not
     setting up the subversion nor github file systems.
     '''
     branch_utility = ServerInstance._GetOrCreateBranchUtility()
     branch = branch_utility.GetBranchNumberForChannelName(channel)
-    object_store_creator_factory = ObjectStoreCreator.Factory(branch)
+    object_store_creator_factory = ObjectStoreCreator.Factory(GetAppVersion(),
+                                                              branch)
     # No svn nor github file systems. Rely on the crons to fill the caches, and
     # for the caches to exist.
     return ServerInstance(
         channel,
         object_store_creator_factory,
         CachingFileSystem(OfflineFileSystem(SubversionFileSystem),
                           object_store_creator_factory),
         # TODO(kalman): convert GithubFileSystem to be wrappable in a
         # CachingFileSystem so that it can be replaced with an
         # OfflineFileSystem. Currently GFS doesn't set the child versions of
@@ skipping 15 matching lines @@
                           svn_constants.EXTENSIONS_PATH))
     else:
       svn_url = '/'.join((url_constants.SVN_BRANCH_URL,
                           branch,
                           'src',
                           svn_constants.EXTENSIONS_PATH))
 
     viewvc_url = svn_url.replace(url_constants.SVN_URL,
                                  url_constants.VIEWVC_URL)
 
-    object_store_creator_factory = ObjectStoreCreator.Factory(branch)
+    object_store_creator_factory = ObjectStoreCreator.Factory(GetAppVersion(),
+                                                              branch)
 
     svn_file_system = CachingFileSystem(
         SubversionFileSystem(AppEngineUrlFetcher(svn_url),
                              AppEngineUrlFetcher(viewvc_url)),
         object_store_creator_factory)
 
     return ServerInstance(channel,
                           object_store_creator_factory,
                           svn_file_system,
                           ServerInstance._GetOrCreateGithubFileSystem())
 
   @staticmethod
   def CreateForTest(file_system):
     return ServerInstance('test',
-                          ObjectStoreCreator.Factory('test'),
+                          ObjectStoreCreator.TestFactory(),
                           file_system,
                           None)
 
   @staticmethod
   def _GetOrCreateBranchUtility():
     if ServerInstance.branch_utility is None:
       ServerInstance.branch_utility = BranchUtility(
           url_constants.OMAHA_PROXY_URL,
           AppEngineUrlFetcher())
     return ServerInstance.branch_utility
@@ skipping 112 matching lines @@
 
     response.headers['x-frame-options'] = 'sameorigin'
     if content is None:
       response.set_status(404);
       response.out.write(templates.Render('404'))
     else:
       if not content:
         logging.error('%s had empty content' % path)
       response.headers['cache-control'] = 'max-age=300'
       response.out.write(content)