Merge remote-tracking branch 'origin/ignite-218' into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e529748c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e529748c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e529748c Branch: refs/heads/ignite-218 Commit: e529748c18106008d7e4076ea74e4cb98dff34f8 Parents: 2392904 e8d6bf1 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Apr 17 11:24:03 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Apr 17 11:24:03 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/igfs/IgfsUserContext.java | 98 ++++++++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 -- .../igfs/common/IgfsHandshakeRequest.java | 14 -- .../internal/igfs/common/IgfsMarshaller.java | 4 - .../igfs/common/IgfsPathControlRequest.java | 2 +- .../internal/processors/igfs/IgfsAsyncImpl.java | 11 - .../ignite/internal/processors/igfs/IgfsEx.java | 23 +- .../internal/processors/igfs/IgfsImpl.java | 175 +------------ .../processors/igfs/IgfsIpcHandler.java | 183 +++++++------- .../igfs/IgfsSecondaryFileSystemImpl.java | 12 - .../processors/igfs/IgniteUserContext.java | 168 ------------- .../ignite/internal/util/IgniteUtils.java | 12 - .../apache/ignite/hadoop/fs/ExpirableMap.java | 247 ------------------- .../fs/IgniteHadoopFileSystemCounterWriter.java | 18 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 162 +++++++----- .../ignite/hadoop/fs/LazyConcurrentMap.java | 173 +++++++++++++ .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 85 ++----- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 35 +-- .../hadoop/igfs/HadoopIgfsInProc.java | 196 ++++++++++----- .../hadoop/igfs/HadoopIgfsOutProc.java | 3 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 1 + .../hadoop/taskexecutor/HadoopRunnableTask.java | 16 +- .../processors/hadoop/v2/HadoopV2Job.java | 23 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 33 ++- .../hadoop/v2/HadoopV2TaskContext.java | 8 +- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 10 - parent/pom.xml | 2 +- 29 files changed, 713 insertions(+), 1029 deletions(-) ----------------------------------------------------------------------
