Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/651b252b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/651b252b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/651b252b Branch: refs/heads/ignite-143 Commit: 651b252bea708a8e11f31f4d7cafbb76b849faf9 Parents: 9ec0c86 cefc885 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Feb 27 20:24:50 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Feb 27 20:24:50 2015 +0700 ---------------------------------------------------------------------- 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 +- .../visor/node/VisorBasicConfiguration.java | 17 - .../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 | 2 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../GridHadoopExternalCommunication.java | 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../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 +- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 ++-- .../config/VisorConfigurationCommand.scala | 140 ++++--- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 32 files changed, 686 insertions(+), 593 deletions(-) ----------------------------------------------------------------------
