diff options
author | Mathias Stearn <mathias@10gen.com> | 2012-08-02 19:02:17 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2012-08-02 19:02:17 -0400 |
commit | 3bb4644a36c22179df8decd0152a8c5dd77a852c (patch) | |
tree | ae36e5472825fe69fbbf671ef3796d070d4a629a /src/mongo/db | |
parent | e9bfafe93d0509a46f43e1ee8d8cc0a2bb64bd53 (diff) | |
download | mongo-3bb4644a36c22179df8decd0152a8c5dd77a852c.tar.gz |
Move remaining aggregation files from commands directory to pipeline
pipeline_command.cpp remains in commands because it contains the actual command
Diffstat (limited to 'src/mongo/db')
-rwxr-xr-x | src/mongo/db/commands/pipeline_command.cpp | 4 | ||||
-rwxr-xr-x | src/mongo/db/mongod.vcxproj | 14 | ||||
-rwxr-xr-x | src/mongo/db/mongod.vcxproj.filters | 24 | ||||
-rw-r--r-- | src/mongo/db/pipeline/document_source_command_shards.cpp (renamed from src/mongo/db/pipeline/document_source_command_futures.cpp) | 0 | ||||
-rwxr-xr-x | src/mongo/db/pipeline/document_source_cursor.cpp (renamed from src/mongo/db/commands/document_source_cursor.cpp) | 0 | ||||
-rw-r--r-- | src/mongo/db/pipeline/pipeline.cpp (renamed from src/mongo/db/commands/pipeline.cpp) | 2 | ||||
-rwxr-xr-x | src/mongo/db/pipeline/pipeline.h (renamed from src/mongo/db/commands/pipeline.h) | 0 | ||||
-rwxr-xr-x | src/mongo/db/pipeline/pipeline_d.cpp (renamed from src/mongo/db/commands/pipeline_d.cpp) | 4 | ||||
-rwxr-xr-x | src/mongo/db/pipeline/pipeline_d.h (renamed from src/mongo/db/commands/pipeline_d.h) | 0 |
9 files changed, 24 insertions, 24 deletions
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp index 02df436bdcb..6527fc4ca07 100755 --- a/src/mongo/db/commands/pipeline_command.cpp +++ b/src/mongo/db/commands/pipeline_command.cpp @@ -16,8 +16,8 @@ #include "pch.h" -#include "db/commands/pipeline.h" -#include "db/commands/pipeline_d.h" +#include "db/pipeline/pipeline.h" +#include "db/pipeline/pipeline_d.h" #include "db/interrupt_status_mongod.h" #include "db/pipeline/accumulator.h" #include "db/pipeline/document.h" diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj index 390897dbe0b..277f770bc56 100755 --- a/src/mongo/db/mongod.vcxproj +++ b/src/mongo/db/mongod.vcxproj @@ -1098,7 +1098,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).." <ClCompile Include="btreebuilder.cpp" />
<ClCompile Include="cap.cpp" />
<ClCompile Include="commands\distinct.cpp" />
- <ClCompile Include="commands\document_source_cursor.cpp" />
+ <ClCompile Include="pipeline\document_source_cursor.cpp" />
<ClCompile Include="commands\find_and_modify.cpp" />
<ClCompile Include="commands\fsync.cpp" />
<ClCompile Include="commands\group.cpp" />
@@ -1106,8 +1106,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).." <ClCompile Include="commands\isself.cpp" />
<ClCompile Include="commands\mr.cpp" />
<ClCompile Include="commands\pipeline_command.cpp" />
- <ClCompile Include="commands\pipeline.cpp" />
- <ClCompile Include="commands\pipeline_d.cpp" />
+ <ClCompile Include="pipeline\pipeline.cpp" />
+ <ClCompile Include="pipeline\pipeline_d.cpp" />
<ClCompile Include="commands\touch.cpp" />
<ClCompile Include="compact.cpp" />
<ClCompile Include="connection_factory.cpp" />
@@ -1156,7 +1156,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).." <ClCompile Include="pipeline\document.cpp" />
<ClCompile Include="pipeline\document_source.cpp" />
<ClCompile Include="pipeline\document_source_bson_array.cpp" />
- <ClCompile Include="pipeline\document_source_command_futures.cpp" />
+ <ClCompile Include="pipeline\document_source_command_shards.cpp" />
<ClCompile Include="pipeline\document_source_filter.cpp" />
<ClCompile Include="pipeline\document_source_filter_base.cpp" />
<ClCompile Include="pipeline\document_source_group.cpp" />
@@ -1405,8 +1405,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).." <ClInclude Include="..\util\text.h" />
<ClInclude Include="..\util\time_support.h" />
<ClInclude Include="..\util\trace.h" />
- <ClInclude Include="commands\pipeline.h" />
- <ClInclude Include="commands\pipeline_d.h" />
+ <ClInclude Include="pipeline\pipeline.h" />
+ <ClInclude Include="pipeline\pipeline_d.h" />
<ClInclude Include="databaseholder.h" />
<ClInclude Include="durop.h" />
<ClInclude Include="dur_commitjob.h" />
@@ -1535,4 +1535,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).." <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters index abf0ece9e1d..8f45869f89c 100755 --- a/src/mongo/db/mongod.vcxproj.filters +++ b/src/mongo/db/mongod.vcxproj.filters @@ -163,8 +163,8 @@ <ClCompile Include="commands\distinct.cpp">
<Filter>db\commands</Filter>
</ClCompile>
- <ClCompile Include="commands\document_source_cursor.cpp">
- <Filter>db\commands</Filter>
+ <ClCompile Include="pipeline\document_source_cursor.cpp">
+ <Filter>db\pipeline</Filter>
</ClCompile>
<ClCompile Include="geo\2d.cpp">
<Filter>db\geo</Filter>
@@ -211,7 +211,7 @@ <ClCompile Include="pipeline\document_source_bson_array.cpp">
<Filter>db\pipeline\Source Files</Filter>
</ClCompile>
- <ClCompile Include="pipeline\document_source_command_futures.cpp">
+ <ClCompile Include="pipeline\document_source_command_shards.cpp">
<Filter>db\pipeline\Source Files</Filter>
</ClCompile>
<ClCompile Include="pipeline\document_source_filter.cpp">
@@ -395,14 +395,14 @@ <Filter>util\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\pch.cpp" />
- <ClCompile Include="commands\pipeline.cpp">
- <Filter>db\commands</Filter>
+ <ClCompile Include="pipeline\pipeline.cpp">
+ <Filter>db\pipeline</Filter>
</ClCompile>
<ClCompile Include="commands\pipeline_command.cpp">
<Filter>db\commands</Filter>
</ClCompile>
- <ClCompile Include="commands\pipeline_d.cpp">
- <Filter>db\commands</Filter>
+ <ClCompile Include="pipeline\pipeline_d.cpp">
+ <Filter>db\pipeline</Filter>
</ClCompile>
<ClCompile Include="..\util\processinfo.cpp">
<Filter>util\Source Files</Filter>
@@ -1146,11 +1146,11 @@ <ClInclude Include="..\util\optime.h">
<Filter>util\Header Files</Filter>
</ClInclude>
- <ClInclude Include="commands\pipeline.h">
- <Filter>db\commands</Filter>
+ <ClInclude Include="pipeline\pipeline.h">
+ <Filter>db\pipeline</Filter>
</ClInclude>
- <ClInclude Include="commands\pipeline_d.h">
- <Filter>db\commands</Filter>
+ <ClInclude Include="pipeline\pipeline_d.h">
+ <Filter>db\pipeline</Filter>
</ClInclude>
<ClInclude Include="..\util\processinfo.h">
<Filter>util\Header Files</Filter>
@@ -1818,4 +1818,4 @@ <Filter>db\Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/src/mongo/db/pipeline/document_source_command_futures.cpp b/src/mongo/db/pipeline/document_source_command_shards.cpp index a0d5423b449..a0d5423b449 100644 --- a/src/mongo/db/pipeline/document_source_command_futures.cpp +++ b/src/mongo/db/pipeline/document_source_command_shards.cpp diff --git a/src/mongo/db/commands/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index c99504ad446..c99504ad446 100755 --- a/src/mongo/db/commands/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp diff --git a/src/mongo/db/commands/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp index b03624d2a08..0bd4096fe78 100644 --- a/src/mongo/db/commands/pipeline.cpp +++ b/src/mongo/db/pipeline/pipeline.cpp @@ -15,7 +15,7 @@ */ #include "pch.h" -#include "db/commands/pipeline.h" +#include "db/pipeline/pipeline.h" #include "mongo/client/authentication_table.h" #include "db/jsobj.h" diff --git a/src/mongo/db/commands/pipeline.h b/src/mongo/db/pipeline/pipeline.h index f3d324333b5..f3d324333b5 100755 --- a/src/mongo/db/commands/pipeline.h +++ b/src/mongo/db/pipeline/pipeline.h diff --git a/src/mongo/db/commands/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index 7dc6fc1a759..ed075f727fa 100755 --- a/src/mongo/db/commands/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -15,8 +15,8 @@ */ #include "pch.h" -#include "db/commands/pipeline.h" -#include "db/commands/pipeline_d.h" +#include "db/pipeline/pipeline.h" +#include "db/pipeline/pipeline_d.h" #include "db/cursor.h" #include "db/queryutil.h" diff --git a/src/mongo/db/commands/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h index a514fe22fbc..a514fe22fbc 100755 --- a/src/mongo/db/commands/pipeline_d.h +++ b/src/mongo/db/pipeline/pipeline_d.h |