SERVER-16856 compact method in SortedDataInterface

Add a compact() method to the SortedDataInterface to allow for compaction if the
indexed record store supports compaction-in-place.

1 files changed, 14 insertions, 2 deletions

diff --git a/src/mongo/db/catalog/collection_compact.cpp b/src/mongo/db/catalog/collection_compact.cpp
index 7d0a9e266f6..b9ea06a2aef 100644
--- a/src/mongo/db/catalog/collection_compact.cpp
+++ b/src/mongo/db/catalog/collection_compact.cpp
@@ -111,13 +111,25 @@ StatusWith<CompactStats> Collection::compact(OperationContext* txn,
                                             << _recordStore->name());
 
     if (_recordStore->compactsInPlace()) {
-        // Since we are compacting in-place, we don't need to touch the indexes.
-        // TODO SERVER-16856 compact indexes
         CompactStats stats;
         Status status = _recordStore->compact(txn, NULL, compactOptions, &stats);
         if (!status.isOK())
             return StatusWith<CompactStats>(status);
 
+        // Compact all indexes (not including unfinished indexes)
+        IndexCatalog::IndexIterator ii(_indexCatalog.getIndexIterator(txn, false));
+        while (ii.more()) {
+            IndexDescriptor* descriptor = ii.next();
+            IndexAccessMethod* index = _indexCatalog.getIndex(descriptor);
+
+            LOG(1) << "compacting index: " << descriptor->toString();
+            Status status = index->compact(txn);
+            if (!status.isOK()) {
+                error() << "failed to compact index: " << descriptor->toString();
+                return status;
+            }
+        }
+
         return StatusWith<CompactStats>(stats);
     }