Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1689a203 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1689a203 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1689a203 Branch: refs/heads/ignite-237 Commit: 1689a203b0dca44b2435e676d5c2c9c9c3fda095 Parents: 4f0feee dd66167 Author: sboikov <sboi...@gridgain.com> Authored: Fri Feb 27 17:16:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Feb 27 17:16:36 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 12 + .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../configuration/QueryConfiguration.java | 37 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../config/GridTestProperties.java | 10 +- .../client/hadoop/GridHadoopClientProtocol.java | 6 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 ++++++++++++++++++ .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 ------------------- .../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../processors/hadoop/GridHadoopSetup.java | 8 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../GridHadoopExternalCommunication.java | 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- .../hadoop/GridHadoopGroupingTest.java | 4 +- .../igfs/IgfsPerformanceBenchmark.java | 9 +- 28 files changed, 530 insertions(+), 468 deletions(-) ----------------------------------------------------------------------
