Merge to master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3af61f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3af61f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3af61f7 Branch: refs/heads/ignite-1232 Commit: b3af61f76b373210a8902a3335e922a3fd173524 Parents: d31a476 d33f4db Author: Alexey Kuznetsov <[email protected]> Authored: Tue Jul 5 17:26:25 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Jul 5 17:26:25 2016 +0700 ---------------------------------------------------------------------- bin/include/hadoop-classpath.bat | 73 -- bin/include/hadoop-classpath.sh | 65 -- bin/include/setenv.bat | 4 +- bin/include/setenv.sh | 25 +- .../org/apache/ignite/IgniteDataStreamer.java | 5 +- .../ignite/binary/BinaryObjectBuilder.java | 11 + .../configuration/HadoopConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 52 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../processors/hadoop/HadoopNoopProcessor.java | 5 + .../hadoop/HadoopProcessorAdapter.java | 7 + .../service/GridServiceProcessor.java | 2 +- .../visor/cache/VisorCachePartitionsTask.java | 2 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 2 +- .../internal/visor/igfs/VisorIgfsMetrics.java | 11 +- .../service/IgniteServiceReassignmentTest.java | 250 ++++ .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../IgniteHadoopClientProtocolProvider.java | 1 + .../processors/hadoop/HadoopClassLoader.java | 73 +- .../processors/hadoop/HadoopClasspathMain.java | 44 + .../processors/hadoop/HadoopClasspathUtils.java | 233 ++++ .../processors/hadoop/HadoopLocations.java | 78 ++ .../processors/hadoop/HadoopProcessor.java | 79 +- .../include/ignite/binary/binary_containers.h | 6 +- .../include/ignite/binary/binary_raw_reader.h | 6 +- .../include/ignite/binary/binary_reader.h | 6 +- .../ignite/impl/binary/binary_reader_impl.h | 11 +- .../ignite/impl/binary/binary_writer_impl.h | 2 +- modules/platforms/cpp/common/Makefile.am | 5 +- .../platforms/cpp/common/include/Makefile.am | 19 +- .../common/include/ignite/common/big_integer.h | 523 +++++++++ .../cpp/common/include/ignite/common/bits.h | 218 ++++ .../cpp/common/include/ignite/common/decimal.h | 527 +++++++++ .../include/ignite/common/default_allocator.h | 95 ++ .../include/ignite/common/dynamic_size_array.h | 415 +++++++ .../include/ignite/common/fixed_size_array.h | 288 +++++ .../cpp/common/include/ignite/common/utils.h | 81 +- .../platforms/cpp/common/include/ignite/guid.h | 4 +- .../cpp/common/os/win/src/common/utils.cpp | 21 - .../cpp/common/project/vs/common.vcxproj | 17 +- .../common/project/vs/common.vcxproj.filters | 27 + .../cpp/common/src/common/big_integer.cpp | 830 +++++++++++++ .../platforms/cpp/common/src/common/bits.cpp | 233 ++++ .../platforms/cpp/common/src/common/decimal.cpp | 275 +++++ modules/platforms/cpp/core-test/Makefile.am | 4 + .../cpp/core-test/project/vs/core-test.vcxproj | 9 +- .../project/vs/core-test.vcxproj.filters | 14 +- .../platforms/cpp/core-test/src/bits_test.cpp | 124 ++ .../cpp/core-test/src/decimal_test.cpp | 1101 ++++++++++++++++++ .../core-test/src/dynamic_size_array_test.cpp | 360 ++++++ .../cpp/core-test/src/fixed_size_array_test.cpp | 208 ++++ .../cpp/core/include/ignite/cache/cache_entry.h | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 1 - .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 - .../project/vs/odbc-test.vcxproj.filters | 3 - .../src/application_data_buffer_test.cpp | 35 +- .../platforms/cpp/odbc-test/src/row_test.cpp | 5 +- modules/platforms/cpp/odbc/Makefile.am | 1 - modules/platforms/cpp/odbc/include/Makefile.am | 1 - .../ignite/odbc/app/application_data_buffer.h | 11 +- .../cpp/odbc/include/ignite/odbc/decimal.h | 137 --- .../cpp/odbc/include/ignite/odbc/utility.h | 12 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 - .../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 - .../odbc/src/app/application_data_buffer.cpp | 165 ++- .../platforms/cpp/odbc/src/app/parameter.cpp | 6 +- modules/platforms/cpp/odbc/src/column.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 1 - modules/platforms/cpp/odbc/src/decimal.cpp | 135 --- modules/platforms/cpp/odbc/src/odbc.cpp | 3 - modules/platforms/cpp/odbc/src/utility.cpp | 25 +- 71 files changed, 6265 insertions(+), 752 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3af61f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3af61f7/modules/platforms/cpp/core-test/Makefile.am ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3af61f7/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj ---------------------------------------------------------------------- diff --cc modules/platforms/cpp/core-test/project/vs/core-test.vcxproj index a7ffad8,acdfee0..c18b1c3 --- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj +++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj @@@ -45,7 -51,7 +51,8 @@@ <ClCompile Include="..\..\src\binary_test_defs.cpp" /> <ClCompile Include="..\..\src\cache_query_test.cpp" /> <ClCompile Include="..\..\src\interop_memory_test.cpp" /> + <ClCompile Include="..\..\src\interop_test.cpp" /> + <ClCompile Include="..\..\src\bits_test.cpp" /> <ClCompile Include="..\..\src\teamcity_boost.cpp" /> <ClCompile Include="..\..\src\teamcity_messages.cpp" /> <ClCompile Include="..\..\src\transactions_test.cpp" /> @@@ -178,4 -184,4 +185,4 @@@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> --</Project> ++</Project> http://git-wip-us.apache.org/repos/asf/ignite/blob/b3af61f7/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters ---------------------------------------------------------------------- diff --cc modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters index 39e2aee,0366374..0059364 --- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters +++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters @@@ -43,9 -43,18 +43,21 @@@ <ClCompile Include="..\..\src\transactions_test.cpp"> <Filter>Code</Filter> </ClCompile> + <ClCompile Include="..\..\src\bits_test.cpp"> + <Filter>Code</Filter> + </ClCompile> + <ClCompile Include="..\..\src\decimal_test.cpp"> + <Filter>Code</Filter> + </ClCompile> + <ClCompile Include="..\..\src\fixed_size_array_test.cpp"> + <Filter>Code</Filter> + </ClCompile> + <ClCompile Include="..\..\src\dynamic_size_array_test.cpp"> + <Filter>Code</Filter> + </ClCompile> + <ClCompile Include="..\..\src\interop_test.cpp"> + <Filter>Code</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\teamcity_messages.h"> @@@ -77,4 -86,4 +89,4 @@@ <Filter>Configs</Filter> </None> </ItemGroup> --</Project> ++</Project>
