don't allow multikey shard indices or array values in shard keys

1 files changed, 5 insertions, 0 deletions

diff --git a/s/d_split.cpp b/s/d_split.cpp
index c195f7b7668..6bf9c4e0a6a 100644
--- a/s/d_split.cpp
+++ b/s/d_split.cpp
@@ -177,6 +177,11 @@ namespace mongo {
                 return false;
             }
 
+            if( d->isMultikey( d->idxNo( *idx ) ) ) {
+                errmsg = "index is multikey, cannot use for sharding";
+                return false;
+            }
+
             BtreeCursor * bc = BtreeCursor::make( d , d->idxNo(*idx) , *idx , min , max , false , 1 );
             shared_ptr<Cursor> c( bc );
             auto_ptr<ClientCursor> cc( new ClientCursor( QueryOption_NoCursorTimeout , c , ns ) );