Merge branches 'ignite-gg-10457' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10457
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60c4d651 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60c4d651 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60c4d651 Branch: refs/heads/ignite-gg-10239 Commit: 60c4d651fb02b24d8f18b9ee85cae3735501bbb2 Parents: 12821b7 359b431 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jun 24 09:42:57 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jun 24 09:42:57 2015 +0700 ---------------------------------------------------------------------- .../configuration/IgniteReflectionFactory.java | 81 ++++++- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 9 +- .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 + .../testframework/junits/GridAbstractTest.java | 2 +- modules/hadoop/pom.xml | 78 ------ .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java | 29 +++ .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +-- .../internal/processors/hadoop/HadoopUtils.java | 237 ------------------ .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 +++++++++++++++++++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 ++++++- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 ++- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 7 +- .../processors/hadoop/HadoopTasksV2Test.java | 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- 29 files changed, 566 insertions(+), 389 deletions(-) ----------------------------------------------------------------------
