SERVER-16518 listIndexes response changed to cursor object form

As a temporary compatibility measure, the legacy behavior is preserved
if the "cursor" option is not sent with the command.  This
compatibility layer will be removed as part of work for the parent
ticket.

1 files changed, 15 insertions, 1 deletions

diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp
index 638f3bebe9e..3403ede8b1e 100644
--- a/src/mongo/db/commands/list_indexes.cpp
+++ b/src/mongo/db/commands/list_indexes.cpp
@@ -112,12 +112,26 @@ namespace mongo {
             vector<string> indexNames;
             cce->getAllIndexes( txn, &indexNames );
 
+            // TODO: Handle options specified in the command request object under the "cursor"
+            // field.
+
+            // TODO: If the full result set does not fit in one batch, allocate a cursor to store
+            // the remainder of the results.
+
             BSONArrayBuilder arr;
             for ( size_t i = 0; i < indexNames.size(); i++ ) {
                 arr.append( cce->getIndexSpec( txn, indexNames[i] ) );
             }
 
-            result.append( "indexes", arr.arr() );
+            if ( cmdObj["cursor"].type() == mongo::Object ) {
+                const long long cursorId = 0LL;
+                std::string cursorNamespace = str::stream()
+                    << dbname << ".$cmd." << name << "." << ns.coll();
+                Command::appendCursorResponseObject( cursorId, cursorNamespace, arr.arr(),
+                                                     &result );
+            } else {
+                result.append( "indexes", arr.arr() );
+            }
 
             return true;
         }