Skip to content

🎉 INT-527: use maxTimeMS for queries against prod servers to avoid excessive scans #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2015
Merged

🎉 INT-527: use maxTimeMS for queries against prod servers to avoid excessive scans #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
"mongodb-connection-model": "^3.0.6",
"mongodb-instance-model": "^1.0.2",
"mongodb-ns": "^1.0.0",
"ms": "^0.7.1",
"node-notifier": "^4.3.1",
"scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.5/scout-server-0.4.5.tar.gz"
"scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.6/scout-server-0.4.6.tar.gz"
},
"devDependencies": {
"ampersand-app": "^1.0.4",
Expand Down
9 changes: 8 additions & 1 deletion src/models/query-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var ms = require('ms');
var Model = require('ampersand-model');
var EJSON = require('mongodb-extended-json');
var Query = require('mongodb-language-model').Query;
Expand All @@ -8,6 +9,7 @@ var DEFAULT_SORT = {
};
var DEFAULT_SIZE = 100;
var DEFAULT_SKIP = 0;
var DEFAULT_MAX_TIME_MS = ms('10 seconds');

var getDefaultQuery = function() {
return new Query({}, {
Expand Down Expand Up @@ -39,6 +41,10 @@ module.exports = Model.extend({
skip: {
type: 'number',
default: DEFAULT_SKIP
},
maxTimeMS: {
type: 'number',
default: DEFAULT_MAX_TIME_MS
}
},
derived: {
Expand All @@ -60,7 +66,8 @@ module.exports = Model.extend({
query: getDefaultQuery(),
sort: DEFAULT_SORT,
size: DEFAULT_SIZE,
skip: DEFAULT_SKIP
skip: DEFAULT_SKIP,
maxTimeMS: DEFAULT_MAX_TIME_MS
});
this.trigger('reset', this);
}
Expand Down