diff options
| author | Tad Marshall <tad@10gen.com> | 2013-06-18 06:48:16 -0400 |
|---|---|---|
| committer | Tad Marshall <tad@10gen.com> | 2013-06-18 06:48:16 -0400 |
| commit | f2e40f7814d0f664d1baa202d623a0e3d678245b (patch) | |
| tree | 63f6a3e896f4766221c08ccc7adbef5eeb55f6cd | |
| parent | af07d274c2dc0806966b2ffc991eb120ca232da1 (diff) | |
| download | mongo-f2e40f7814d0f664d1baa202d623a0e3d678245b.tar.gz | |
Visual Studio -- add and remove files
| -rw-r--r-- | src/mongo/db/mongod.vcxproj | 138 | ||||
| -rw-r--r-- | src/mongo/db/mongod.vcxproj.filters | 63 | ||||
| -rw-r--r-- | src/mongo/db/mongod_sm.vcxproj | 141 | ||||
| -rw-r--r-- | src/mongo/db/mongod_sm.vcxproj.filters | 72 | ||||
| -rw-r--r-- | src/mongo/dbtests/test.vcxproj | 9 | ||||
| -rwxr-xr-x | src/mongo/dbtests/test.vcxproj.filters | 27 | ||||
| -rw-r--r-- | src/mongo/dbtests/test_sm.vcxproj | 9 | ||||
| -rw-r--r-- | src/mongo/dbtests/test_sm.vcxproj.filters | 27 | ||||
| -rw-r--r-- | src/mongo/s/mongos.vcxproj | 7 | ||||
| -rwxr-xr-x | src/mongo/s/mongos.vcxproj.filters | 21 | ||||
| -rw-r--r-- | src/mongo/s/mongos_sm.vcxproj | 6 | ||||
| -rw-r--r-- | src/mongo/s/mongos_sm.vcxproj.filters | 18 | ||||
| -rwxr-xr-x | src/mongo/shell/mongo.vcxproj | 3 | ||||
| -rw-r--r-- | src/mongo/shell/mongo.vcxproj.filters | 9 | ||||
| -rw-r--r-- | src/mongo/shell/mongo_sm.vcxproj | 2 | ||||
| -rw-r--r-- | src/mongo/shell/mongo_sm.vcxproj.filters | 6 |
16 files changed, 462 insertions, 96 deletions
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj index b0926f3e56a..2a7feeade9a 100644 --- a/src/mongo/db/mongod.vcxproj +++ b/src/mongo/db/mongod.vcxproj @@ -2123,6 +2123,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -2178,7 +2179,17 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj </ClCompile>
<ClCompile Include="..\scripting\v8_profiler.cpp" />
<ClCompile Include="..\scripting\v8_utils.cpp" />
- <ClCompile Include="..\s\collection_manager.cpp" />
+ <ClCompile Include="..\s\collection_metadata.cpp" />
+ <ClCompile Include="..\s\collection_metadata_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\s\default_version.cpp" />
<ClCompile Include="..\..\third_party\pcre-8.30\pcrecpp.cc" />
<ClCompile Include="..\..\third_party\pcre-8.30\pcre_chartables.c" />
@@ -2206,11 +2217,130 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="..\shell\mongo.cpp" />
<ClCompile Include="..\s\chunk.cpp" />
<ClCompile Include="..\s\config.cpp" />
- <ClCompile Include="..\s\d_chunk_manager.cpp" />
<ClCompile Include="..\s\d_migrate.cpp" />
<ClCompile Include="..\s\d_split.cpp" />
<ClCompile Include="..\s\d_state.cpp" />
<ClCompile Include="..\s\d_writeback.cpp" />
+ <ClCompile Include="..\s\metadata_loader_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_changelog_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_chunk_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_collection_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_config_version_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_database_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_lockpings_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_locks_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_mongos_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_settings_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_shard_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_tags_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\util\processinfo_sunos5.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -3878,6 +4008,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -3908,9 +4039,8 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\scripting\v8_profiler.h" />
<ClInclude Include="..\server.h" />
<ClInclude Include="..\s\chunk.h" />
- <ClInclude Include="..\s\collection_manager.h" />
+ <ClInclude Include="..\s\collection_metadata.h" />
<ClInclude Include="..\s\config.h" />
- <ClInclude Include="..\s\d_chunk_manager.h" />
<ClInclude Include="..\s\d_writeback.h" />
<ClInclude Include="field_parser-inl.h" />
<ClInclude Include="field_parser.h" />
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters index 247a921ce4f..19e6c376c73 100644 --- a/src/mongo/db/mongod.vcxproj.filters +++ b/src/mongo/db/mongod.vcxproj.filters @@ -262,9 +262,6 @@ <ClCompile Include="stats\counters.cpp">
<Filter>db\stats</Filter>
</ClCompile>
- <ClCompile Include="..\s\d_chunk_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_logic.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -1349,9 +1346,6 @@ <ClCompile Include="server_parameters.cpp">
<Filter>db\Source Files\o to z</Filter>
</ClCompile>
- <ClCompile Include="..\s\collection_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\metadata_loader.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -2231,6 +2225,51 @@ <ClCompile Include="commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\metadata_loader_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_changelog_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_chunk_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_collection_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_config_version_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_database_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_lockpings_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_locks_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_mongos_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_settings_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_shard_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_tags_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\third_party\snappy\config.h">
@@ -2909,9 +2948,6 @@ <ClInclude Include="..\s\config.h">
<Filter>s</Filter>
</ClInclude>
- <ClInclude Include="..\s\d_chunk_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\grid.h">
<Filter>s</Filter>
</ClInclude>
@@ -3674,9 +3710,6 @@ <ClInclude Include="server_parameters_inline.h">
<Filter>db\Header Files\o to z</Filter>
</ClInclude>
- <ClInclude Include="..\s\collection_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\metadata_loader.h">
<Filter>s</Filter>
</ClInclude>
@@ -4509,6 +4542,12 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\collection_metadata.h">
+ <Filter>s</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="mongo.ico">
diff --git a/src/mongo/db/mongod_sm.vcxproj b/src/mongo/db/mongod_sm.vcxproj index adb35ba2bdc..2a9881e108a 100644 --- a/src/mongo/db/mongod_sm.vcxproj +++ b/src/mongo/db/mongod_sm.vcxproj @@ -1777,6 +1777,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1849,7 +1850,17 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\s\collection_manager.cpp" />
+ <ClCompile Include="..\s\collection_metadata.cpp" />
+ <ClCompile Include="..\s\collection_metadata_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\s\default_version.cpp" />
<ClCompile Include="..\..\third_party\pcre-8.30\pcrecpp.cc" />
<ClCompile Include="..\..\third_party\pcre-8.30\pcre_chartables.c" />
@@ -1877,11 +1888,130 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="..\shell\mongo.cpp" />
<ClCompile Include="..\s\chunk.cpp" />
<ClCompile Include="..\s\config.cpp" />
- <ClCompile Include="..\s\d_chunk_manager.cpp" />
<ClCompile Include="..\s\d_migrate.cpp" />
<ClCompile Include="..\s\d_split.cpp" />
<ClCompile Include="..\s\d_state.cpp" />
<ClCompile Include="..\s\d_writeback.cpp" />
+ <ClCompile Include="..\s\metadata_loader_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_changelog_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_chunk_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_collection_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_config_version_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_database_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_lockpings_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_locks_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_mongos_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_settings_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_shard_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\s\type_tags_test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\util\processinfo_sunos5.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -3230,6 +3360,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -3259,10 +3390,12 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj </ClInclude>
<ClInclude Include="..\server.h" />
<ClInclude Include="..\s\chunk.h" />
- <ClInclude Include="..\s\collection_manager.h" />
+ <ClInclude Include="..\s\collection_metadata.h" />
<ClInclude Include="..\s\config.h" />
- <ClInclude Include="..\s\d_chunk_manager.h" />
<ClInclude Include="..\s\d_writeback.h" />
+ <ClInclude Include="..\s\type_config_version.h" />
+ <ClInclude Include="..\s\type_mongos.h" />
+ <ClInclude Include="..\s\type_tags.h" />
<ClInclude Include="field_parser-inl.h" />
<ClInclude Include="field_parser.h" />
<ClInclude Include="..\s\grid.h" />
diff --git a/src/mongo/db/mongod_sm.vcxproj.filters b/src/mongo/db/mongod_sm.vcxproj.filters index 775f23362ed..a234a8a8a3a 100644 --- a/src/mongo/db/mongod_sm.vcxproj.filters +++ b/src/mongo/db/mongod_sm.vcxproj.filters @@ -262,9 +262,6 @@ <ClCompile Include="stats\counters.cpp">
<Filter>db\stats</Filter>
</ClCompile>
- <ClCompile Include="..\s\d_chunk_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_logic.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -1007,9 +1004,6 @@ <ClCompile Include="server_parameters.cpp">
<Filter>db\Source Files\o to z</Filter>
</ClCompile>
- <ClCompile Include="..\s\collection_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\metadata_loader.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -1895,6 +1889,51 @@ <ClCompile Include="commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\metadata_loader_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_changelog_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_chunk_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_collection_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_config_version_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_database_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_lockpings_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_locks_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_mongos_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_settings_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_shard_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\type_tags_test.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\third_party\snappy\config.h">
@@ -2714,9 +2753,6 @@ <ClInclude Include="..\s\config.h">
<Filter>s</Filter>
</ClInclude>
- <ClInclude Include="..\s\d_chunk_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\grid.h">
<Filter>s</Filter>
</ClInclude>
@@ -2885,9 +2921,6 @@ <ClInclude Include="server_parameters_inline.h">
<Filter>db\Header Files\o to z</Filter>
</ClInclude>
- <ClInclude Include="..\s\collection_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\metadata_loader.h">
<Filter>s</Filter>
</ClInclude>
@@ -3693,6 +3726,21 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\collection_metadata.h">
+ <Filter>s</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\type_config_version.h">
+ <Filter>s</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\type_mongos.h">
+ <Filter>s</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\type_tags.h">
+ <Filter>s</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="mongo.ico">
diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj index bea5ba45fff..0378ab79db8 100644 --- a/src/mongo/dbtests/test.vcxproj +++ b/src/mongo/dbtests/test.vcxproj @@ -845,6 +845,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -880,11 +881,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\server.h" />
<ClInclude Include="..\s\chunk.h" />
<ClInclude Include="..\s\cluster_client_internal.h" />
- <ClInclude Include="..\s\collection_manager.h" />
+ <ClInclude Include="..\s\collection_metadata.h" />
<ClInclude Include="..\s\config.h" />
<ClInclude Include="..\s\config_upgrade.h" />
<ClInclude Include="..\s\config_upgrade_helpers.h" />
- <ClInclude Include="..\s\d_chunk_manager.h" />
<ClInclude Include="..\s\d_logic.h" />
<ClInclude Include="..\s\d_writeback.h" />
<ClInclude Include="..\db\field_parser.h" />
@@ -3273,6 +3273,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -3310,7 +3311,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="..\scripting\v8_profiler.cpp" />
<ClCompile Include="..\scripting\v8_utils.cpp" />
<ClCompile Include="..\s\cluster_client_internal.cpp" />
- <ClCompile Include="..\s\collection_manager.cpp" />
+ <ClCompile Include="..\s\collection_metadata.cpp" />
<ClCompile Include="..\s\config_upgrade.cpp" />
<ClCompile Include="..\s\config_upgrade_helpers.cpp" />
<ClCompile Include="..\s\config_upgrade_v0_to_v4.cpp" />
@@ -3367,7 +3368,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="..\scripting\bench.cpp" />
<ClCompile Include="..\s\chunk.cpp" />
<ClCompile Include="..\s\config.cpp" />
- <ClCompile Include="..\s\d_chunk_manager.cpp" />
<ClCompile Include="..\s\d_migrate.cpp" />
<ClCompile Include="..\s\d_split.cpp" />
<ClCompile Include="..\s\d_state.cpp" />
@@ -3616,7 +3616,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="directclienttests.cpp" />
<ClCompile Include="documentsourcetests.cpp" />
<ClCompile Include="documenttests.cpp" />
- <ClCompile Include="d_chunk_manager_tests.cpp" />
<ClCompile Include="expressiontests.cpp" />
<ClCompile Include="extsorttests.cpp" />
<ClCompile Include="framework.cpp" />
diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters index e71b8c01363..c6499355e64 100755 --- a/src/mongo/dbtests/test.vcxproj.filters +++ b/src/mongo/dbtests/test.vcxproj.filters @@ -580,9 +580,6 @@ <ClInclude Include="..\s\config.h">
<Filter>s</Filter>
</ClInclude>
- <ClInclude Include="..\s\d_chunk_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\d_logic.h">
<Filter>s</Filter>
</ClInclude>
@@ -1054,9 +1051,6 @@ <ClInclude Include="..\db\server_parameters_inline.h">
<Filter>db\Header Files\o to z</Filter>
</ClInclude>
- <ClInclude Include="..\s\collection_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\metadata_loader.h">
<Filter>s</Filter>
</ClInclude>
@@ -2544,6 +2538,12 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\collection_metadata.h">
+ <Filter>s</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\connpool.cpp">
@@ -2883,9 +2883,6 @@ <ClCompile Include="..\db\dur_recover.cpp">
<Filter>db\Source Files\a to d</Filter>
</ClCompile>
- <ClCompile Include="d_chunk_manager_tests.cpp">
- <Filter>dbtests</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_logic.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -3117,9 +3114,6 @@ <ClCompile Include="..\db\ops\count.cpp">
<Filter>db\ops</Filter>
</ClCompile>
- <ClCompile Include="..\s\d_chunk_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_split.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -3390,9 +3384,6 @@ <ClCompile Include="..\db\server_parameters.cpp">
<Filter>db\Source Files\o to z</Filter>
</ClCompile>
- <ClCompile Include="..\s\collection_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\metadata_loader.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -4927,6 +4918,12 @@ <ClCompile Include="..\db\commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="btreetests.inl">
diff --git a/src/mongo/dbtests/test_sm.vcxproj b/src/mongo/dbtests/test_sm.vcxproj index f206a6b77e9..443c5551a69 100644 --- a/src/mongo/dbtests/test_sm.vcxproj +++ b/src/mongo/dbtests/test_sm.vcxproj @@ -901,6 +901,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -963,11 +964,10 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\server.h" />
<ClInclude Include="..\s\chunk.h" />
<ClInclude Include="..\s\cluster_client_internal.h" />
- <ClInclude Include="..\s\collection_manager.h" />
+ <ClInclude Include="..\s\collection_metadata.h" />
<ClInclude Include="..\s\config.h" />
<ClInclude Include="..\s\config_upgrade.h" />
<ClInclude Include="..\s\config_upgrade_helpers.h" />
- <ClInclude Include="..\s\d_chunk_manager.h" />
<ClInclude Include="..\s\d_logic.h" />
<ClInclude Include="..\s\d_writeback.h" />
<ClInclude Include="..\db\field_parser.h" />
@@ -3564,6 +3564,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -3637,7 +3638,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\s\cluster_client_internal.cpp" />
- <ClCompile Include="..\s\collection_manager.cpp" />
+ <ClCompile Include="..\s\collection_metadata.cpp" />
<ClCompile Include="..\s\config_upgrade.cpp" />
<ClCompile Include="..\s\config_upgrade_helpers.cpp" />
<ClCompile Include="..\s\config_upgrade_v0_to_v4.cpp" />
@@ -3694,7 +3695,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="..\scripting\bench.cpp" />
<ClCompile Include="..\s\chunk.cpp" />
<ClCompile Include="..\s\config.cpp" />
- <ClCompile Include="..\s\d_chunk_manager.cpp" />
<ClCompile Include="..\s\d_migrate.cpp" />
<ClCompile Include="..\s\d_split.cpp" />
<ClCompile Include="..\s\d_state.cpp" />
@@ -3934,7 +3934,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="directclienttests.cpp" />
<ClCompile Include="documentsourcetests.cpp" />
<ClCompile Include="documenttests.cpp" />
- <ClCompile Include="d_chunk_manager_tests.cpp" />
<ClCompile Include="expressiontests.cpp" />
<ClCompile Include="extsorttests.cpp" />
<ClCompile Include="framework.cpp" />
diff --git a/src/mongo/dbtests/test_sm.vcxproj.filters b/src/mongo/dbtests/test_sm.vcxproj.filters index 51ab5486f32..499eceb786f 100644 --- a/src/mongo/dbtests/test_sm.vcxproj.filters +++ b/src/mongo/dbtests/test_sm.vcxproj.filters @@ -674,9 +674,6 @@ <ClInclude Include="..\s\config.h">
<Filter>s</Filter>
</ClInclude>
- <ClInclude Include="..\s\d_chunk_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\d_logic.h">
<Filter>s</Filter>
</ClInclude>
@@ -1148,9 +1145,6 @@ <ClInclude Include="..\db\server_parameters_inline.h">
<Filter>db\Header Files\o to z</Filter>
</ClInclude>
- <ClInclude Include="..\s\collection_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\s\metadata_loader.h">
<Filter>s</Filter>
</ClInclude>
@@ -2055,6 +2049,12 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
+ <ClInclude Include="..\s\collection_metadata.h">
+ <Filter>s</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\connpool.cpp">
@@ -2395,9 +2395,6 @@ <ClCompile Include="..\db\dur_recover.cpp">
<Filter>db\Source Files\a to d</Filter>
</ClCompile>
- <ClCompile Include="d_chunk_manager_tests.cpp">
- <Filter>dbtests</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_logic.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -2629,9 +2626,6 @@ <ClCompile Include="..\db\ops\count.cpp">
<Filter>db\ops</Filter>
</ClCompile>
- <ClCompile Include="..\s\d_chunk_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\d_split.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -3007,9 +3001,6 @@ <ClCompile Include="..\db\server_parameters.cpp">
<Filter>db\Source Files\o to z</Filter>
</ClCompile>
- <ClCompile Include="..\s\collection_manager.cpp">
- <Filter>s</Filter>
- </ClCompile>
<ClCompile Include="..\s\metadata_loader.cpp">
<Filter>s</Filter>
</ClCompile>
@@ -4099,6 +4090,12 @@ <ClCompile Include="..\db\commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
+ <ClCompile Include="..\s\collection_metadata.cpp">
+ <Filter>s</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="btreetests.inl">
diff --git a/src/mongo/s/mongos.vcxproj b/src/mongo/s/mongos.vcxproj index 53a782ed5d6..acae422f786 100644 --- a/src/mongo/s/mongos.vcxproj +++ b/src/mongo/s/mongos.vcxproj @@ -2793,6 +2793,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bench.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
@@ -2885,7 +2886,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="chunk.cpp" />
<ClCompile Include="client_info.cpp" />
<ClCompile Include="cluster_client_internal.cpp" />
- <ClCompile Include="collection_manager.cpp" />
+ <ClCompile Include="collection_metadata.cpp" />
<ClCompile Include="commands_admin.cpp" />
<ClCompile Include="commands_public.cpp" />
<ClCompile Include="config.cpp" />
@@ -3552,6 +3553,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\float_utils.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -3669,12 +3671,11 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="chunk_version.h" />
<ClInclude Include="client_info.h" />
<ClInclude Include="cluster_client_internal.h" />
- <ClInclude Include="collection_manager.h" />
+ <ClInclude Include="collection_metadata.h" />
<ClInclude Include="config.h" />
<ClInclude Include="config_upgrade.h" />
<ClInclude Include="config_upgrade_helpers.h" />
<ClInclude Include="cursors.h" />
- <ClInclude Include="d_chunk_manager.h" />
<ClInclude Include="d_logic.h" />
<ClInclude Include="d_writeback.h" />
<ClInclude Include="..\db\field_parser-inl.h" />
diff --git a/src/mongo/s/mongos.vcxproj.filters b/src/mongo/s/mongos.vcxproj.filters index 9c4a31b0ab3..10b02473e6c 100755 --- a/src/mongo/s/mongos.vcxproj.filters +++ b/src/mongo/s/mongos.vcxproj.filters @@ -831,9 +831,6 @@ <ClCompile Include="..\db\server_parameters.cpp">
<Filter>db\Source Files</Filter>
</ClCompile>
- <ClCompile Include="collection_manager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="metadata_loader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -1815,6 +1812,12 @@ <ClCompile Include="..\db\commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="collection_metadata.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\pch.h" />
@@ -1848,9 +1851,6 @@ <ClInclude Include="cursors.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="d_chunk_manager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="d_logic.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -2364,9 +2364,6 @@ <ClInclude Include="..\db\server_parameters_inline.h">
<Filter>db\Header Files</Filter>
</ClInclude>
- <ClInclude Include="collection_manager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="metadata_loader.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -3496,6 +3493,12 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="collection_metadata.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\base\error_codes.err">
diff --git a/src/mongo/s/mongos_sm.vcxproj b/src/mongo/s/mongos_sm.vcxproj index 8a272d51133..fa94eafdd9e 100644 --- a/src/mongo/s/mongos_sm.vcxproj +++ b/src/mongo/s/mongos_sm.vcxproj @@ -2620,6 +2620,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bench.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
@@ -2739,7 +2740,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClCompile Include="chunk.cpp" />
<ClCompile Include="client_info.cpp" />
<ClCompile Include="cluster_client_internal.cpp" />
- <ClCompile Include="collection_manager.cpp" />
+ <ClCompile Include="collection_metadata.cpp" />
<ClCompile Include="commands_admin.cpp" />
<ClCompile Include="commands_public.cpp" />
<ClCompile Include="config.cpp" />
@@ -3131,6 +3132,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -3275,7 +3277,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="chunk_version.h" />
<ClInclude Include="client_info.h" />
<ClInclude Include="cluster_client_internal.h" />
- <ClInclude Include="collection_manager.h" />
+ <ClInclude Include="collection_metadata.h" />
<ClInclude Include="config.h" />
<ClInclude Include="config_upgrade.h" />
<ClInclude Include="config_upgrade_helpers.h" />
diff --git a/src/mongo/s/mongos_sm.vcxproj.filters b/src/mongo/s/mongos_sm.vcxproj.filters index 353847f446b..d7f587168dd 100644 --- a/src/mongo/s/mongos_sm.vcxproj.filters +++ b/src/mongo/s/mongos_sm.vcxproj.filters @@ -885,9 +885,6 @@ <ClCompile Include="..\db\server_parameters.cpp">
<Filter>db\Source Files</Filter>
</ClCompile>
- <ClCompile Include="collection_manager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="metadata_loader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -1413,6 +1410,12 @@ <ClCompile Include="..\db\commands\user_management_commands.cpp">
<Filter>db\commands</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
+ <ClCompile Include="collection_metadata.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\pch.h" />
@@ -2103,9 +2106,6 @@ <ClInclude Include="..\db\server_parameters_inline.h">
<Filter>db\Header Files</Filter>
</ClInclude>
- <ClInclude Include="collection_manager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="metadata_loader.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -2623,6 +2623,12 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
+ <ClInclude Include="collection_metadata.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\third_party\js-1.7\jskeyword.tbl">
diff --git a/src/mongo/shell/mongo.vcxproj b/src/mongo/shell/mongo.vcxproj index 02869755cc4..01b6ebde27f 100755 --- a/src/mongo/shell/mongo.vcxproj +++ b/src/mongo/shell/mongo.vcxproj @@ -1272,6 +1272,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1875,6 +1876,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
@@ -2007,7 +2009,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\db\stats\top.h" />
<ClInclude Include="..\pch.h" />
<ClInclude Include="..\scripting\engine.h" />
- <ClInclude Include="..\s\d_chunk_manager.h" />
<ClInclude Include="..\s\shard.h" />
<ClInclude Include="..\util\allocator.h" />
<ClInclude Include="..\util\assert_util.h" />
diff --git a/src/mongo/shell/mongo.vcxproj.filters b/src/mongo/shell/mongo.vcxproj.filters index cfbadbc399a..f33187aa353 100644 --- a/src/mongo/shell/mongo.vcxproj.filters +++ b/src/mongo/shell/mongo.vcxproj.filters @@ -1073,6 +1073,9 @@ <ClCompile Include="..\platform\process_id_test.cpp">
<Filter>platform</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\third_party\v8\src\apinatives.js">
@@ -1225,9 +1228,6 @@ <ClInclude Include="..\client\constants.h">
<Filter>client</Filter>
</ClInclude>
- <ClInclude Include="..\s\d_chunk_manager.h">
- <Filter>s</Filter>
- </ClInclude>
<ClInclude Include="..\client\dbclient_rs.h">
<Filter>client</Filter>
</ClInclude>
@@ -2467,6 +2467,9 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\db\db.rc">
diff --git a/src/mongo/shell/mongo_sm.vcxproj b/src/mongo/shell/mongo_sm.vcxproj index 1547a43d4ea..e262c49e28f 100644 --- a/src/mongo/shell/mongo_sm.vcxproj +++ b/src/mongo/shell/mongo_sm.vcxproj @@ -1095,6 +1095,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator.cpp" />
<ClCompile Include="..\scripting\bson_template_evaluator_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1447,6 +1448,7 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj <ClInclude Include="..\platform\hash_namespace.h" />
<ClInclude Include="..\platform\process_id.h" />
<ClInclude Include="..\platform\random.h" />
+ <ClInclude Include="..\platform\strcasestr.h" />
<ClInclude Include="..\platform\strtoll.h" />
<ClInclude Include="..\platform\unordered_map.h" />
<ClInclude Include="..\platform\unordered_set.h" />
diff --git a/src/mongo/shell/mongo_sm.vcxproj.filters b/src/mongo/shell/mongo_sm.vcxproj.filters index ac25331f2a5..a44fb81386e 100644 --- a/src/mongo/shell/mongo_sm.vcxproj.filters +++ b/src/mongo/shell/mongo_sm.vcxproj.filters @@ -680,6 +680,9 @@ <ClCompile Include="..\platform\process_id_test.cpp">
<Filter>platform</Filter>
</ClCompile>
+ <ClCompile Include="..\platform\strcasestr.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\third_party\js-1.7\jskeyword.tbl">
@@ -1537,6 +1540,9 @@ <ClInclude Include="..\platform\process_id.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\strcasestr.h">
+ <Filter>platform</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\db\db.rc">
|