Merge branches 'ignite-gg-9621' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9621
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ead66e7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ead66e7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ead66e7e Branch: refs/heads/ignite-gg-9621 Commit: ead66e7ed62f5134b98be984f098655ef4d04c68 Parents: 2b443d9 c9f7291 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jun 5 10:14:08 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jun 5 10:14:08 2015 +0700 ---------------------------------------------------------------------- .../managers/communication/GridIoManager.java | 117 ++++---- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 19 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java | 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- ...niteDynamicCacheWithConfigStartSelfTest.java | 97 +++++++ .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++++++++++++++++++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java | 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++++++++++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java | 5 +- .../processors/hadoop/HadoopTasksV2Test.java | 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + 32 files changed, 999 insertions(+), 191 deletions(-) ----------------------------------------------------------------------
