Merge branch 'ignite-1786' into ignite-2371
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03efe367 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03efe367 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03efe367 Branch: refs/heads/ignite-1786 Commit: 03efe367de39dcfb2f73dbe6aac3818b4431e21d Parents: d9314b3 578167c Author: isapego <[email protected]> Authored: Wed Jan 13 13:10:29 2016 +0300 Committer: isapego <[email protected]> Committed: Wed Jan 13 13:10:29 2016 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 4 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/FileSystemConfiguration.java | 54 +- .../org/apache/ignite/igfs/IgfsUserContext.java | 16 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 - .../ignite/internal/MarshallerContextImpl.java | 86 ++- .../internal/binary/BinaryClassDescriptor.java | 15 +- .../version/GridCachePlainVersionedEntry.java | 2 +- .../processors/hadoop/HadoopPayloadAware.java | 28 + .../ignite/internal/processors/igfs/IgfsEx.java | 13 - .../internal/processors/igfs/IgfsImpl.java | 28 +- .../internal/processors/igfs/IgfsPaths.java | 62 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 11 - .../visor/node/VisorIgfsConfiguration.java | 43 -- .../core/src/main/resources/ignite.properties | 2 +- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 +++++ .../dht/GridCacheTxNodeFailureSelfTest.java | 6 +- .../processors/igfs/IgfsAbstractSelfTest.java | 8 +- .../igfs/IgfsExUniversalFileSystemAdapter.java | 11 +- .../igfs/UniversalFileSystemAdapter.java | 5 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 10 +- modules/hadoop/pom.xml | 2 +- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 226 ++++++ .../fs/CachingHadoopFileSystemFactory.java | 86 +++ .../hadoop/fs/HadoopFileSystemFactory.java | 52 ++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 260 +++---- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 154 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 122 ++-- .../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 +- ...condaryFileSystemInitializationSelfTest.java | 214 ++++++ .../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 | 26 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 10 +- modules/jcl/pom.xml | 4 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 4 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 6 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 10 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 4 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 4 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 4 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 133 files changed, 3424 insertions(+), 965 deletions(-) ----------------------------------------------------------------------
