Merge branch 'master' into ignite-2316
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13b4d379 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13b4d379 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13b4d379 Branch: refs/heads/ignite-2316 Commit: 13b4d379d1afd0fac1442df3ca9312e95ce68182 Parents: 1b9700a 10012b4 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Mon Jan 11 18:29:03 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Mon Jan 11 18:29:03 2016 +0300 ---------------------------------------------------------------------- assembly/release-fabric-base.xml | 1 + .../org/apache/ignite/igfs/IgfsUserContext.java | 16 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 - .../GridDistributedTxRemoteAdapter.java | 12 +- .../dht/CacheDistributedGetFutureAdapter.java | 10 +- .../distributed/dht/GridDhtTxFinishFuture.java | 15 +- .../cache/distributed/dht/GridDhtTxLocal.java | 31 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 48 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 94 +-- .../near/GridNearOptimisticTxPrepareFuture.java | 63 +- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../cache/distributed/near/GridNearTxLocal.java | 69 +- .../near/GridNearTxPrepareFutureAdapter.java | 8 +- .../cache/local/GridLocalLockFuture.java | 19 +- .../cache/transactions/IgniteTxAdapter.java | 24 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 38 +- .../processors/hadoop/HadoopPayloadAware.java | 28 + .../ignite/internal/processors/igfs/IgfsEx.java | 13 - .../internal/processors/igfs/IgfsImpl.java | 16 +- .../internal/processors/igfs/IgfsPaths.java | 62 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 11 - .../visor/node/VisorIgfsConfiguration.java | 43 -- .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 8 +- .../igfs/IgfsExUniversalFileSystemAdapter.java | 11 +- .../igfs/UniversalFileSystemAdapter.java | 5 +- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 209 ++++++ .../fs/CachingHadoopFileSystemFactory.java | 86 +++ .../hadoop/fs/HadoopFileSystemFactory.java | 52 ++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 264 +++---- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 144 ++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 115 ++-- .../processors/hadoop/HadoopClassLoader.java | 689 ++++++++++++++----- .../hadoop/SecondaryFileSystemProvider.java | 139 ---- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 8 +- .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 +- .../hadoop/v2/HadoopNativeCodeLoader.java | 74 -- .../ignite/igfs/Hadoop1DualAbstractTest.java | 14 +- .../igfs/HadoopFIleSystemFactorySelfTest.java | 326 +++++++++ ...oopFileSystemUniversalFileSystemAdapter.java | 53 +- ...oopSecondaryFileSystemConfigurationTest.java | 27 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 71 +- .../hadoop/HadoopAbstractWordCountTest.java | 46 +- .../hadoop/HadoopClassLoaderTest.java | 101 ++- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 15 +- .../hadoop/HadoopSnappyFullMapReduceTest.java | 28 + .../processors/hadoop/HadoopSnappyTest.java | 102 +++ .../processors/hadoop/HadoopTasksV2Test.java | 2 +- .../hadoop/deps/CircularWIthHadoop.java | 32 + .../hadoop/deps/CircularWithoutHadoop.java | 27 + .../processors/hadoop/deps/WithCast.java | 41 ++ .../hadoop/deps/WithClassAnnotation.java | 28 + .../hadoop/deps/WithConstructorInvocation.java | 31 + .../processors/hadoop/deps/WithExtends.java | 27 + .../processors/hadoop/deps/WithField.java | 29 + .../processors/hadoop/deps/WithImplements.java | 36 + .../hadoop/deps/WithIndirectField.java | 27 + .../processors/hadoop/deps/WithInitializer.java | 33 + .../processors/hadoop/deps/WithInnerClass.java | 31 + .../hadoop/deps/WithLocalVariable.java | 38 + .../hadoop/deps/WithMethodAnnotation.java | 32 + .../hadoop/deps/WithMethodArgument.java | 31 + .../hadoop/deps/WithMethodCheckedException.java | 31 + .../hadoop/deps/WithMethodInvocation.java | 31 + .../hadoop/deps/WithMethodReturnType.java | 31 + .../hadoop/deps/WithMethodRuntimeException.java | 31 + .../processors/hadoop/deps/WithOuterClass.java | 38 + .../hadoop/deps/WithParameterAnnotation.java | 31 + .../processors/hadoop/deps/WithStaticField.java | 29 + .../hadoop/deps/WithStaticInitializer.java | 34 + .../processors/hadoop/deps/Without.java | 25 + .../hadoop/examples/HadoopWordCount1Reduce.java | 1 + .../hadoop/examples/HadoopWordCount2.java | 18 +- .../examples/HadoopWordCount2Reducer.java | 1 + .../testsuites/IgniteHadoopTestSuite.java | 24 +- 79 files changed, 3025 insertions(+), 998 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/13b4d379/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index c5efc7c,38914ea..b535c4f --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@@ -54,8 -72,9 +54,9 @@@ import org.apache.ignite.internal.Ignit import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; + import org.apache.ignite.internal.processors.hadoop.HadoopPayloadAware; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.GridSpinBusyLock; +import org.apache.ignite.internal.util.GridStripedSpinBusyLock; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter;
