github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of cursor.observe at server-side startup.

Browse Source 
A block that wasn't allowed to yield called _Mongo::_createSynchronousCursor,
which certainly can yield (it waits on a Future) but doesn't actually end up
needing to yield unless it is called during the initial connection to
Mongo... eg, during startup.

Fixes #507 (reported by paulreimer).
This commit is contained in:
David Glasser
2012-11-23 19:49:23 -05:00
parent 2d04e07b7a
commit d073e5ddfc
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/mongo-livedata/mongo_driver.js
View File

@@ -490,7 +490,7 @@ _Mongo.prototype._observe = function (cursorDescription, ordered, callbacks) {
// take place.
liveResultsSet = new LiveResultsSet(
cursorDescription,
self._createSynchronousCursor(cursorDescription),
self,
ordered,
function () {
delete self._liveResultsSets[observeKey];
@@ -516,15 +516,19 @@ _Mongo.prototype._observe = function (cursorDescription, ordered, callbacks) {
return observeHandle;
};
var LiveResultsSet = function (cursorDescription, synchronousCursor, ordered,
var LiveResultsSet = function (cursorDescription, mongoHandle, ordered,
stopCallback) {
var self = this;
self._cursorDescription = cursorDescription;
self._synchronousCursor = synchronousCursor;
self._mongoHandle = mongoHandle;
self._ordered = ordered;
self._stopCallbacks = [stopCallback];
// This constructor cannot yield, so we don't create the synchronousCursor yet
// (since that can yield).
self._synchronousCursor = null;
// previous results snapshot. on each poll cycle, diffs against
// results drives the callbacks.
self._results = ordered ? [] : {};
@@ -679,7 +683,12 @@ _.extend(LiveResultsSet.prototype, {
self._pendingWrites = [];
// Get the new query results. (These calls can yield.)
self._synchronousCursor.rewind();
if (self._synchronousCursor) {
self._synchronousCursor.rewind();
} else {
self._synchronousCursor = self._mongoHandle._createSynchronousCursor(
self._cursorDescription);
}
var newResults = self._synchronousCursor.getRawObjects(self._ordered);
var oldResults = self._results;