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

chrome/common/extensions/docs/server2/compiled_file_system.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.
 
 class _CacheEntry(object):
   def __init__(self, cache_data, version):
     self._cache_data = cache_data
     self.version = version
 
 class CompiledFileSystem(object):
   """This class caches FileSystem data that has been processed.
   """
   class Factory(object):
     """A class to build a CompiledFileSystem backed by |file_system|.
     Set an explicit |store_type| for tests.
     """
     def __init__(self,
                  file_system,
                  object_store_creator_factory,
                  store_type=None):
       self._file_system = file_system
       self._object_store_creator_factory = object_store_creator_factory
       self._store_type = store_type
       self._identity_instance = None
 
-    def Create(self, populate_function, cls, category=None, version=None):
+    def Create(self, populate_function, cls, category=None):
       """Create a CompiledFileSystem that populates the cache by calling
       |populate_function| with (path, data), where |data| is the data that was
       fetched from |path|.
       The namespace for the file system is derived like ObjectStoreCreator: from
-      |cls| along with an optional |category| and |version|.
+      |cls| along with an optional |category|.
       """
       assert isinstance(cls, type)
       assert not cls.__name__[0].islower()  # guard against non-class types
       full_name = cls.__name__
       if category is not None:
         full_name = '%s/%s' % (full_name, category)
       # TODO(kalman): Fix ServerInstance.CreateForTest to not give an empty FS.
-      if self._file_system and self._file_system.GetVersion() is not None:
-        version = (self._file_system.GetVersion() +
-                   (version if version is not None else 0))
-      return self._Create(populate_function, full_name, version=version)
+      return self._Create(populate_function, full_name)
 
     def GetOrCreateIdentity(self):
       '''Handy helper to get or create the identity compiled file system.
       GetFromFile will return the file's contents.
       GetFromFileListing will return the directory list.
       '''
       if self._identity_instance is None:
         self._identity_instance = self._Create(lambda _, x: x, 'id')
       return self._identity_instance
 
-    def _Create(self, populate_function, full_name, version=None):
+    def _Create(self, populate_function, full_name):
       object_store_creator = self._object_store_creator_factory.Create(
           CompiledFileSystem,
           store_type=self._store_type)
       return CompiledFileSystem(
           self._file_system,
           populate_function,
-          object_store_creator.Create(category='%s/file' % full_name,
-                                      version=version),
-          object_store_creator.Create(category='%s/list' % full_name,
-                                      version=version))
+          object_store_creator.Create(category='%s/file' % full_name),
+          object_store_creator.Create(category='%s/list' % full_name))
 
   def __init__(self,
                file_system,
                populate_function,
                file_object_store,
                list_object_store):
     self._file_system = file_system
     self._populate_function = populate_function
     self._file_object_store = file_object_store
     self._list_object_store = list_object_store
@@ skipping 30 matching lines @@
     """
     if not path.endswith('/'):
       path += '/'
     version = self._file_system.Stat(path).version
     cache_entry = self._list_object_store.Get(path).Get()
     if (cache_entry is not None) and (version == cache_entry.version):
         return cache_entry._cache_data
     cache_data = self._populate_function(path, self._RecursiveList(path))
     self._list_object_store.Set(path, _CacheEntry(cache_data, version))
     return cache_data