SERVER-17532: fix dup key error message in wiredtiger index

(cherry picked from commit 5fd3dfce18655932165ebadef0bbe5ed58f678de)

2 files changed, 17 insertions, 10 deletions

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
index a18f88b0b07..649350cb7de 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
@@ -94,14 +94,6 @@ namespace {
         return bb.obj();
     }
 
-    // taken from btree_logic.cpp
-    Status dupKeyError(const BSONObj& key) {
-        StringBuilder sb;
-        sb << "E11000 duplicate key error ";
-        sb << "dup key: " << key;
-        return Status(ErrorCodes::DuplicateKey, sb.str());
-    }
-
     Status checkKeySize(const BSONObj& key) {
         if ( key.objsize() >= TempKeyMaxSize ) {
             string msg = mongoutils::str::stream()
@@ -114,6 +106,15 @@ namespace {
 
 } // namespace
 
+    Status WiredTigerIndex::dupKeyError(const BSONObj& key) {
+        StringBuilder sb;
+        sb << "E11000 duplicate key error";
+        sb << " collection: " << _collectionNamespace;
+        sb << " index: " << _indexName;
+        sb << " dup key: " << key;
+        return Status(ErrorCodes::DuplicateKey, sb.str());
+    }
+
     // static
     StatusWith<std::string> WiredTigerIndex::parseIndexOptions(const BSONObj& options) {
         BSONForEach(elem, options) {
@@ -203,7 +204,9 @@ namespace {
                                      const IndexDescriptor* desc)
         : _ordering(Ordering::make(desc->keyPattern())),
           _uri( uri ),
-          _instanceId( WiredTigerSession::genCursorId() ) {
+          _instanceId( WiredTigerSession::genCursorId() ),
+          _collectionNamespace( desc->parentNS() ),
+          _indexName( desc->indexName() ){
 
         Status versionStatus =
             WiredTigerUtil::checkApplicationMetadataFormatVersion(ctx,
@@ -531,7 +534,7 @@ namespace {
             else {
                 // Dup found!
                 if (!_dupsAllowed) {
-                    return dupKeyError(newKey);
+                    return _idx->dupKeyError(newKey);
                 }
 
                 // If we get here, we are in the weird mode where dups are allowed on a unique
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_index.h b/src/mongo/db/storage/wiredtiger/wiredtiger_index.h
index 81f6aa57c1f..169c3789471 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_index.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_index.h
@@ -113,6 +113,8 @@ namespace mongo {
 
         virtual bool unique() const = 0;
 
+        Status dupKeyError(const BSONObj& key);
+
     protected:
 
         virtual Status _insert( WT_CURSOR* c,
@@ -132,6 +134,8 @@ namespace mongo {
         const Ordering _ordering;
         std::string _uri;
         uint64_t _instanceId;
+        std::string _collectionNamespace;
+        std::string _indexName;
     };