Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73d8d4cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73d8d4cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73d8d4cb Branch: refs/heads/ignite-release-test-no-mod Commit: 73d8d4cb9de52563ce3ef7ead693001b952d0428 Parents: 4218052 f66508a Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Mar 10 21:18:27 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Mar 10 21:18:27 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/MockNioSession.java | 7 +- .../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 +- .../processors/cache/EvictableEntryImpl.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 28 +- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 50 +- .../processors/cache/GridCacheStoreManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 10 +- .../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/transactions/IgniteInternalTx.java | 6 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../transactions/TransactionProxyImpl.java | 6 +- .../closure/GridClosureProcessor.java | 2 - .../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 +++ .../util/lang/GridMetadataAwareAdapter.java | 71 +-- .../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/testsuites/IgniteIgfsTestSuite.java | 2 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 5 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 14 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 8 +- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- 57 files changed, 816 insertions(+), 671 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73d8d4cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ----------------------------------------------------------------------
