[Files.app] Change sort timing during metadata fetch

chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.js

 // 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.
 
 'use strict';
 
 /**
  * MetadataCache is a map from Entry to an object containing properties.
  * Properties are divided by types, and all properties of one type are accessed
  * at once.
@@ skipping 58 matching lines @@
    *   type - metadata type;
    *   callback - the callback.
    * @private
    */
   this.observers_ = [];
   this.observerId_ = 0;
 
   this.batchCount_ = 0;
   this.totalCount_ = 0;
 
+  this.currentCacheSize_ = 0;
+
   /**
    * Time of first get query of the current batch. Items updated later than this
    * will not be evicted.
    * @private
    */
   this.lastBatchStart_ = new Date();
 }
 
 /**
  * Observer type: it will be notified if the changed Entry is exactly the same
  * as the observed Entry.
  */
 MetadataCache.EXACT = 0;
 
 /**
  * Observer type: it will be notified if the changed Entry is an immediate child
  * of the observed Entry.
  */
 MetadataCache.CHILDREN = 1;
 
 /**
  * Observer type: it will be notified if the changed Entry is a descendant of
  * of the observer Entry.
  */
 MetadataCache.DESCENDANTS = 2;
 
 /**
- * Minimum number of items in cache to start eviction.
+ * Margin of the cache size. This amount of caches may be kept in addition.
  */
-MetadataCache.EVICTION_NUMBER = 1000;
+MetadataCache.EVICTION_THRESHOLD_MARGIN = 500;
 
 /**
  * @return {MetadataCache!} The cache with all providers.
  */
 MetadataCache.createFull = function() {
   var cache = new MetadataCache();
   cache.providers_.push(new FilesystemProvider());
   cache.providers_.push(new DriveProvider());
   cache.providers_.push(new ContentProvider());
   return cache;
@@ skipping 32 matching lines @@
  * @return {boolean} Whether all providers are ready.
  */
 MetadataCache.prototype.isInitialized = function() {
   for (var index = 0; index < this.providers_.length; index++) {
     if (!this.providers_[index].isInitialized()) return false;
   }
   return true;
 };
 
 /**
+ * Sets the size of cache. The actual cache size may be larger than the given
+ * value.
+ * @param {number} size The cache size to be set.
+ */
+MetadataCache.prototype.setCacheSize = function(size) {
+  this.currentCacheSize_ = size;
+
+  if (this.totalCount_ > this.currentEvictionThreshold_())
+    this.evict_();
+};
+
+/**
+ * Returns the current threshold to evict caches. When the number of caches
+ * exceeds this, the cache should be evicted.
+ * @return {number} Threshold to evict caches.
+ * @private
+ */
+MetadataCache.prototype.currentEvictionThreshold_ = function() {
+  return this.currentCacheSize_ * 2 + MetadataCache.EVICTION_THRESHOLD_MARGIN;
+};
+
+/**
  * Fetches the metadata, puts it in the cache, and passes to callback.
  * If required metadata is already in the cache, does not fetch it again.
  * @param {Entry|Array.<Entry>} entries The list of entries. May be just a
  *     single item.
  * @param {string} type The metadata type.
  * @param {function(Object)} callback The metadata is passed to callback.
  */
 MetadataCache.prototype.get = function(entries, type, callback) {
   if (!(entries instanceof Array)) {
     this.getOne(entries, type, callback);
@@ skipping 279 matching lines @@
   if (this.batchCount_ === 1)
     this.lastBatchStart_ = new Date();
 };
 
 /**
  * End batch updates. Notifies observers if all nested updates are finished.
  */
 MetadataCache.prototype.endBatchUpdates = function() {
   this.batchCount_--;
   if (this.batchCount_ !== 0) return;
-  if (this.totalCount_ > MetadataCache.EVICTION_NUMBER)
+  if (this.totalCount_ > this.currentEvictionThreshold_())
     this.evict_();
   for (var index = 0; index < this.observers_.length; index++) {
     var observer = this.observers_[index];
     var entries = [];
     var properties = {};
     for (var entryURL in observer.pending) {
       if (observer.pending.hasOwnProperty(entryURL) &&
           entryURL in this.cache_) {
         var entry = observer.pending[entryURL];
         entries.push(entry);
@@ skipping 34 matching lines @@
 
 /**
  * Removes the oldest items from the cache.
  * This method never removes the items from last batch.
  * @private
  */
 MetadataCache.prototype.evict_ = function() {
   var toRemove = [];
 
   // We leave only a half of items, so we will not call evict_ soon again.
-  var desiredCount = Math.round(MetadataCache.EVICTION_NUMBER / 2);
+  var desiredCount = this.currentEvictionThreshold();

[mtomasz, 2014/01/10 00:57:59]

Error in response to fileBrowserPrivate.searchDriveMetadata: TypeError: Object
#<MetadataCache> has no method 'currentEvictionThreshold'

currentEvictionThreshold -> currentEvictionThreshold_. Sorry for not catching
earlier.

[yoshiki, 2014/01/10 03:41:53]

Oops, sorry. I didn't catch it. I'll fix it soon.

   var removeCount = this.totalCount_ - desiredCount;
   for (var url in this.cache_) {
     if (this.cache_.hasOwnProperty(url) &&
         this.cache_[url].time < this.lastBatchStart_) {
       toRemove.push(url);
     }
   }
 
   toRemove.sort(function(a, b) {
     var aTime = this.cache_[a].time;
@@ skipping 486 matching lines @@
 
 /**
  * Handles the 'log' message from the worker.
  * @param {Array.<*>} arglist Log arguments.
  * @private
  */
 ContentProvider.prototype.onLog_ = function(arglist) {
   if (MetadataCache.log)  // Avoid log spam by default.
     console.log.apply(console, ['metadata:'].concat(arglist));
 };