fix(server,brain): Use the listIndexes() command

See INT-160

Author: imlucas

scout-brain/lib/models/collection.js

@@ -1,19 +1,7 @@
-var AmpersandState = require('ampersand-state');
 var AmpersandModel = require('ampersand-model');
-var AmpersandCollection = require('ampersand-collection');
-var debug = require('debug')('scout-brain:models:collection');
-
+var _ = require('underscore');
 var types = require('../types');
-
-// @todo: When schema for Index finalized in server,
-// make them real props here.
-var CollectionIndex = AmpersandState.extend({
-  extraProperties: 'allow'
-});
-
-var CollectionIndexes = AmpersandCollection.extend({
-  model: CollectionIndex
-});
+var IndexCollection = require('./_index-collection');
 
 var Collection = AmpersandModel.extend({
   idAttribute: '_id',
@@ -23,7 +11,6 @@ var Collection = AmpersandModel.extend({
       required: true
     },
     database: 'string',
-    index_sizes: 'number',
     document_count: 'number',
     document_size: 'number',
     storage_size: 'number',
@@ -32,8 +19,61 @@ var Collection = AmpersandModel.extend({
     padding_factor: 'number',
     extent_count: 'number',
     extent_last_size: 'number',
+    /**
+     * http://docs.mongodb.org/manual/reference/command/collStats/#collStats.userFlags
+     */
     flags_user: 'number',
-    flags_system: 'number'
+    flags_system: 'number',
+    /**
+     * Is this a capped collection?
+     */
+    capped: {
+      type: 'boolean',
+      default: false
+    },
+    /**
+     * Is this collection using power of 2 allocation?
+     *
+     * http://docs.mongodb.org/manual/core/storage/#power-of-2-allocation
+     */
+    power_of_two: {
+      type: 'boolean',
+      default: true
+    },
+    /**
+     * The total size in memory of all records in a collection. This value does
+     * not include the record header, which is 16 bytes per record, but does
+     * include the record’s padding. Additionally size does not include the
+     * size of any indexes associated with the collection, which the
+     * totalIndexSize field reports..
+     *
+     * http://docs.mongodb.org/manual/reference/command/collStats/#collStats.size
+     */
+    size: 'number',
+    /**
+     * New in version 3.0.0.
+     *
+     * A document that reports data from the storage engine for each index
+     * in the collection.
+     *
+     * The fields in this document are the names of the indexes, while the
+     * values themselves are documents that contain statistics for the index
+     * provided by the storage engine. These statistics are for
+     * internal diagnostic use.
+     *
+     * http://docs.mongodb.org/manual/reference/command/collStats/#collStats.indexDetails
+     */
+    index_details: 'object',
+    /**
+     * New in version 3.0.0.
+     *
+     * wiredTiger only appears when using the wiredTiger storage engine. This
+     * document contains data reported directly by the WiredTiger engine and
+     * other data for internal diagnostic use.
+     *
+     * http://docs.mongodb.org/manual/reference/command/collStats/#collStats.wiredTiger
+     */
+    wired_tiger: 'object'
   },
   collections: {
     indexes: IndexCollection

scout-server/lib/routes/collection.js

@@ -24,18 +24,21 @@ function getCollectionFeatures(req, fn) {
   req.db.command({
     collStats: req.ns.collection
   }, {
-    verbose: 1
-  }, function(err, data) {
-    if (err) return fn(err);
-
-    req.collection_features = {
-      capped: data.capped,
-      max: data.max,
-      size: data.size,
-      power_of_two: data.userFlags === 1
-    };
-    fn(null, req.collection_features);
-  });
+      verbose: 1
+    }, function(err, data) {
+      if (err) return fn(err);
+
+      req.collection_features = {
+        capped: data.capped,
+        max_document_count: data.max,
+        max_document_size: data.maxSize,
+        size: data.size,
+        power_of_two: data.userFlags === 1,
+        index_details: data.indexDetails || {},
+        wired_tiger: data.wiredTiger || {}
+      };
+      fn(null, req.collection_features);
+    });
 }
 
 function getCollectionStats(req, fn) {
@@ -69,11 +72,7 @@ function getCollectionStats(req, fn) {
 }
 
 function getCollectionIndexes(req, fn) {
-  req.db.collection('system.indexes')
-  .find({
-    ns: req.ns.toString()
-  })
-  .toArray(fn);
+  req.db.collection(req.ns.collection).listIndexes().toArray(fn);
 }
 
 // @todo: Move to scount-sync.collection.fetch().