Merge branches 'ignite-439' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-439
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce2fa203 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce2fa203 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce2fa203 Branch: refs/heads/ignite-329 Commit: ce2fa203798dd2665a18c25172a278de2d3c351a Parents: f2dbede 73d8d4c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 11 06:21:40 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 11 06:21:40 2015 +0700 ---------------------------------------------------------------------- bin/include/target-classpath.bat | 2 +- bin/include/target-classpath.sh | 2 +- license/header-customisation.xml | 51 - license/header.txt | 14 - .../rest/protocols/tcp/MockNioSession.java | 7 +- modules/clients/src/test/keystore/generate.sh | 26 +- .../configuration/HadoopConfiguration.java | 17 +- .../IgfsConcurrentModificationException.java | 29 +- .../ignite/igfs/IgfsCorruptedFileException.java | 16 +- .../igfs/IgfsDirectoryNotEmptyException.java | 20 +- .../org/apache/ignite/igfs/IgfsException.java | 16 +- .../igfs/IgfsInvalidHdfsVersionException.java | 23 +- .../ignite/igfs/IgfsInvalidPathException.java | 16 +- .../ignite/igfs/IgfsOutOfSpaceException.java | 16 +- .../igfs/IgfsParentNotDirectoryException.java | 20 +- .../igfs/IgfsPathAlreadyExistsException.java | 19 +- .../igfs/IgfsPathIsDirectoryException.java | 56 + .../igfs/IgfsPathIsNotDirectoryException.java | 56 + .../ignite/igfs/IgfsPathNotFoundException.java | 22 +- .../internal/ComputeTaskInternalFuture.java | 3 + .../client/impl/GridClientFutureAdapter.java | 3 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../processors/cache/EvictableEntryImpl.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 28 +- .../cache/GridCacheEvictionManager.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 50 +- .../cache/GridCacheMultiTxFuture.java | 3 + .../processors/cache/GridCacheMvccManager.java | 3 + .../processors/cache/GridCacheStoreManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 10 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 6 + .../dht/GridDhtAssignmentFetchFuture.java | 3 + .../distributed/dht/GridDhtCacheAdapter.java | 3 + .../distributed/dht/GridDhtEmbeddedFuture.java | 3 + .../cache/distributed/dht/GridDhtGetFuture.java | 3 + .../distributed/dht/GridDhtLockFuture.java | 6 + .../distributed/dht/GridDhtTxFinishFuture.java | 6 + .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../dht/GridPartitionedGetFuture.java | 6 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 3 + .../colocated/GridDhtColocatedLockFuture.java | 6 + .../dht/preloader/GridDhtForceKeysFuture.java | 6 + .../preloader/GridDhtPartitionDemandPool.java | 3 + .../GridDhtPartitionsExchangeFuture.java | 3 + .../distributed/near/GridNearGetFuture.java | 6 + .../distributed/near/GridNearLockFuture.java | 6 + .../near/GridNearTxFinishFuture.java | 6 + .../near/GridNearTxPrepareFuture.java | 16 +- .../extras/GridCacheAttributesEntryExtras.java | 10 +- .../GridCacheAttributesMvccEntryExtras.java | 10 +- ...dCacheAttributesMvccObsoleteEntryExtras.java | 10 +- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 10 +- .../GridCacheAttributesMvccTtlEntryExtras.java | 10 +- .../GridCacheAttributesObsoleteEntryExtras.java | 10 +- ...idCacheAttributesObsoleteTtlEntryExtras.java | 10 +- .../GridCacheAttributesTtlEntryExtras.java | 10 +- .../cache/extras/GridCacheEntryExtras.java | 6 +- .../extras/GridCacheEntryExtrasAdapter.java | 4 +- .../cache/extras/GridCacheMvccEntryExtras.java | 4 +- .../GridCacheMvccObsoleteEntryExtras.java | 4 +- .../GridCacheMvccObsoleteTtlEntryExtras.java | 4 +- .../extras/GridCacheMvccTtlEntryExtras.java | 4 +- .../extras/GridCacheObsoleteEntryExtras.java | 4 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 4 +- .../cache/extras/GridCacheTtlEntryExtras.java | 4 +- .../cache/local/GridLocalLockFuture.java | 3 + .../cache/local/GridLocalTxFuture.java | 3 + .../GridCacheDistributedFieldsQueryFuture.java | 3 + .../query/GridCacheDistributedQueryFuture.java | 3 + .../query/GridCacheLocalFieldsQueryFuture.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../cache/transactions/IgniteInternalTx.java | 6 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../transactions/TransactionProxyImpl.java | 6 +- .../closure/GridClosureProcessor.java | 2 - .../continuous/GridContinuousProcessor.java | 6 + .../dataload/GridDataLoaderFuture.java | 3 + .../processors/igfs/IgfsDataManager.java | 3 + .../internal/processors/igfs/IgfsFileImpl.java | 7 + .../internal/processors/igfs/IgfsFileInfo.java | 3 +- .../internal/processors/igfs/IgfsImpl.java | 583 +++---- .../processors/igfs/IgfsMetaManager.java | 25 +- .../internal/processors/igfs/IgfsUtils.java | 86 + .../service/GridServiceDeploymentFuture.java | 3 + .../GridStreamerStageExecutionFuture.java | 3 + .../ignite/internal/util/IgniteUtils.java | 17 +- .../util/future/GridCompoundFuture.java | 3 + .../util/future/GridCompoundIdentityFuture.java | 3 + .../util/future/GridEmbeddedFuture.java | 3 + .../internal/util/future/GridFutureAdapter.java | 9 + .../util/lang/GridMetadataAwareAdapter.java | 71 +- .../util/nio/GridNioEmbeddedFuture.java | 3 + .../internal/util/nio/GridNioFutureImpl.java | 3 + .../ignite/internal/util/nio/GridNioServer.java | 3 + .../internal/util/worker/GridWorkerFuture.java | 3 + .../lang/IgniteFutureCancelledException.java | 3 + .../lang/IgniteFutureTimeoutException.java | 3 + .../optimized/optimized-classnames.properties | 1529 ++++++++++++++++++ .../communication/tcp/TcpCommunicationSpi.java | 3 + .../apache/ignite/transactions/Transaction.java | 6 +- .../cache/eviction/GridCacheMockEntry.java | 5 +- .../processors/igfs/IgfsAbstractSelfTest.java | 31 +- .../nio/impl/GridNioFilterChainSelfTest.java | 7 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 80 +- .../ignite/testframework/GridTestUtils.java | 13 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 5 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 14 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 8 +- .../processors/hadoop/HadoopProcessor.java | 4 +- .../hadoop/igfs/HadoopIgfsFuture.java | 3 + .../external/HadoopExternalTaskExecutor.java | 3 + .../HadoopClientProtocolEmbeddedSelfTest.java | 3 +- .../java/org/apache/ignite/igfs/IgfsLoad.java | 549 ------- .../processors/hadoop/HadoopGroupingTest.java | 3 +- .../hadoop/HadoopJobTrackerSelfTest.java | 4 +- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 3 +- .../hadoop/HadoopSortingExternalTest.java | 3 +- .../processors/hadoop/HadoopSortingTest.java | 3 +- .../hadoop/HadoopTaskExecutionSelfTest.java | 6 +- .../HadoopExternalTaskExecutionSelfTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 6 +- pom.xml | 69 +- 124 files changed, 2660 insertions(+), 1353 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce2fa203/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ----------------------------------------------------------------------
