diff --git a/spec/ParseRelation.spec.js b/spec/ParseRelation.spec.js index e3eb562d34..ffbbb04bb6 100644 --- a/spec/ParseRelation.spec.js +++ b/spec/ParseRelation.spec.js @@ -163,6 +163,33 @@ describe('Parse.Relation testing', () => { }); }); + it("related at ordering optimizations", (done) => { + var ChildObject = Parse.Object.extend("ChildObject"); + var childObjects = []; + for (var i = 0; i < 10; i++) { + childObjects.push(new ChildObject({x: i})); + } + + var parent; + var relation; + + Parse.Object.saveAll(childObjects).then(function() { + var ParentObject = Parse.Object.extend('ParentObject'); + parent = new ParentObject(); + parent.set('x', 4); + relation = parent.relation('child'); + relation.add(childObjects); + return parent.save(); + }).then(function() { + const query = relation.query(); + query.descending('createdAt'); + query.skip(1); + query.limit(3); + return query.find(); + }).then(function(list) { + expect(list.length).toBe(3); + }).then(done, done.fail); + }); it_exclude_dbs(['postgres'])("queries with relations", (done) => { diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js index 78ba9bdd72..c3efb7e642 100644 --- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js +++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js @@ -86,7 +86,7 @@ export class MongoStorageAdapter { // Public connectionPromise; database; - + canSortOnJoinTables; constructor({ uri = defaults.DefaultMongoURI, collectionPrefix = '', @@ -98,6 +98,7 @@ export class MongoStorageAdapter { // MaxTimeMS is not a global MongoDB client option, it is applied per operation. this._maxTimeMS = mongoOptions.maxTimeMS; + this.canSortOnJoinTables = true; delete mongoOptions.maxTimeMS; } diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js index 1a120a56a5..f49cd2c360 100644 --- a/src/Controllers/DatabaseController.js +++ b/src/Controllers/DatabaseController.js @@ -599,8 +599,16 @@ DatabaseController.prototype.deleteEverything = function() { // Returns a promise for a list of related ids given an owning id. // className here is the owning className. -DatabaseController.prototype.relatedIds = function(className, key, owningId) { - return this.adapter.find(joinTableName(className, key), relationSchema, { owningId }, {}) +DatabaseController.prototype.relatedIds = function(className, key, owningId, queryOptions) { + const { skip, limit, sort } = queryOptions; + const findOptions = {}; + if (sort && sort.createdAt && this.adapter.canSortOnJoinTables) { + findOptions.sort = { '_id' : sort.createdAt }; + findOptions.limit = limit; + findOptions.skip = skip; + queryOptions.skip = 0; + } + return this.adapter.find(joinTableName(className, key), relationSchema, { owningId }, findOptions) .then(results => results.map(result => result.relatedId)); }; @@ -693,11 +701,11 @@ DatabaseController.prototype.reduceInRelation = function(className, query, schem // Modifies query so that it no longer has $relatedTo // Returns a promise that resolves when query is mutated -DatabaseController.prototype.reduceRelationKeys = function(className, query) { +DatabaseController.prototype.reduceRelationKeys = function(className, query, queryOptions) { if (query['$or']) { return Promise.all(query['$or'].map((aQuery) => { - return this.reduceRelationKeys(className, aQuery); + return this.reduceRelationKeys(className, aQuery, queryOptions); })); } @@ -706,11 +714,12 @@ DatabaseController.prototype.reduceRelationKeys = function(className, query) { return this.relatedIds( relatedTo.object.className, relatedTo.key, - relatedTo.object.objectId) + relatedTo.object.objectId, + queryOptions) .then((ids) => { delete query['$relatedTo']; this.addInObjectIdsIds(ids, query); - return this.reduceRelationKeys(className, query); + return this.reduceRelationKeys(className, query, queryOptions); }); } }; @@ -831,8 +840,9 @@ DatabaseController.prototype.find = function(className, query, { throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Invalid field name: ${fieldName}.`); } }); + const queryOptions = { skip, limit, sort, keys, readPreference }; return (isMaster ? Promise.resolve() : schemaController.validatePermission(className, aclGroup, op)) - .then(() => this.reduceRelationKeys(className, query)) + .then(() => this.reduceRelationKeys(className, query, queryOptions)) .then(() => this.reduceInRelation(className, query, schemaController)) .then(() => { if (!isMaster) { @@ -871,7 +881,7 @@ DatabaseController.prototype.find = function(className, query, { if (!classExists) { return []; } else { - return this.adapter.find(className, schema, query, { skip, limit, sort, keys, readPreference }) + return this.adapter.find(className, schema, query, queryOptions) .then(objects => objects.map(object => { object = untransformObjectACL(object); return filterSensitiveData(isMaster, aclGroup, className, object)