Pass the cache root's version to LRU collect after the get and set op…

…erations have finished mutating the cache. Fixes #507.
Netflix · Oct 28, 2015 · d48c082 · d48c082
1 parent e318ed7
commit d48c082
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 2 deletions.
diff --git a/lib/response/IdempotentResponse.js b/lib/response/IdempotentResponse.js
@@ -9,6 +9,7 @@ var getSize = require("./../support/getSize");
 var collectLru = require("./../lru/collect");
 
 var arrayClone = require("./../support/array-clone");
+var __version = require("./../internal/version");
 
 var isArray = Array.isArray;
 var isPathValue = require("./../support/isPathValue");
@@ -92,7 +93,8 @@ IdempotentResponse.prototype.ensureCollect = function ensureCollect(model) {
         var modelCache = modelRoot.cache;
 
         modelRoot.collectionScheduler.schedule(function collectThisPass() {
-            collectLru(modelRoot, modelRoot.expired, getSize(modelCache), model._maxSize, model._collectRatio);
+            collectLru(modelRoot, modelRoot.expired, getSize(modelCache),
+                model._maxSize, model._collectRatio, modelCache[__version]);
         });
     });
 

diff --git a/lib/response/get/getRequestCycle.js b/lib/response/get/getRequestCycle.js
@@ -4,6 +4,7 @@ var fastCat = require("./../../get/util/support").fastCat;
 var collectLru = require("./../../lru/collect");
 var getSize = require("./../../support/getSize");
 var AssignableDisposable = require("./AssignableDisposable");
+var __version = require("./../../internal/version");
 
 /**
  * The get request cycle for checking the cache and reporting
@@ -75,8 +76,10 @@ module.exports = function getRequestCycle(getResponse, model, results, observer,
 
                 var modelRoot = model._root;
                 var modelCache = modelRoot.cache;
+                var currentVersion = modelCache[__version];
+
                 collectLru(modelRoot, modelRoot.expired, getSize(modelCache),
-                        model._maxSize, model._collectRatio);
+                        model._maxSize, model._collectRatio, currentVersion);
             }
 
         });

diff --git a/test/falcor/get/get.dataSource-and-cache.spec.js b/test/falcor/get/get.dataSource-and-cache.spec.js
@@ -145,6 +145,44 @@ describe('DataSource and Partial Cache', function() {
                 }).
                 subscribe(noOp, done, done);
         });
+
+        it('should get a complex argument into a single arg and collect to max cache size.', function(done) {
+            var model = new Model({
+                cache: M(),
+                source: new LocalDataSource(Cache()),
+                maxSize: 0
+            });
+            var cache = model._root.cache;
+            var onNext = sinon.spy();
+            model.
+                get(['lolomo', 0, {to: 1}, 'item', 'title']).
+                doAction(onNext, noOp, function() {
+                    expect(onNext.calledOnce).to.be.ok;
+                    expect(strip(onNext.getCall(0).args[0])).to.deep.equals({
+                        json: {
+                            lolomo: {
+                                0: {
+                                    0: {
+                                        item: {
+                                            title: 'Video 0'
+                                        }
+                                    },
+                                    1: {
+                                        item: {
+                                            title: 'Video 1'
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    });
+                }).
+                finally(function() {
+                    expect(cache['$size']).to.equal(0);
+                    done();
+                }).
+                subscribe(noOp, done, noOp);
+        });
     });
     describe('_toJSONG', function() {
         it('should get multiple arguments into a single _toJSONG response.', function(done) {