Merge branches 'ignite-2949' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2949


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c3d16d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c3d16d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c3d16d1

Branch: refs/heads/ignite-2949
Commit: 2c3d16d150ed4774b546ac79a0c6c0ce89c5175a
Parents: 650fa79 d9f4f6e
Author: Valentin Kulichenko <[email protected]>
Authored: Tue Apr 12 16:41:18 2016 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Tue Apr 12 16:41:18 2016 -0700

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    |  35 +-
 .../processors/hadoop/HadoopNoopProcessor.java  |  24 +-
 .../processors/igfs/IgfsDeleteWorker.java       |  16 +-
 .../processors/igfs/IgfsIpcHandler.java         |  12 +-
 .../processors/igfs/IgfsMetaManager.java        |  26 +-
 .../internal/processors/igfs/IgfsUtils.java     |  34 ++
 ...IgfsMetaDirectoryListingRemoveProcessor.java |   2 -
 .../platform/PlatformNoopProcessor.java         |   4 +-
 .../platform/PlatformProcessorImpl.java         |   9 +
 .../local/LocalAffinityFunctionTest.java        |  80 ++++
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |  26 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  11 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |   2 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   6 +
 ...IgniteHadoopFileSystemHandshakeSelfTest.java | 121 ++++--
 .../hadoop/HadoopAbstractMapReduceTest.java     | 405 +++++++++++++++++++
 .../processors/hadoop/HadoopErrorSimulator.java | 326 +++++++++++++++
 .../HadoopMapReduceErrorResilienceTest.java     | 154 +++++++
 .../processors/hadoop/HadoopMapReduceTest.java  | 380 +----------------
 .../hadoop/HadoopNoHadoopMapReduceTest.java     |  47 +++
 .../hadoop/HadoopSnappyFullMapReduceTest.java   |   8 +
 .../hadoop/examples/HadoopWordCount1Map.java    |  12 +
 .../hadoop/examples/HadoopWordCount1Reduce.java |   5 +
 .../hadoop/examples/HadoopWordCount2.java       |   2 +-
 .../examples/HadoopWordCount2Combiner.java      |  45 +++
 .../hadoop/examples/HadoopWordCount2Mapper.java |  19 +-
 .../examples/HadoopWordCount2Reducer.java       |  43 +-
 .../testsuites/IgniteHadoopTestSuite.java       |  10 +-
 .../Cache/Query/CacheQueriesTest.cs             |  13 +-
 .../Compute/MixedClusterTest.cs                 | 122 ++++--
 .../Config/cache-query.xml                      |   2 +
 32 files changed, 1514 insertions(+), 489 deletions(-)
----------------------------------------------------------------------


Reply via email to