SERVER-17496 Remove unused code and includes in sharding

4 files changed, 5 insertions, 21 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index 6fe85d249e2..bdfdc990d0c 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -54,7 +54,6 @@
 #include "mongo/db/lasterror.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage_options.h"
-#include "mongo/s/chunk_version.h"
 #include "mongo/s/d_state.h"
 #include "mongo/scripting/engine.h"
 #include "mongo/util/concurrency/thread_name.h"
diff --git a/src/mongo/db/exec/shard_filter.h b/src/mongo/db/exec/shard_filter.h
index 904fc000a38..16cc21d7392 100644
--- a/src/mongo/db/exec/shard_filter.h
+++ b/src/mongo/db/exec/shard_filter.h
@@ -33,7 +33,6 @@
 #include "mongo/db/exec/plan_stage.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/record_id.h"
-#include "mongo/s/chunk_version.h"
 #include "mongo/s/d_state.h"
 
 namespace mongo {
diff --git a/src/mongo/db/ops/update_lifecycle.h b/src/mongo/db/ops/update_lifecycle.h
index c0aa86695da..93811f28cff 100644
--- a/src/mongo/db/ops/update_lifecycle.h
+++ b/src/mongo/db/ops/update_lifecycle.h
@@ -28,13 +28,15 @@
 
 #pragma once
 
-#include "mongo/db/field_ref.h"
-#include "mongo/db/catalog/collection.h"
-#include "mongo/s/chunk_version.h"
+#include <vector>
 
 namespace mongo {
 
+    class Collection;
+    class FieldRef;
     class OperationContext;
+    class UpdateIndexData;
+
 
     class UpdateLifecycle {
     public:
diff --git a/src/mongo/s/chunk_version.h b/src/mongo/s/chunk_version.h
index 50f121b97ee..959c1aaa737 100644
--- a/src/mongo/s/chunk_version.h
+++ b/src/mongo/s/chunk_version.h
@@ -89,27 +89,11 @@ namespace mongo {
             return version;
         }
 
-        static bool isDroppedVersion( const ChunkVersion& version ) {
-            return version.majorVersion() == 0 && version.minorVersion() == 0
-                   && version.epoch() == DROPPED().epoch();
-        }
-
-        static bool isUnshardedVersion( const ChunkVersion& version ) {
-            return isDroppedVersion( version );
-        }
-
         static bool isIgnoredVersion( const ChunkVersion& version ) {
             return version.majorVersion() == 0 && version.minorVersion() == 0
                    && version.epoch() == IGNORED().epoch();
         }
 
-        void inc( bool major ) {
-            if ( major )
-                incMajor();
-            else
-                incMinor();
-        }
-
         void incMajor() {
             _major++;
             _minor = 0;