Merge branches 'ignite-141-2' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141-2
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72e9e0a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72e9e0a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72e9e0a3
Branch: refs/heads/ignite-gg-9828
Commit: 72e9e0a3a3d279412b81f90559b01a28ac6ddce8
Parents: 2578b7d 73d8d4c
Author: Valentin Kulichenko <[email protected]>
Authored: Tue Mar 10 12:10:01 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Tue Mar 10 12:10:01 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 +-
.../org/apache/ignite/IgniteFileSystem.java | 24 +-
.../apache/ignite/IgniteSystemProperties.java | 15 +-
.../configuration/HadoopConfiguration.java | 17 +-
.../IgfsConcurrentModificationException.java | 29 +-
.../ignite/igfs/IgfsCorruptedFileException.java | 16 +-
.../igfs/IgfsDirectoryNotEmptyException.java | 56 ++
.../org/apache/ignite/igfs/IgfsException.java | 16 +-
.../ignite/igfs/IgfsFileNotFoundException.java | 44 --
.../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 | 56 ++
.../igfs/secondary/IgfsSecondaryFileSystem.java | 10 +-
.../internal/ComputeTaskInternalFuture.java | 3 +
.../apache/ignite/internal/IgniteKernal.java | 24 +-
.../client/impl/GridClientFutureAdapter.java | 3 +
.../igfs/common/IgfsControlResponse.java | 4 +-
.../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 +
.../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 +
.../igfs/IgfsDirectoryNotEmptyException.java | 44 --
.../internal/processors/igfs/IgfsFileImpl.java | 7 +
.../internal/processors/igfs/IgfsFileInfo.java | 3 +-
.../internal/processors/igfs/IgfsImpl.java | 601 ++++++++-----------
.../processors/igfs/IgfsInputStreamImpl.java | 8 +-
.../processors/igfs/IgfsMetaManager.java | 45 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 2 +-
.../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 | 6 +
.../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 +
.../visor/node/VisorGridConfiguration.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 3 +
.../apache/ignite/transactions/Transaction.java | 6 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +-
.../cache/eviction/GridCacheMockEntry.java | 5 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 33 +-
.../nio/impl/GridNioFilterChainSelfTest.java | 7 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 80 +--
.../ignite/testframework/GridTestUtils.java | 13 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 15 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 14 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 8 +-
.../processors/hadoop/HadoopProcessor.java | 4 +-
.../hadoop/igfs/HadoopIgfsFuture.java | 3 +
.../processors/hadoop/igfs/HadoopIgfsUtils.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 +-
.../ignite/loadtests/igfs/IgfsNodeStartup.java | 48 --
.../igfs/IgfsPerformanceBenchmark.java | 281 ---------
.../testsuites/IgniteHadoopTestSuite.java | 6 +-
pom.xml | 69 ++-
134 files changed, 1275 insertions(+), 1834 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSortingExternalTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72e9e0a3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
----------------------------------------------------------------------
