Merge pull request Netflix#695 from michaelbpaulson/finish-hard-keys

feat(performance): The last of the statically referred to keys.

lib/deref/hasValidParentReference.js

@@ -1,5 +1,3 @@
-var __parent = require("./../internal/parent");
-var __invalidated = require("./../internal/invalidated");
 module.exports = function fromWhenceYeCame() {
     var reference = this._referenceContainer;
 
@@ -20,12 +18,12 @@ module.exports = function fromWhenceYeCame() {
     }
 
     // Its been disconnected (set over or collected) from the graph.
-    if (reference && reference[__parent] === undefined) {
+    if (reference && reference.ツparent === undefined) {
         return false;
     }
 
     // The reference has expired but has not been collected from the graph.
-    if (reference && reference[__invalidated]) {
+    if (reference && reference.ツinvalidated) {
         return false;
     }
 

lib/get/followReference.js

@@ -1,5 +1,4 @@
-var hardLink = require("./../get/util/hardlink");
-var createHardlink = hardLink.create;
+var createHardlink = require("./../support/createHardlink");
 var onValue = require("./../get/onValue");
 var isExpired = require("./../get/util/isExpired");
 var $ref = require("./../types/ref");

lib/get/getCache.js

@@ -1,4 +1,3 @@
-var $modelCreated = require("./../internal/model-created");
 var isInternalKey = require("./../support/isInternalKey");
 
 /**
@@ -42,8 +41,7 @@ function _copyCache(node, out, fromKey) {
             // 2: A $type-value node.
             // 3: undefined
             // We will strip out 3
-            return (!isInternalKey(k) || k === $modelCreated) &&
-                node[k] !== undefined;
+            return !isInternalKey(k) && node[k] !== undefined;
         }).
         forEach(function(key) {
             var cacheNext = node[key];
@@ -56,7 +54,7 @@ function _copyCache(node, out, fromKey) {
             // Paste the node into the out cache.
             if (cacheNext.$type) {
                 var isObject = cacheNext.value && typeof cacheNext.value === "object";
-                var isUserCreatedcacheNext = !cacheNext[$modelCreated];
+                var isUserCreatedcacheNext = !cacheNext.ツmodelCreated;
                 var value;
                 if (isObject || isUserCreatedcacheNext) {
                     value = cloneBoxedValue(cacheNext);

lib/get/getVersion.js

@@ -1,12 +1,10 @@
-var __version = require("./../internal/version");
-
 module.exports = function _getVersion(model, path) {
     // ultra fast clone for boxed values.
     var gen = model._getValueSync({
         _boxed: true,
         _root: model._root,
         _treatErrorsAsValues: model._treatErrorsAsValues
     }, path, true).value;
-    var version = gen && gen[__version];
+    var version = gen && gen.ツversion;
     return (version == null) ? -1 : version;
 };

lib/get/onValue.js

@@ -3,7 +3,6 @@ var clone = require("./util/clone");
 var $ref = require("./../types/ref");
 var $atom = require("./../types/atom");
 var $error = require("./../types/error");
-var $modelCreated = require("./../internal/model-created");
 
 module.exports = function onValue(model, node, seed, depth, outerResults,
                                   branchInfo, requestedPath, optimizedPath,
@@ -46,7 +45,7 @@ module.exports = function onValue(model, node, seed, depth, outerResults,
 
     else if (isJSONG) {
         var isObject = node.value && typeof node.value === "object";
-        var isUserCreatedNode = !node[$modelCreated];
+        var isUserCreatedNode = !node.ツmodelCreated;
         if (isObject || isUserCreatedNode) {
             valueNode = clone(node);
         } else {

lib/get/onValueType.js

@@ -4,7 +4,6 @@ var onError = require("./onError");
 var onValue = require("./onValue");
 var onMissing = require("./onMissing");
 var isMaterialized = require("./util/isMaterialzed");
-var __invalidated = require("./../internal/invalidated");
 var expireNode = require("./../support/expireNode");
 
 /**
@@ -37,7 +36,7 @@ module.exports = function onValueType(
 
     // If there are expired value, then report it as missing
     else if (isExpired(node)) {
-        if (!node[__invalidated]) {
+        if (!node.ツinvalidated) {
             expireNode(node, model._root.expired, model._root);
         }
         onMissing(model, path, depth,

lib/get/util/clone.js

@@ -1,7 +1,5 @@
 // Copies the node
-var prefix = require("./../../internal/prefix");
 var unicodePrefix = require("./../../internal/unicodePrefix");
-var $modelCreated = require("./../../internal/model-created");
 
 module.exports = function clone(node) {
     var outValue, i, len;
@@ -10,7 +8,7 @@ module.exports = function clone(node) {
     for (i = 0, len = keys.length; i < len; i++) {
         var k = keys[i];
         var k0 = k.charAt(0);
-        if (k0 === prefix || k0 === unicodePrefix || k === $modelCreated) {
+        if (k0 === unicodePrefix) {
             continue;
         }
         outValue[k] = node[k];

lib/internal/invalidated.js

@@ -1 +1 @@
-module.exports = require("./../internal/prefix") + "invalidated";
+module.exports = require("./unicodePrefix") + "invalidated";

lib/internal/key.js

@@ -1 +1 @@
-module.exports = require("./../internal/prefix") + "key";
+module.exports = require("./unicodePrefix") + "key";

lib/internal/model-created.js

@@ -1 +1 @@
-module.exports = "$modelCreated";
+module.exports = require("./unicodePrefix") + "modelCreated";

lib/internal/parent.js

@@ -1 +1 @@
-module.exports = require("./../internal/prefix") + "parent";
+module.exports = require("./unicodePrefix") + "parent";

lib/internal/path.js

@@ -1 +1 @@
-module.exports = require("./prefix") + "path";
+module.exports = require("./unicodePrefix") + "path";

lib/internal/ref-index.js

@@ -1 +1 @@
-module.exports = require("./prefix") + "ref-index";
+module.exports = require("./unicodePrefix") + "refIndex";

lib/internal/ref.js

@@ -1 +1 @@
-module.exports = require("./../internal/prefix") + "ref";
+module.exports = require("./unicodePrefix") + "ref";

lib/internal/refs-length.js

@@ -1 +1,2 @@
-module.exports = require("./../internal/prefix") + "refs-length";
+module.exports = require("./unicodePrefix") + "refsLength";
+

lib/internal/version.js

@@ -1 +1 @@
-module.exports = require("./../internal/prefix") + "version";
+module.exports = require("./unicodePrefix") + "version";

lib/invalidate/invalidatePathMaps.js

@@ -1,11 +1,5 @@
-var __key = require("./../internal/key");
-var __ref = require("./../internal/ref");
-var __prefix = require("./../internal/prefix");
-var __parent = require("./../internal/parent");
-var __context = require("./../internal/context");
-var __version = require("./../internal/version");
-var __refIndex = require("./../internal/ref-index");
-var __refsLength = require("./../internal/refs-length");
+var createHardlink = require("../support/createHardlink");
+var __prefix = require("./../internal/unicodePrefix");
 
 var $ref = require("./../types/ref");
 
@@ -41,8 +35,8 @@ module.exports = function invalidatePathMaps(model, pathMapEnvelopes) {
     var bound = model._path;
     var cache = modelRoot.cache;
     var node = bound.length ? getBoundValue(model, bound).value : cache;
-    var parent = node[__parent] || cache;
-    var initialVersion = cache[__version];
+    var parent = node.ツparent || cache;
+    var initialVersion = cache.ツversion;
 
     var pathMapIndex = -1;
     var pathMapCount = pathMapEnvelopes.length;
@@ -57,7 +51,7 @@ module.exports = function invalidatePathMaps(model, pathMapEnvelopes) {
         );
     }
 
-    var newVersion = cache[__version];
+    var newVersion = cache.ツversion;
     var rootChangeHandler = modelRoot.onChange;
 
     if (isFunction(rootChangeHandler) && initialVersion !== newVersion) {
@@ -110,10 +104,10 @@ function invalidateReference(value, root, node, version, expired, lru, comparato
     var reference = node.value;
     var parent = root;
 
-    node = node[__context];
+    node = node.ツcontext;
 
     if (node != null) {
-        parent = node[__parent] || root;
+        parent = node.ツparent || root;
     } else {
 
         var index = 0;
@@ -136,12 +130,8 @@ function invalidateReference(value, root, node, version, expired, lru, comparato
             parent = results[1];
         } while (index++ < count);
 
-        if (container[__context] !== node) {
-            var backRefs = node[__refsLength] || 0;
-            node[__refsLength] = backRefs + 1;
-            node[__ref + backRefs] = container;
-            container[__context] = node;
-            container[__refIndex] = backRefs;
+        if (container.ツcontext !== node) {
+            createHardlink(container, node);
         }
     }
 
@@ -177,7 +167,7 @@ function invalidateNode(
         if (branch) {
             throw new Error("`null` is not allowed in branch key positions.");
         } else if (node) {
-            key = node[__key];
+            key = node.ツkey;
         }
     } else {
         parent = node;

lib/invalidate/invalidatePathSets.js

@@ -1,10 +1,4 @@
-var __key = require("./../internal/key");
 var __ref = require("./../internal/ref");
-var __parent = require("./../internal/parent");
-var __context = require("./../internal/context");
-var __version = require("./../internal/version");
-var __refIndex = require("./../internal/ref-index");
-var __refsLength = require("./../internal/refs-length");
 
 var $ref = require("./../types/ref");
 
@@ -37,8 +31,8 @@ module.exports = function invalidatePathSets(model, paths) {
     var bound = model._path;
     var cache = modelRoot.cache;
     var node = bound.length ? getBoundValue(model, bound).value : cache;
-    var parent = node[__parent] || cache;
-    var initialVersion = cache[__version];
+    var parent = node.ツparent || cache;
+    var initialVersion = cache.ツversion;
 
     var pathIndex = -1;
     var pathCount = paths.length;
@@ -53,7 +47,7 @@ module.exports = function invalidatePathSets(model, paths) {
         );
     }
 
-    var newVersion = cache[__version];
+    var newVersion = cache.ツversion;
     var rootChangeHandler = modelRoot.onChange;
 
     if (isFunction(rootChangeHandler) && initialVersion !== newVersion) {
@@ -106,10 +100,10 @@ function invalidateReference(root, node, version, expired, lru) {
     var reference = node.value;
     var parent = root;
 
-    node = node[__context];
+    node = node.ツcontext;
 
     if (node != null) {
-        parent = node[__parent] || root;
+        parent = node.ツparent || root;
     } else {
 
         var index = 0;
@@ -132,12 +126,12 @@ function invalidateReference(root, node, version, expired, lru) {
             parent = results[1];
         } while (index++ < count);
 
-        if (container[__context] !== node) {
-            var backRefs = node[__refsLength] || 0;
-            node[__refsLength] = backRefs + 1;
+        if (container.ツcontext !== node) {
+            var backRefs = node.ツrefsLength || 0;
+            node.ツrefsLength = backRefs + 1;
             node[__ref + backRefs] = container;
-            container[__context] = node;
-            container[__refIndex] = backRefs;
+            container.ツcontext = node;
+            container.ツrefIndex = backRefs;
         }
     }
 
@@ -173,7 +167,7 @@ function invalidateNode(
         if (branch) {
             throw new Error("`null` is not allowed in branch key positions.");
         } else if (node) {
-            key = node[__key];
+            key = node.ツkey;
         }
     } else {
         parent = node;

lib/lru/collect.js

@@ -1,5 +1,3 @@
-var __key = require("./../internal/key");
-var __parent = require("./../internal/parent");
 var removeNode = require("./../support/removeNode");
 var updateNodeAncestors = require("./../support/updateNodeAncestors");
 
@@ -23,8 +21,8 @@ module.exports = function collect(lru, expired, totalArg, max, ratioArg, version
         total -= size;
         if (shouldUpdate === true) {
             updateNodeAncestors(node, size, lru, version);
-        } else if (parent = node[__parent]) {
-            removeNode(node, parent, node[__key], lru);
+        } else if (parent = node.ツparent) {
+            removeNode(node, parent, node.ツkey, lru);
         }
         node = expired.pop();
     }

lib/response/get/GetResponse.js

@@ -2,7 +2,6 @@ var ModelResponse = require("./../ModelResponse");
 var checkCacheAndReport = require("./checkCacheAndReport");
 var getRequestCycle = require("./getRequestCycle");
 var empty = {dispose: function() {}};
-var __version = require("./../../internal/version");
 var collectLru = require("./../../lru/collect");
 var getSize = require("./../../support/getSize");
 
@@ -68,7 +67,7 @@ GetResponse.prototype._subscribe = function _subscribe(observer) {
         if (this.forceCollect) {
             var modelRoot = model._root;
             var modelCache = modelRoot.cache;
-            var currentVersion = modelCache[__version];
+            var currentVersion = modelCache.ツversion;
 
             collectLru(modelRoot, modelRoot.expired, getSize(modelCache),
                     model._maxSize, model._collectRatio, currentVersion);

lib/response/get/getRequestCycle.js

@@ -4,7 +4,6 @@ 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");
 var InvalidSourceError = require("../../errors/InvalidSourceError");
 
 /**
@@ -81,7 +80,7 @@ module.exports = function getRequestCycle(getResponse, model, results, observer,
 
                 var modelRoot = model._root;
                 var modelCache = modelRoot.cache;
-                var currentVersion = modelCache[__version];
+                var currentVersion = modelCache.ツversion;
 
                 collectLru(modelRoot, modelRoot.expired, getSize(modelCache),
                         model._maxSize, model._collectRatio, currentVersion);