SERVER-9468 Move s/field-parser* to db/

24 files changed, 25 insertions, 26 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 2d3a4f65734..4f7f3b32ffe 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -8,8 +8,10 @@ Import("env")
 # get resolved.
 #
 
-env.StaticLibrary('common', ['field_ref.cpp'],
+env.StaticLibrary('common', ['field_ref.cpp', 'field_parser.cpp'],
                   LIBDEPS=['$BUILD_DIR/mongo/bson',
                            '$BUILD_DIR/mongo/foundation'])
 
 env.CppUnitTest('field_ref_test', ['field_ref_test.cpp'], LIBDEPS=['common'])
+
+env.CppUnitTest('field_parser_test', 'field_parser_test.cpp', LIBDEPS=['common'])
diff --git a/src/mongo/s/field_parser-inl.h b/src/mongo/db/field_parser-inl.h
index 9698e905530..905cb17b1d4 100644
--- a/src/mongo/s/field_parser-inl.h
+++ b/src/mongo/db/field_parser-inl.h
@@ -14,7 +14,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/field_parser.cpp b/src/mongo/db/field_parser.cpp
index b06ede37336..f113f080a54 100644
--- a/src/mongo/s/field_parser.cpp
+++ b/src/mongo/db/field_parser.cpp
@@ -14,7 +14,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/field_parser.h b/src/mongo/db/field_parser.h
index b5f3c48d22a..b5f3c48d22a 100644
--- a/src/mongo/s/field_parser.h
+++ b/src/mongo/db/field_parser.h
diff --git a/src/mongo/s/field_parser_test.cpp b/src/mongo/db/field_parser_test.cpp
index b483e00ecad..6878245bc5e 100644
--- a/src/mongo/s/field_parser_test.cpp
+++ b/src/mongo/db/field_parser_test.cpp
@@ -20,8 +20,8 @@
 
 #include "mongo/bson/bson_field.h"
 #include "mongo/bson/util/misc.h" // for Date_t
+#include "mongo/db/field_parser.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/s/field_parser.h"
 #include "mongo/unittest/unittest.h"
 
 namespace {
diff --git a/src/mongo/db/range_deleter_stat_test.cpp b/src/mongo/db/range_deleter_stat_test.cpp
index 4f7f1710715..1b324155788 100644
--- a/src/mongo/db/range_deleter_stat_test.cpp
+++ b/src/mongo/db/range_deleter_stat_test.cpp
@@ -18,7 +18,7 @@
 #include <boost/thread.hpp>
 #include <string>
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/db/range_deleter.h"
 #include "mongo/db/range_deleter_mock_env.h"
 #include "mongo/db/range_deleter_stats.h"
diff --git a/src/mongo/db/range_deleter_test.cpp b/src/mongo/db/range_deleter_test.cpp
index 7d4c4d633ff..830661d45a6 100644
--- a/src/mongo/db/range_deleter_test.cpp
+++ b/src/mongo/db/range_deleter_test.cpp
@@ -18,9 +18,9 @@
 #include <boost/thread.hpp>
 #include <string>
 
-#include "mongo/s/field_parser.h"
-#include "mongo/db/range_deleter_mock_env.h"
+#include "mongo/db/field_parser.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"
 
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 1756646ae13..2794c76b788 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -7,7 +7,6 @@ Import("env")
 #
 
 env.StaticLibrary('base', [#'chunk_version.cpp',
-                           'field_parser.cpp',
                            'mongo_version_range.cpp',
                            'range_arithmetic.cpp',
                            'type_changelog.cpp',
@@ -26,8 +25,6 @@ env.StaticLibrary('base', [#'chunk_version.cpp',
 
 env.CppUnitTest('chunk_version_test', 'chunk_version_test.cpp', LIBDEPS=['base'])
 
-env.CppUnitTest('field_parser_test', 'field_parser_test.cpp', LIBDEPS=['base'])
-
 env.CppUnitTest('mongo_version_range_test', 'mongo_version_range_test.cpp', 
                 LIBDEPS=['base', '$BUILD_DIR/mongo/bson'])
 
diff --git a/src/mongo/s/cluster_client_internal.cpp b/src/mongo/s/cluster_client_internal.cpp
index 00295fc87b0..9658d2bec48 100644
--- a/src/mongo/s/cluster_client_internal.cpp
+++ b/src/mongo/s/cluster_client_internal.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "mongo/client/connpool.h"
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/s/type_changelog.h"
 #include "mongo/s/type_mongos.h"
 #include "mongo/s/type_shard.h"
diff --git a/src/mongo/s/commands_admin.cpp b/src/mongo/s/commands_admin.cpp
index cb25aeb88d1..429e0d31246 100644
--- a/src/mongo/s/commands_admin.cpp
+++ b/src/mongo/s/commands_admin.cpp
@@ -25,11 +25,11 @@
 #include "mongo/db/auth/authorization_manager.h"
 #include "mongo/db/auth/privilege.h"
 #include "mongo/db/dbmessage.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/s/chunk.h"
 #include "mongo/s/client_info.h"
 #include "mongo/s/config.h"
-#include "mongo/s/field_parser.h"
 #include "mongo/s/grid.h"
 #include "mongo/s/strategy.h"
 #include "mongo/s/type_chunk.h"
diff --git a/src/mongo/s/config_upgrade_v3_to_v4.cpp b/src/mongo/s/config_upgrade_v3_to_v4.cpp
index bbc53487c98..9c16f8005eb 100644
--- a/src/mongo/s/config_upgrade_v3_to_v4.cpp
+++ b/src/mongo/s/config_upgrade_v3_to_v4.cpp
@@ -22,9 +22,9 @@
 #include "mongo/base/owned_pointer_vector.h"
 #include "mongo/client/connpool.h"
 #include "mongo/client/distlock.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/s/cluster_client_internal.h"
 #include "mongo/s/config_upgrade_helpers.h"
-#include "mongo/s/field_parser.h"
 #include "mongo/s/type_chunk.h"
 #include "mongo/s/type_collection.h"
 #include "mongo/s/type_config_version.h"
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index a0852a21117..6e19de007a5 100644
--- a/src/mongo/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
@@ -44,6 +44,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/dur.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/db/hasher.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/kill_current_op.h"
@@ -57,7 +58,6 @@
 #include "mongo/s/chunk_version.h"
 #include "mongo/s/config.h"
 #include "mongo/s/d_logic.h"
-#include "mongo/s/field_parser.h"
 #include "mongo/s/shard.h"
 #include "mongo/s/type_chunk.h"
 #include "mongo/util/assert_util.h"
diff --git a/src/mongo/s/type_changelog.cpp b/src/mongo/s/type_changelog.cpp
index c05aa537e6b..34f75ba567d 100644
--- a/src/mongo/s/type_changelog.cpp
+++ b/src/mongo/s/type_changelog.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_changelog.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_chunk.cpp b/src/mongo/s/type_chunk.cpp
index 0d598cfe683..1c2bd67592f 100644
--- a/src/mongo/s/type_chunk.cpp
+++ b/src/mongo/s/type_chunk.cpp
@@ -17,7 +17,7 @@
 
 #include <cstring>
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_collection.cpp b/src/mongo/s/type_collection.cpp
index f2fc3f21dfe..b4e17029d0f 100644
--- a/src/mongo/s/type_collection.cpp
+++ b/src/mongo/s/type_collection.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_collection.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_config_version.cpp b/src/mongo/s/type_config_version.cpp
index ae6ea718514..8c6027e7e04 100644
--- a/src/mongo/s/type_config_version.cpp
+++ b/src/mongo/s/type_config_version.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_config_version.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/version.h"
 
diff --git a/src/mongo/s/type_database.cpp b/src/mongo/s/type_database.cpp
index 2ce9539632e..b8bc8abb63e 100644
--- a/src/mongo/s/type_database.cpp
+++ b/src/mongo/s/type_database.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_database.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_database_test.cpp b/src/mongo/s/type_database_test.cpp
index 8a4e44a6ba3..59bdc5d978c 100644
--- a/src/mongo/s/type_database_test.cpp
+++ b/src/mongo/s/type_database_test.cpp
@@ -17,7 +17,7 @@
 #include "mongo/pch.h"
 
 #include "mongo/bson/oid.h"
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/s/type_database.h"
 #include "mongo/unittest/unittest.h"
 
diff --git a/src/mongo/s/type_lockpings.cpp b/src/mongo/s/type_lockpings.cpp
index 3df9da0b1e9..e52488d1b68 100644
--- a/src/mongo/s/type_lockpings.cpp
+++ b/src/mongo/s/type_lockpings.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_lockpings.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_locks.cpp b/src/mongo/s/type_locks.cpp
index bf608bfc14a..34f7fd597b8 100644
--- a/src/mongo/s/type_locks.cpp
+++ b/src/mongo/s/type_locks.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_locks.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_mongos.cpp b/src/mongo/s/type_mongos.cpp
index ae515a94d9d..178f85da16b 100644
--- a/src/mongo/s/type_mongos.cpp
+++ b/src/mongo/s/type_mongos.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_mongos.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_settings.cpp b/src/mongo/s/type_settings.cpp
index c80b7bced4e..08cd5824b84 100644
--- a/src/mongo/s/type_settings.cpp
+++ b/src/mongo/s/type_settings.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_settings.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/time_support.h"
 
diff --git a/src/mongo/s/type_shard.cpp b/src/mongo/s/type_shard.cpp
index 9b6fd2fdb78..f33d08a31fb 100644
--- a/src/mongo/s/type_shard.cpp
+++ b/src/mongo/s/type_shard.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_shard.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
diff --git a/src/mongo/s/type_tags.cpp b/src/mongo/s/type_tags.cpp
index b2d36c26fad..718bec68ceb 100644
--- a/src/mongo/s/type_tags.cpp
+++ b/src/mongo/s/type_tags.cpp
@@ -15,7 +15,7 @@
  */
 #include "mongo/s/type_tags.h"
 
-#include "mongo/s/field_parser.h"
+#include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
 
 namespace mongo {