Skip to content

Commit 5c79189

Browse files
acinaderacinader
authored
Set min mongodb to 3.6 in prep for parse-server 4.0 (#6445)
* Set min mongodb to 3.6 in prep for parse-server 4.0 fixes: 6444 * don't use anonymous functions when we can just pass the function. Also remove the boolean argument in tests that no longer exists. * generate the correct lock file. ooops.
1 parent 9d7da58 commit 5c79189

File tree

10 files changed

+60
-207
lines changed

10 files changed

+60
-207
lines changed

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
</p>
1919

2020
<p align="center">
21-
<img alt="MongoDB 3.2" src="https://img.shields.io/badge/mongodb-3.2-green.svg?logo=mongodb&style=flat">
22-
<img alt="MongoDB 3.4" src="https://img.shields.io/badge/mongodb-3.4-green.svg?logo=mongodb&style=flat">
2321
<img alt="MongoDB 3.6" src="https://img.shields.io/badge/mongodb-3.6-green.svg?logo=mongodb&style=flat">
2422
<img alt="MongoDB 4.0" src="https://img.shields.io/badge/mongodb-4.0-green.svg?logo=mongodb&style=flat">
2523
</p>
@@ -80,7 +78,7 @@ The fastest and easiest way to get started is to run MongoDB and Parse Server lo
8078

8179
Before you start make sure you have installed:
8280

83-
- [NodeJS](https://www.npmjs.com/) that includes `npm`
81+
- [NodeJS](https://www.npmjs.com/) that includes `npm`
8482
- [MongoDB](https://www.mongodb.com/) or [PostgreSQL](https://www.postgresql.org/)
8583
- Optionally [Docker](https://www.docker.com/)
8684

@@ -337,7 +335,7 @@ It’s possible to change the default pages of the app and redirect the user to
337335
```js
338336
var server = ParseServer({
339337
...otherOptions,
340-
338+
341339
customPages: {
342340
passwordResetSuccess: "http://yourapp.com/passwordResetSuccess",
343341
verifyEmailSuccess: "http://yourapp.com/verifyEmailSuccess",

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"lodash": "4.17.15",
4444
"lru-cache": "5.1.1",
4545
"mime": "2.4.4",
46-
"mongodb": "3.5.3",
46+
"mongodb": "3.5.4",
4747
"node-rsa": "1.0.7",
4848
"parse": "2.11.0",
4949
"pg-promise": "10.4.4",

‎spec/DatabaseController.spec.js‎

Lines changed: 43 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -3,118 +3,56 @@ const validateQuery = DatabaseController._validateQuery;
33

44
describe('DatabaseController', function() {
55
describe('validateQuery', function() {
6-
describe('with skipMongoDBServer13732Workaround disabled (the default)', function() {
7-
it('should restructure simple cases of SERVER-13732', done => {
8-
const query = {
9-
$or: [{ a: 1 }, { a: 2 }],
10-
_rperm: { $in: ['a', 'b'] },
11-
foo: 3,
12-
};
13-
validateQuery(query, false);
14-
expect(query).toEqual({
15-
$or: [
16-
{ a: 1, _rperm: { $in: ['a', 'b'] }, foo: 3 },
17-
{ a: 2, _rperm: { $in: ['a', 'b'] }, foo: 3 },
18-
],
19-
});
20-
done();
21-
});
22-
23-
it('should not restructure SERVER-13732 queries with $nears', done => {
24-
let query = { $or: [{ a: 1 }, { b: 1 }], c: { $nearSphere: {} } };
25-
validateQuery(query, false);
26-
expect(query).toEqual({
27-
$or: [{ a: 1 }, { b: 1 }],
28-
c: { $nearSphere: {} },
29-
});
30-
query = { $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } };
31-
validateQuery(query, false);
32-
expect(query).toEqual({ $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } });
33-
done();
34-
});
35-
36-
it('should push refactored keys down a tree for SERVER-13732', done => {
37-
const query = {
38-
a: 1,
39-
$or: [{ $or: [{ b: 1 }, { b: 2 }] }, { $or: [{ c: 1 }, { c: 2 }] }],
40-
};
41-
validateQuery(query, false);
42-
expect(query).toEqual({
43-
$or: [
44-
{ $or: [{ b: 1, a: 1 }, { b: 2, a: 1 }] },
45-
{ $or: [{ c: 1, a: 1 }, { c: 2, a: 1 }] },
46-
],
47-
});
48-
done();
49-
});
50-
51-
it('should reject invalid queries', done => {
52-
expect(() => validateQuery({ $or: { a: 1 } }, false)).toThrow();
53-
done();
54-
});
55-
56-
it('should accept valid queries', done => {
57-
expect(() =>
58-
validateQuery({ $or: [{ a: 1 }, { b: 2 }] }, false)
59-
).not.toThrow();
60-
done();
61-
});
6+
it('should not restructure simple cases of SERVER-13732', done => {
7+
const query = {
8+
$or: [{ a: 1 }, { a: 2 }],
9+
_rperm: { $in: ['a', 'b'] },
10+
foo: 3,
11+
};
12+
validateQuery(query);
13+
expect(query).toEqual({
14+
$or: [{ a: 1 }, { a: 2 }],
15+
_rperm: { $in: ['a', 'b'] },
16+
foo: 3,
17+
});
18+
done();
6219
});
6320

64-
describe('with skipMongoDBServer13732Workaround enabled', function() {
65-
it('should not restructure simple cases of SERVER-13732', done => {
66-
const query = {
67-
$or: [{ a: 1 }, { a: 2 }],
68-
_rperm: { $in: ['a', 'b'] },
69-
foo: 3,
70-
};
71-
validateQuery(query, true);
72-
expect(query).toEqual({
73-
$or: [{ a: 1 }, { a: 2 }],
74-
_rperm: { $in: ['a', 'b'] },
75-
foo: 3,
76-
});
77-
done();
78-
});
21+
it('should not restructure SERVER-13732 queries with $nears', done => {
22+
let query = { $or: [{ a: 1 }, { b: 1 }], c: { $nearSphere: {} } };
23+
validateQuery(query);
24+
expect(query).toEqual({
25+
$or: [{ a: 1 }, { b: 1 }],
26+
c: { $nearSphere: {} },
27+
});
28+
query = { $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } };
29+
validateQuery(query);
30+
expect(query).toEqual({ $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } });
31+
done();
32+
});
7933

80-
it('should not restructure SERVER-13732 queries with $nears', done => {
81-
let query = { $or: [{ a: 1 }, { b: 1 }], c: { $nearSphere: {} } };
82-
validateQuery(query, true);
83-
expect(query).toEqual({
84-
$or: [{ a: 1 }, { b: 1 }],
85-
c: { $nearSphere: {} },
86-
});
87-
query = { $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } };
88-
validateQuery(query, true);
89-
expect(query).toEqual({ $or: [{ a: 1 }, { b: 1 }], c: { $near: {} } });
90-
done();
34+
it('should not push refactored keys down a tree for SERVER-13732', done => {
35+
const query = {
36+
a: 1,
37+
$or: [{ $or: [{ b: 1 }, { b: 2 }] }, { $or: [{ c: 1 }, { c: 2 }] }],
38+
};
39+
validateQuery(query);
40+
expect(query).toEqual({
41+
a: 1,
42+
$or: [{ $or: [{ b: 1 }, { b: 2 }] }, { $or: [{ c: 1 }, { c: 2 }] }],
9143
});
9244

93-
it('should not push refactored keys down a tree for SERVER-13732', done => {
94-
const query = {
95-
a: 1,
96-
$or: [{ $or: [{ b: 1 }, { b: 2 }] }, { $or: [{ c: 1 }, { c: 2 }] }],
97-
};
98-
validateQuery(query, true);
99-
expect(query).toEqual({
100-
a: 1,
101-
$or: [{ $or: [{ b: 1 }, { b: 2 }] }, { $or: [{ c: 1 }, { c: 2 }] }],
102-
});
103-
104-
done();
105-
});
45+
done();
46+
});
10647

107-
it('should reject invalid queries', done => {
108-
expect(() => validateQuery({ $or: { a: 1 } }, true)).toThrow();
109-
done();
110-
});
48+
it('should reject invalid queries', done => {
49+
expect(() => validateQuery({ $or: { a: 1 } })).toThrow();
50+
done();
51+
});
11152

112-
it('should accept valid queries', done => {
113-
expect(() =>
114-
validateQuery({ $or: [{ a: 1 }, { b: 2 }] }, true)
115-
).not.toThrow();
116-
done();
117-
});
53+
it('should accept valid queries', done => {
54+
expect(() => validateQuery({ $or: [{ a: 1 }, { b: 2 }] })).not.toThrow();
55+
done();
11856
});
11957
});
12058
});

‎src/Config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ export class Config {
3434
);
3535
config.database = new DatabaseController(
3636
cacheInfo.databaseController.adapter,
37-
schemaCache,
38-
cacheInfo.skipMongoDBServer13732Workaround
37+
schemaCache
3938
);
4039
} else {
4140
config[key] = cacheInfo[key];

‎src/Controllers/DatabaseController.js‎

Lines changed: 9 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -69,73 +69,14 @@ const isSpecialQueryKey = key => {
6969
return specialQuerykeys.indexOf(key) >= 0;
7070
};
7171

72-
const validateQuery = (
73-
query: any,
74-
skipMongoDBServer13732Workaround: boolean
75-
): void => {
72+
const validateQuery = (query: any): void => {
7673
if (query.ACL) {
7774
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Cannot query on ACL.');
7875
}
7976

8077
if (query.$or) {
8178
if (query.$or instanceof Array) {
82-
query.$or.forEach(el =>
83-
validateQuery(el, skipMongoDBServer13732Workaround)
84-
);
85-
86-
if (!skipMongoDBServer13732Workaround) {
87-
/* In MongoDB 3.2 & 3.4, $or queries which are not alone at the top
88-
* level of the query can not make efficient use of indexes due to a
89-
* long standing bug known as SERVER-13732.
90-
*
91-
* This bug was fixed in MongoDB version 3.6.
92-
*
93-
* For versions pre-3.6, the below logic produces a substantial
94-
* performance improvement inside the database by avoiding the bug.
95-
*
96-
* For versions 3.6 and above, there is no performance improvement and
97-
* the logic is unnecessary. Some query patterns are even slowed by
98-
* the below logic, due to the bug having been fixed and better
99-
* query plans being chosen.
100-
*
101-
* When versions before 3.4 are no longer supported by this project,
102-
* this logic, and the accompanying `skipMongoDBServer13732Workaround`
103-
* flag, can be removed.
104-
*
105-
* This block restructures queries in which $or is not the sole top
106-
* level element by moving all other top-level predicates inside every
107-
* subdocument of the $or predicate, allowing MongoDB's query planner
108-
* to make full use of the most relevant indexes.
109-
*
110-
* EG: {$or: [{a: 1}, {a: 2}], b: 2}
111-
* Becomes: {$or: [{a: 1, b: 2}, {a: 2, b: 2}]}
112-
*
113-
* The only exceptions are $near and $nearSphere operators, which are
114-
* constrained to only 1 operator per query. As a result, these ops
115-
* remain at the top level
116-
*
117-
* https://jira.mongodb.org/browse/SERVER-13732
118-
* https://github.com/parse-community/parse-server/issues/3767
119-
*/
120-
Object.keys(query).forEach(key => {
121-
const noCollisions = !query.$or.some(subq =>
122-
Object.prototype.hasOwnProperty.call(subq, key)
123-
);
124-
let hasNears = false;
125-
if (query[key] != null && typeof query[key] == 'object') {
126-
hasNears = '$near' in query[key] || '$nearSphere' in query[key];
127-
}
128-
if (key != '$or' && noCollisions && !hasNears) {
129-
query.$or.forEach(subquery => {
130-
subquery[key] = query[key];
131-
});
132-
delete query[key];
133-
}
134-
});
135-
query.$or.forEach(el =>
136-
validateQuery(el, skipMongoDBServer13732Workaround)
137-
);
138-
}
79+
query.$or.forEach(validateQuery);
13980
} else {
14081
throw new Parse.Error(
14182
Parse.Error.INVALID_QUERY,
@@ -146,9 +87,7 @@ const validateQuery = (
14687

14788
if (query.$and) {
14889
if (query.$and instanceof Array) {
149-
query.$and.forEach(el =>
150-
validateQuery(el, skipMongoDBServer13732Workaround)
151-
);
90+
query.$and.forEach(validateQuery);
15291
} else {
15392
throw new Parse.Error(
15493
Parse.Error.INVALID_QUERY,
@@ -159,9 +98,7 @@ const validateQuery = (
15998

16099
if (query.$nor) {
161100
if (query.$nor instanceof Array && query.$nor.length > 0) {
162-
query.$nor.forEach(el =>
163-
validateQuery(el, skipMongoDBServer13732Workaround)
164-
);
101+
query.$nor.forEach(validateQuery);
165102
} else {
166103
throw new Parse.Error(
167104
Parse.Error.INVALID_QUERY,
@@ -487,21 +424,15 @@ class DatabaseController {
487424
adapter: StorageAdapter;
488425
schemaCache: any;
489426
schemaPromise: ?Promise<SchemaController.SchemaController>;
490-
skipMongoDBServer13732Workaround: boolean;
491427
_transactionalSession: ?any;
492428

493-
constructor(
494-
adapter: StorageAdapter,
495-
schemaCache: any,
496-
skipMongoDBServer13732Workaround: boolean
497-
) {
429+
constructor(adapter: StorageAdapter, schemaCache: any) {
498430
this.adapter = adapter;
499431
this.schemaCache = schemaCache;
500432
// We don't want a mutable this.schema, because then you could have
501433
// one request that uses different schemas for different parts of
502434
// it. Instead, use loadSchema to get a schema.
503435
this.schemaPromise = null;
504-
this.skipMongoDBServer13732Workaround = skipMongoDBServer13732Workaround;
505436
this._transactionalSession = null;
506437
}
507438

@@ -660,7 +591,7 @@ class DatabaseController {
660591
if (acl) {
661592
query = addWriteACL(query, acl);
662593
}
663-
validateQuery(query, this.skipMongoDBServer13732Workaround);
594+
validateQuery(query);
664595
return schemaController
665596
.getOneSchema(className, true)
666597
.catch(error => {
@@ -939,7 +870,7 @@ class DatabaseController {
939870
if (acl) {
940871
query = addWriteACL(query, acl);
941872
}
942-
validateQuery(query, this.skipMongoDBServer13732Workaround);
873+
validateQuery(query);
943874
return schemaController
944875
.getOneSchema(className)
945876
.catch(error => {
@@ -1460,7 +1391,7 @@ class DatabaseController {
14601391
query = addReadACL(query, aclGroup);
14611392
}
14621393
}
1463-
validateQuery(query, this.skipMongoDBServer13732Workaround);
1394+
validateQuery(query);
14641395
if (count) {
14651396
if (!classExists) {
14661397
return 0;
@@ -1893,7 +1824,7 @@ class DatabaseController {
18931824
]);
18941825
}
18951826

1896-
static _validateQuery: (any, boolean) => void;
1827+
static _validateQuery: any => void;
18971828
}
18981829

18991830
module.exports = DatabaseController;

‎src/Controllers/index.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ export function getDatabaseController(
171171
const {
172172
databaseURI,
173173
databaseOptions,
174-
skipMongoDBServer13732Workaround,
175174
collectionPrefix,
176175
schemaCacheTTL,
177176
enableSingleSchemaCache,
@@ -195,8 +194,7 @@ export function getDatabaseController(
195194
}
196195
return new DatabaseController(
197196
databaseAdapter,
198-
new SchemaCache(cacheController, schemaCacheTTL, enableSingleSchemaCache),
199-
skipMongoDBServer13732Workaround
197+
new SchemaCache(cacheController, schemaCacheTTL, enableSingleSchemaCache)
200198
);
201199
}
202200

0 commit comments

Comments
 (0)