SERVER-8598 Add command to cleanup orphaned data created by failed chunk migrations

Moved range deleter files from s/ to db/

13 files changed, 36 insertions, 35 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 60cebc1fc88..de254bd11cb 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -644,6 +644,27 @@ env.StaticLibrary("geoquery", [ "db/geo/geoquery.cpp", ],
 env.CppUnitTest("hash_test", [ "db/geo/hash_test.cpp" ], LIBDEPS = ["geometry" ])
 env.CppUnitTest("geoparser_test", [ "db/geo/geoparser_test.cpp" ], LIBDEPS = ["geoparser"])
 
+env.StaticLibrary('range_deleter',
+                  [ 'db/range_deleter.cpp',
+                    'db/range_deleter_mock_env.cpp',
+                    'db/range_deleter_stats.cpp'
+                  ],
+                  LIBDEPS = [
+                      '$BUILD_DIR/mongo/s/base', # range_arithmetic.cpp
+                      'base/base',
+                      'bson',
+                      'synchronization'
+                  ])
+
+env.CppUnitTest('range_deleter_test',
+                [ 'db/range_deleter_test.cpp' ],
+                LIBDEPS = [ 'range_deleter' ]);
+
+env.CppUnitTest('range_deleter_stat_test',
+                [ 'db/range_deleter_stat_test.cpp' ],
+                LIBDEPS = [ 'range_deleter' ]);
+
+
 env.StaticLibrary("serveronly", serverOnlyFiles,
                   LIBDEPS=["coreshard",
                            "db/auth/authmongod",
@@ -654,7 +675,7 @@ env.StaticLibrary("serveronly", serverOnlyFiles,
                            "geoparser",
                            "geoquery",
                            "index_set",
-                           '$BUILD_DIR/mongo/s/range_deleter',
+                           'range_deleter',
                            '$BUILD_DIR/third_party/shim_snappy'])
 
 # These files go into mongos and mongod only, not into the shell or any tools.
diff --git a/src/mongo/s/range_deleter.cpp b/src/mongo/db/range_deleter.cpp
index fe77ff0a5ac..0b0ffa7d403 100644
--- a/src/mongo/s/range_deleter.cpp
+++ b/src/mongo/db/range_deleter.cpp
@@ -14,13 +14,13 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mongo/s/range_deleter.h"
+#include "mongo/db/range_deleter.h"
 
 #include <boost/date_time/posix_time/posix_time_duration.hpp>
 #include <memory>
 
 #include "mongo/s/range_arithmetic.h"
-#include "mongo/s/range_deleter_stats.h"
+#include "mongo/db/range_deleter_stats.h"
 #include "mongo/util/concurrency/synchronization.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/time_support.h"
diff --git a/src/mongo/s/range_deleter.h b/src/mongo/db/range_deleter.h
index 60bd59066cb..60bd59066cb 100644
--- a/src/mongo/s/range_deleter.h
+++ b/src/mongo/db/range_deleter.h
diff --git a/src/mongo/db/range_deleter_db_env.h b/src/mongo/db/range_deleter_db_env.h
index bba1a68e528..cc1c8dbafbf 100644
--- a/src/mongo/db/range_deleter_db_env.h
+++ b/src/mongo/db/range_deleter_db_env.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "mongo/s/range_deleter.h"
+#include "mongo/db/range_deleter.h"
 
 namespace mongo {
 
diff --git a/src/mongo/s/range_deleter_mock_env.cpp b/src/mongo/db/range_deleter_mock_env.cpp
index 4993fe5c802..7c20b25b447 100644
--- a/src/mongo/s/range_deleter_mock_env.cpp
+++ b/src/mongo/db/range_deleter_mock_env.cpp
@@ -14,7 +14,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mongo/s/range_deleter_mock_env.h"
+#include "mongo/db/range_deleter_mock_env.h"
 
 namespace mongo {
 
diff --git a/src/mongo/s/range_deleter_mock_env.h b/src/mongo/db/range_deleter_mock_env.h
index d7ed4965058..556c3b09e47 100644
--- a/src/mongo/s/range_deleter_mock_env.h
+++ b/src/mongo/db/range_deleter_mock_env.h
@@ -21,7 +21,7 @@
 #include <string>
 
 #include "mongo/s/range_arithmetic.h"
-#include "mongo/s/range_deleter.h"
+#include "mongo/db/range_deleter.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/range_deleter_service.h b/src/mongo/db/range_deleter_service.h
index 65ee073519e..2b63f8ad2b6 100644
--- a/src/mongo/db/range_deleter_service.h
+++ b/src/mongo/db/range_deleter_service.h
@@ -16,7 +16,8 @@
 
 #pragma once
 
-#include "mongo/s/range_deleter.h"
+#include "mongo/db/range_deleter.h"
+#include "mongo/db/range_deleter_stats.h"
 
 namespace mongo {
 
diff --git a/src/mongo/s/range_deleter_stat_test.cpp b/src/mongo/db/range_deleter_stat_test.cpp
index 0b824e7ea6b..4f7f1710715 100644
--- a/src/mongo/s/range_deleter_stat_test.cpp
+++ b/src/mongo/db/range_deleter_stat_test.cpp
@@ -19,9 +19,9 @@
 #include <string>
 
 #include "mongo/s/field_parser.h"
-#include "mongo/s/range_deleter.h"
-#include "mongo/s/range_deleter_mock_env.h"
-#include "mongo/s/range_deleter_stats.h"
+#include "mongo/db/range_deleter.h"
+#include "mongo/db/range_deleter_mock_env.h"
+#include "mongo/db/range_deleter_stats.h"
 #include "mongo/unittest/unittest.h"
 
 namespace {
diff --git a/src/mongo/s/range_deleter_stats.cpp b/src/mongo/db/range_deleter_stats.cpp
index b7ec04488ae..8a0244c26d5 100644
--- a/src/mongo/s/range_deleter_stats.cpp
+++ b/src/mongo/db/range_deleter_stats.cpp
@@ -14,7 +14,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mongo/s/range_deleter_stats.h"
+#include "mongo/db/range_deleter_stats.h"
 
 namespace mongo {
     const BSONField<int> RangeDeleterStats::TotalDeletesField("totalDeletes");
diff --git a/src/mongo/s/range_deleter_stats.h b/src/mongo/db/range_deleter_stats.h
index 514054d4e4d..514054d4e4d 100644
--- a/src/mongo/s/range_deleter_stats.h
+++ b/src/mongo/db/range_deleter_stats.h
diff --git a/src/mongo/s/range_deleter_test.cpp b/src/mongo/db/range_deleter_test.cpp
index e5b8b6f157f..7d4c4d633ff 100644
--- a/src/mongo/s/range_deleter_test.cpp
+++ b/src/mongo/db/range_deleter_test.cpp
@@ -19,9 +19,9 @@
 #include <string>
 
 #include "mongo/s/field_parser.h"
-#include "mongo/s/range_deleter_mock_env.h"
-#include "mongo/s/range_deleter.h"
-#include "mongo/s/range_deleter_stats.h"
+#include "mongo/db/range_deleter_mock_env.h"
+#include "mongo/db/range_deleter.h"
+#include "mongo/db/range_deleter_stats.h"
 #include "mongo/unittest/unittest.h"
 
 namespace {
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index e25f98aec95..1756646ae13 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -82,18 +82,6 @@ env.StaticLibrary('metadata', ['collection_manager.cpp',
                            '$BUILD_DIR/mongo/base/base',
                            '$BUILD_DIR/mongo/bson'])
 
-env.StaticLibrary('range_deleter',
-                  [ 'range_deleter.cpp',
-                    'range_deleter_mock_env.cpp',
-                    'range_deleter_stats.cpp'
-                  ],
-                  LIBDEPS = [
-                      'base',
-                      '$BUILD_DIR/mongo/base/base',
-                      '$BUILD_DIR/mongo/bson',
-                      '$BUILD_DIR/mongo/synchronization'
-                  ])
-
 env.CppUnitTest('chunk_diff_test',
                 'chunk_diff_test.cpp',
                 LIBDEPS=['metadata'],
@@ -111,11 +99,3 @@ env.CppUnitTest('metadata_loader_test',
                          '$BUILD_DIR/mongo/mocklib'],
                 NO_CRUTCH=True);
 
-env.CppUnitTest('range_deleter_test',
-                [ 'range_deleter_test.cpp' ],
-                LIBDEPS = [ 'range_deleter' ]);
-
-env.CppUnitTest('range_deleter_stat_test',
-                [ 'range_deleter_stat_test.cpp' ],
-                LIBDEPS = [ 'range_deleter' ]);
-
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index 633ba9f3bcf..7f323c7f351 100644
--- a/src/mongo/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
@@ -57,7 +57,6 @@
 #include "mongo/s/config.h"
 #include "mongo/s/d_logic.h"
 #include "mongo/s/field_parser.h"
-#include "mongo/s/range_deleter_stats.h"
 #include "mongo/s/shard.h"
 #include "mongo/s/type_chunk.h"
 #include "mongo/util/assert_util.h"