From 7493890bb2855affbd2d7e71e4dd6a490380035e Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Tue, 11 Feb 2014 23:27:07 -0800 Subject: [PATCH] Fix typos --- packages/mongo-livedata/dummy-structure.js | 2 +- packages/mongo-livedata/oplog_observe_driver.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/mongo-livedata/dummy-structure.js b/packages/mongo-livedata/dummy-structure.js index e0622a6d80..0b0708c210 100644 --- a/packages/mongo-livedata/dummy-structure.js +++ b/packages/mongo-livedata/dummy-structure.js @@ -24,7 +24,7 @@ DummyStructure.prototype.minElementId = function () { var self = this; var minElementId = null; self.idMap.forEach(function (value, key) { - if (minElement === null) + if (minElementId === null) minElementId = key; else if (self.comparator(value, self.idMap.get(minElementId)) < 0) minElementId = key; diff --git a/packages/mongo-livedata/oplog_observe_driver.js b/packages/mongo-livedata/oplog_observe_driver.js index d0679fff58..7a1db5ae59 100644 --- a/packages/mongo-livedata/oplog_observe_driver.js +++ b/packages/mongo-livedata/oplog_observe_driver.js @@ -30,7 +30,7 @@ OplogObserveDriver = function (options) { // XXX replace with doubly-heaps and shit once we get these working var sorter = new Minimongo.Sorter(options.cursorDescription.options.sort); var comparator = sorter.getComparator(); - self._limit = self._cursorDescription.limit; + self._limit = self._cursorDescription.options.limit; self._comparator = comparator; self._unpublishedBuffer = new DummyStructure(comparator); // We need something that can find Max value in addition to IdMap interface @@ -144,7 +144,7 @@ _.extend(OplogObserveDriver.prototype, { " documents are overflowing the set"); } - var overflowingDocId = self._published.getMaximumId(); + var overflowingDocId = self._published.maxElementId(); var overflowingDoc = self._published.get(overflowingDocId); self._published.remove(overflowingDocId); self._multiplexer.removed(overflowingDocId); @@ -181,9 +181,9 @@ _.extend(OplogObserveDriver.prototype, { }, _addBuffered: function (id, doc) { var self = this; - self._unpublishedBuffer.add(id, self._sharedProjectionFn(fields)); + self._unpublishedBuffer.set(id, self._sharedProjectionFn(doc)); if (self._unpublishedBuffer.size() > self._limit) - self._unpublishedBuffer.remove(self._unpublishedBuffer.getMaximumId()); + self._unpublishedBuffer.remove(self._unpublishedBuffer.maxElementId()); }, _removeBuffered: function (id) { var self = this; @@ -206,8 +206,8 @@ _.extend(OplogObserveDriver.prototype, { var limit = self._limit; var comparator = self._comparator; - var maxPublished = (limit && self._published.size() > 0) ? self._published.get(self._published.getMaximumId()) : null; - var maxBuffered = (limit && self._unpublishedBuffer.size() > 0) ? self._unpublishedBuffer.get(self._unpublishedBuffer.getMaximumId()) : null; + var maxPublished = (limit && self._published.size() > 0) ? self._published.get(self._published.maxElementId()) : null; + var maxBuffered = (limit && self._unpublishedBuffer.size() > 0) ? self._unpublishedBuffer.get(self._unpublishedBuffer.maxElementId()) : null; // The query is unlimited or didn't publish enough documents yet or the new // document would fit into published set pushing the maximum element out, // then we need to publish the doc. @@ -272,7 +272,7 @@ _.extend(OplogObserveDriver.prototype, { // w/o querying mongo, so just remove it from buffer self._removeBuffered(id); // but it can move into published now, check it - var maxPublished = self._published.get(self._published.getMaximumId()); + var maxPublished = self._published.get(self._published.maxElementId()); if (comparator(newDoc, maxPublished) === -1) self._addPublished(id, newDoc); }