ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-383
Date Tue, 10 Mar 2015 10:24:14 GMT
Merge branch 'sprint-2' into ignite-383

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f470f682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f470f682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f470f682

Branch: refs/heads/ignite-383
Commit: f470f68263aae642b1deb4aedaa8882f8300b7af
Parents: de619d9 9b0ba86
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Fri Mar 6 17:59:15 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Mar 6 17:59:15 2015 +0300

----------------------------------------------------------------------
 bin/igniterouter.sh                             |     7 +-
 bin/ignitevisorcmd.sh                           |     2 +-
 bin/setup-hadoop.bat                            |     2 +-
 bin/setup-hadoop.sh                             |     9 +-
 config/hadoop/default-config.xml                |    10 +-
 docs/core-site.ignite.xml                       |     6 +-
 docs/wiki/basic-concepts/async-support.md       |    75 +
 docs/wiki/basic-concepts/getting-started.md     |   218 +
 docs/wiki/basic-concepts/ignite-life-cycel.md   |   105 +
 docs/wiki/basic-concepts/maven-setup.md         |    68 +
 docs/wiki/basic-concepts/what-is-ignite.md      |    31 +
 docs/wiki/basic-concepts/zero-deployment.md     |    56 +
 docs/wiki/clustering/aws-config.md              |    42 +
 docs/wiki/clustering/cluster-config.md          |   176 +
 docs/wiki/clustering/cluster-groups.md          |   210 +
 docs/wiki/clustering/cluster.md                 |   128 +
 docs/wiki/clustering/leader-election.md         |    59 +
 docs/wiki/clustering/network-config.md          |   101 +
 docs/wiki/clustering/node-local-map.md          |    35 +
 docs/wiki/compute-grid/checkpointing.md         |   238 +
 .../compute-grid/collocate-compute-and-data.md  |    29 +
 docs/wiki/compute-grid/compute-grid.md          |    56 +
 docs/wiki/compute-grid/compute-tasks.md         |   105 +
 docs/wiki/compute-grid/distributed-closures.md  |   107 +
 docs/wiki/compute-grid/executor-service.md      |    23 +
 docs/wiki/compute-grid/fault-tolerance.md       |    79 +
 docs/wiki/compute-grid/job-scheduling.md        |    69 +
 docs/wiki/compute-grid/load-balancing.md        |    59 +
 docs/wiki/data-grid/affinity-collocation.md     |    78 +
 docs/wiki/data-grid/automatic-db-integration.md |   102 +
 docs/wiki/data-grid/cache-modes.md              |   237 +
 docs/wiki/data-grid/cache-queries.md            |   164 +
 docs/wiki/data-grid/data-grid.md                |    68 +
 docs/wiki/data-grid/data-loading.md             |    77 +
 docs/wiki/data-grid/evictions.md                |    86 +
 docs/wiki/data-grid/hibernate-l2-cache.md       |   173 +
 docs/wiki/data-grid/jcache.md                   |    99 +
 docs/wiki/data-grid/off-heap-memory.md          |   180 +
 docs/wiki/data-grid/persistent-store.md         |   111 +
 docs/wiki/data-grid/rebalancing.md              |   105 +
 docs/wiki/data-grid/transactions.md             |   127 +
 docs/wiki/data-grid/web-session-clustering.md   |   236 +
 .../distributed-data-structures/atomic-types.md |    97 +
 .../countdownlatch.md                           |    24 +
 .../distributed-data-structures/id-generator.md |    40 +
 .../queue-and-set.md                            |   116 +
 .../distributed-events/automatic-batching.md    |    16 +
 docs/wiki/distributed-events/events.md          |   101 +
 docs/wiki/distributed-file-system/igfs.md       |     1 +
 docs/wiki/distributed-messaging/messaging.md    |    73 +
 docs/wiki/http/configuration.md                 |    58 +
 docs/wiki/http/rest-api.md                      |  1646 ++
 docs/wiki/release-notes/release-notes.md        |    13 +
 docs/wiki/service-grid/cluster-singletons.md    |    94 +
 docs/wiki/service-grid/service-configuration.md |    33 +
 docs/wiki/service-grid/service-example.md       |    94 +
 docs/wiki/service-grid/service-grid.md          |    62 +
 examples/config/filesystem/core-site.xml        |     4 +-
 examples/config/filesystem/example-igfs.xml     |     4 +-
 examples/pom-standalone.xml                     |     2 +-
 .../ignite/examples/igfs/IgfsExample.java       |    18 +-
 .../examples/igfs/IgfsMapReduceExample.java     |     6 +-
 .../misc/lifecycle/LifecycleExample.java        |     4 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |     2 +-
 modules/clients/readme.md                       |     4 +-
 modules/clients/readme.pdf                      |   Bin 52230 -> 47887 bytes
 .../ClientAbstractMultiThreadedSelfTest.java    |    37 +-
 .../impl/ClientPartitionAffinitySelfTest.java   |   406 -
 .../ClientAbstractMultiNodeSelfTest.java        |    54 +-
 .../integration/ClientAbstractSelfTest.java     |    11 -
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |     4 -
 .../client/suite/IgniteClientTestSuite.java     |     1 -
 .../src/test/resources/spring-server-node.xml   |     2 +-
 .../test/resources/spring-server-ssl-node.xml   |     2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    13 +-
 .../java/org/apache/ignite/IgniteCluster.java   |     8 +-
 .../java/org/apache/ignite/IgniteEvents.java    |     2 +-
 .../org/apache/ignite/IgniteFileSystem.java     |   457 +
 .../main/java/org/apache/ignite/IgniteFs.java   |   346 -
 .../ignite/cache/CacheTypeFieldMetadata.java    |     2 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |    18 +-
 .../java/org/apache/ignite/cache/GridCache.java |     2 +-
 .../CacheConsistentHashAffinityFunction.java    |   702 -
 .../cache/affinity/consistenthash/package.html  |    24 -
 .../CacheRendezvousAffinityFunction.java        |     2 +-
 .../apache/ignite/cache/store/CacheStore.java   |    49 -
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |     2 +-
 .../configuration/CacheConfiguration.java       |     2 +-
 .../configuration/FileSystemConfiguration.java  |   805 +
 .../configuration/HadoopConfiguration.java      |   173 +
 .../ignite/configuration/IgfsConfiguration.java |   807 -
 .../configuration/IgniteConfiguration.java      |    30 +-
 .../org/apache/ignite/events/CacheEvent.java    |    20 +-
 .../main/java/org/apache/ignite/igfs/Igfs.java  |   216 -
 .../apache/ignite/igfs/IgfsBlockLocation.java   |     2 +-
 .../java/org/apache/ignite/igfs/IgfsFile.java   |     2 +-
 .../org/apache/ignite/igfs/IgfsInputStream.java |     6 +-
 .../org/apache/ignite/igfs/IgfsMetrics.java     |     2 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |     8 +-
 .../java/org/apache/ignite/igfs/IgfsReader.java |    38 -
 .../mapreduce/IgfsInputStreamJobAdapter.java    |     4 +-
 .../apache/ignite/igfs/mapreduce/IgfsJob.java   |     4 +-
 .../igfs/mapreduce/IgfsRecordResolver.java      |     2 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |     4 +-
 .../ignite/igfs/mapreduce/IgfsTaskArgs.java     |     2 +-
 .../IgfsByteDelimiterRecordResolver.java        |     3 +-
 .../records/IgfsFixedLengthRecordResolver.java  |     2 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |   201 +
 ...fsSecondaryFileSystemPositionedReadable.java |    38 +
 .../apache/ignite/igfs/secondary/package.html   |    24 +
 .../apache/ignite/internal/GridDiagnostic.java  |    15 +-
 .../ignite/internal/GridKernalContext.java      |    32 +-
 .../ignite/internal/GridKernalContextImpl.java  |    31 +-
 .../ignite/internal/GridUpdateNotifier.java     |    24 +-
 .../ignite/internal/IgniteComponentType.java    |     4 +-
 .../org/apache/ignite/internal/IgniteEx.java    |     4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   312 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   602 +-
 .../org/apache/ignite/internal/SkipDaemon.java  |    29 +
 .../ignite/internal/client/GridClientNode.java  |     8 -
 .../client/GridClientPartitionAffinity.java     |     2 +-
 .../client/impl/GridClientNodeImpl.java         |    22 -
 .../connection/GridClientNioTcpConnection.java  |     3 +-
 .../ignite/internal/managers/GridManager.java   |    20 +-
 .../internal/managers/GridManagerAdapter.java   |    73 +-
 .../checkpoint/GridCheckpointManager.java       |     4 +-
 .../collision/GridCollisionManager.java         |     4 +-
 .../discovery/GridDiscoveryManager.java         |    38 +-
 .../managers/indexing/GridIndexingManager.java  |     4 +-
 .../swapspace/GridSwapSpaceManager.java         |     4 +-
 .../internal/processors/GridProcessor.java      |    11 +-
 .../processors/GridProcessorAdapter.java        |     5 -
 .../affinity/GridAffinityAssignmentCache.java   |    13 +-
 .../processors/cache/CacheMetricsImpl.java      |     4 +
 .../processors/cache/GridCacheAdapter.java      |    15 +-
 .../processors/cache/GridCacheAttributes.java   |    32 +-
 .../processors/cache/GridCacheContext.java      |    19 +
 .../processors/cache/GridCacheMapEntry.java     |     9 +
 .../processors/cache/GridCacheProcessor.java    |   114 +-
 .../processors/cache/GridCacheUtils.java        |     6 +-
 .../cache/GridCacheWriteBehindStore.java        |     4 +-
 .../distributed/dht/GridDhtCacheEntry.java      |     3 +
 .../distributed/dht/GridDhtLocalPartition.java  |     5 +
 .../dht/atomic/GridDhtAtomicCache.java          |     5 +-
 .../dht/colocated/GridDhtColocatedCache.java    |     2 +-
 .../distributed/near/GridNearCacheAdapter.java  |     8 +
 .../cache/transactions/IgniteTxManager.java     |     7 +-
 .../clock/GridClockSyncProcessor.java           |     9 +-
 .../internal/processors/hadoop/GridHadoop.java  |    86 -
 .../hadoop/GridHadoopConfiguration.java         |   172 -
 .../processors/hadoop/GridHadoopCounter.java    |    44 -
 .../hadoop/GridHadoopCounterWriter.java         |    36 -
 .../processors/hadoop/GridHadoopCounters.java   |    49 -
 .../processors/hadoop/GridHadoopFileBlock.java  |   162 -
 .../processors/hadoop/GridHadoopInputSplit.java |    54 -
 .../processors/hadoop/GridHadoopJob.java        |   102 -
 .../processors/hadoop/GridHadoopJobId.java      |   103 -
 .../processors/hadoop/GridHadoopJobInfo.java    |    83 -
 .../processors/hadoop/GridHadoopJobPhase.java   |    38 -
 .../hadoop/GridHadoopJobProperty.java           |   138 -
 .../processors/hadoop/GridHadoopJobStatus.java  |   207 -
 .../hadoop/GridHadoopMapReducePlan.java         |    80 -
 .../hadoop/GridHadoopMapReducePlanner.java      |    40 -
 .../hadoop/GridHadoopPartitioner.java           |    33 -
 .../hadoop/GridHadoopSerialization.java         |    54 -
 .../processors/hadoop/GridHadoopTask.java       |    72 -
 .../hadoop/GridHadoopTaskContext.java           |   189 -
 .../processors/hadoop/GridHadoopTaskInfo.java   |   153 -
 .../processors/hadoop/GridHadoopTaskInput.java  |    55 -
 .../processors/hadoop/GridHadoopTaskOutput.java |    40 -
 .../processors/hadoop/GridHadoopTaskType.java   |    56 -
 .../internal/processors/hadoop/Hadoop.java      |    88 +
 .../processors/hadoop/HadoopFileBlock.java      |   162 +
 .../processors/hadoop/HadoopInputSplit.java     |    54 +
 .../internal/processors/hadoop/HadoopJob.java   |   102 +
 .../internal/processors/hadoop/HadoopJobId.java |   103 +
 .../processors/hadoop/HadoopJobInfo.java        |    83 +
 .../processors/hadoop/HadoopJobPhase.java       |    38 +
 .../processors/hadoop/HadoopJobProperty.java    |   138 +
 .../processors/hadoop/HadoopJobStatus.java      |   207 +
 .../processors/hadoop/HadoopMapReducePlan.java  |    80 +
 .../hadoop/HadoopMapReducePlanner.java          |    40 +
 .../processors/hadoop/HadoopNoopProcessor.java  |    76 +
 .../processors/hadoop/HadoopPartitioner.java    |    33 +
 .../hadoop/HadoopProcessorAdapter.java          |    96 +
 .../processors/hadoop/HadoopSerialization.java  |    54 +
 .../internal/processors/hadoop/HadoopTask.java  |    72 +
 .../processors/hadoop/HadoopTaskContext.java    |   190 +
 .../processors/hadoop/HadoopTaskInfo.java       |   153 +
 .../processors/hadoop/HadoopTaskInput.java      |    55 +
 .../processors/hadoop/HadoopTaskOutput.java     |    40 +
 .../processors/hadoop/HadoopTaskType.java       |    56 +
 .../hadoop/IgniteHadoopNoopProcessor.java       |    74 -
 .../hadoop/IgniteHadoopProcessorAdapter.java    |    94 -
 .../hadoop/counter/HadoopCounter.java           |    44 +
 .../hadoop/counter/HadoopCounterWriter.java     |    37 +
 .../hadoop/counter/HadoopCounters.java          |    49 +
 .../internal/processors/igfs/IgfsAsyncImpl.java |     9 +-
 .../internal/processors/igfs/IgfsContext.java   |     6 +-
 .../processors/igfs/IgfsDataManager.java        |     5 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |    30 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |     4 +-
 .../internal/processors/igfs/IgfsImpl.java      |    42 +-
 .../processors/igfs/IgfsInputStreamAdapter.java |     4 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |     5 +-
 .../internal/processors/igfs/IgfsJobImpl.java   |     2 +-
 .../processors/igfs/IgfsMetaManager.java        |    27 +-
 .../processors/igfs/IgfsNoopProcessor.java      |     4 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |     2 +-
 .../internal/processors/igfs/IgfsProcessor.java |   122 +-
 .../processors/igfs/IgfsProcessorAdapter.java   |     4 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |   121 +
 .../IgfsSecondaryInputStreamDescriptor.java     |     8 +-
 .../processors/igfs/IgfsServerManager.java      |     4 +-
 .../processors/job/GridJobProcessor.java        |     1 +
 .../processors/rest/GridRestProcessor.java      |    64 +-
 .../rest/client/message/GridClientNodeBean.java |    23 -
 .../top/GridTopologyCommandHandler.java         |     8 -
 .../streamer/GridStreamProcessor.java           |    31 +-
 .../ignite/internal/util/IgniteUtils.java       |   128 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |     3 +-
 .../cache/VisorCacheAffinityConfiguration.java  |    19 +-
 .../visor/cache/VisorCacheClearTask.java        |     3 +-
 .../visor/cache/VisorCacheLoadTask.java         |     3 +-
 .../ignite/internal/visor/igfs/VisorIgfs.java   |     4 +-
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |     2 +-
 .../visor/node/VisorGridConfiguration.java      |     2 +-
 .../visor/node/VisorIgfsConfiguration.java      |    16 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |     2 +-
 .../internal/visor/util/VisorTaskUtils.java     |     4 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |    36 +-
 .../ignite/lifecycle/LifecycleEventType.java    |    20 +-
 .../apache/ignite/marshaller/Marshaller.java    |     2 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |     2 +-
 .../optimized/OptimizedMarshaller.java          |     2 +-
 .../apache/ignite/plugin/PluginProvider.java    |     3 +-
 .../SpringApplicationContextResource.java       |     2 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |    20 +-
 .../ignite/spi/IgniteSpiConsistencyChecked.java |     7 -
 .../checkpoint/cache/CacheCheckpointSpi.java    |     2 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |     2 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |     2 +-
 .../jobstealing/JobStealingCollisionSpi.java    |     4 +-
 .../PriorityQueueCollisionSpi.java              |     2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |    18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |     2 +-
 .../memory/MemoryEventStorageSpi.java           |     2 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |     2 +-
 .../jobstealing/JobStealingFailoverSpi.java     |     2 +-
 .../spi/failover/never/NeverFailoverSpi.java    |     2 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |     2 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |     2 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |     2 +-
 .../WeightedRandomLoadBalancingSpi.java         |     2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |     2 +-
 .../startup/cmdline/CommandLineStartup.java     |     4 +-
 .../startup/cmdline/ggcube_node_128x128.png     |   Bin 4679 -> 0 bytes
 .../startup/cmdline/ggcube_node_48x48.png       |   Bin 2355 -> 0 bytes
 .../startup/cmdline/logo_ignite_128x128.png     |   Bin 0 -> 18667 bytes
 .../startup/cmdline/logo_ignite_48x48.png       |   Bin 0 -> 16572 bytes
 .../core/src/main/resources/ignite.properties   |     2 +-
 .../hadoop/core-site-loopback-secondary.xml     |     4 +-
 .../test/config/hadoop/core-site-loopback.xml   |     4 +-
 .../test/config/hadoop/core-site-secondary.xml  |     4 +-
 .../core/src/test/config/hadoop/core-site.xml   |     4 +-
 modules/core/src/test/config/igfs-loopback.xml  |     4 +-
 modules/core/src/test/config/igfs-shmem.xml     |     4 +-
 .../config/load/dsi-49-server-production.xml    |     2 +-
 .../GridCacheAffinityBackupsSelfTest.java       |     9 -
 .../ignite/IgniteCacheAffinitySelfTest.java     |    30 +-
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |    10 +-
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |     4 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |     8 +-
 .../igfs/IgfsFragmentizerTopologySelfTest.java  |     2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |    44 -
 .../internal/GridLifecycleBeanSelfTest.java     |    76 +-
 .../internal/GridUpdateNotifierSelfTest.java    |     2 +-
 ...AffinityProcessorConsistentHashSelfTest.java |    31 -
 .../cache/GridCacheAbstractFullApiSelfTest.java |    26 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |   440 +
 .../cache/GridCacheAbstractMetricsSelfTest.java |    42 +
 ...acheAbstractUsersAffinityMapperSelfTest.java |   207 +
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |    45 +
 .../cache/GridCacheConcurrentMapTest.java       |     4 +-
 ...idCacheConfigurationConsistencySelfTest.java |    46 +-
 ...ridCacheConfigurationValidationSelfTest.java |     8 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    12 +-
 .../GridCachePartitionedAffinitySpreadTest.java |    16 +-
 .../GridCachePartitionedLocalStoreSelfTest.java |    51 +
 ...chePartitionedOffHeapLocalStoreSelfTest.java |    56 +
 .../GridCacheReplicatedLocalStoreSelfTest.java  |    51 +
 ...heReplicatedUsersAffinityMapperSelfTest.java |    45 +
 ...cheTransactionalAbstractMetricsSelfTest.java |     7 +
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |    51 +
 .../GridCacheTxUsersAffinityMapperSelfTest.java |    45 +
 .../IgniteClientAffinityAssignmentSelfTest.java |    16 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |     8 +-
 .../GridCacheQueueCleanupSelfTest.java          |     1 -
 .../GridCacheClientModesAbstractSelfTest.java   |     4 +-
 .../distributed/GridCacheLockAbstractTest.java  |     2 +
 ...dCachePartitionedAffinityFilterSelfTest.java |     6 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |     6 +-
 .../dht/GridCacheColocatedDebugTest.java        |     4 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |     4 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    13 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |    13 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |     4 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |     6 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |     6 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |     4 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |     4 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |     4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |     4 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |     4 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |     6 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |     6 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |     7 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |     5 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |     1 +
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    32 -
 ...AffinityExcludeNeighborsPerformanceTest.java |     4 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |     4 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   227 +-
 .../GridCachePartitionedFullApiSelfTest.java    |    11 +-
 .../GridCachePartitionedNodeRestartTest.java    |     6 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |     6 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |     8 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |     4 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |     8 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |     4 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |     4 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |     2 +-
 ...heIgfsPerBlockLruEvictionPolicySelfTest.java |   485 -
 .../processors/igfs/IgfsAbstractSelfTest.java   |    85 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |   485 +
 .../processors/igfs/IgfsCacheSelfTest.java      |     4 +-
 .../igfs/IgfsDataManagerSelfTest.java           |     5 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |    12 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |     4 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    |    22 +-
 .../processors/igfs/IgfsModesSelfTest.java      |    14 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |    10 +-
 .../igfs/IgfsProcessorValidationSelfTest.java   |    50 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |    10 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |     4 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |     2 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |     4 +-
 .../processors/igfs/IgfsStreamsSelfTest.java    |    14 +-
 .../processors/igfs/IgfsTaskSelfTest.java       |    10 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |     6 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |     4 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |     4 +-
 ...apPartitionedMapPerformanceAbstractTest.java |     4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |     4 +-
 .../capacity/spring-capacity-cache.xml          |     2 +-
 .../colocation/GridTestLifecycleBean.java       |     2 +-
 .../loadtests/colocation/spring-colocation.xml  |     2 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |     4 +-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |     8 +-
 ...apPartitionedMapPerformanceAbstractTest.java |     4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |     4 +-
 .../ignite/testframework/GridTestUtils.java     |    13 +-
 .../ignite/testframework/junits/IgniteMock.java |     4 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |     1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    15 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |     2 +-
 .../core/src/test/resources/log/ignite.log.tst  | 13706 -----------------
 .../client/hadoop/GridHadoopClientProtocol.java |   334 -
 .../GridHadoopClientProtocolProvider.java       |   137 -
 .../counter/GridHadoopClientCounterGroup.java   |   121 -
 .../counter/GridHadoopClientCounters.java       |   217 -
 .../apache/ignite/client/hadoop/package.html    |    24 -
 .../fs/IgniteHadoopFileSystemCounterWriter.java |    93 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |   423 +
 .../org/apache/ignite/hadoop/fs/package.html    |    24 +
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |  1237 ++
 .../org/apache/ignite/hadoop/fs/v1/package.html |    24 +
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    |   982 ++
 .../org/apache/ignite/hadoop/fs/v2/package.html |    24 +
 .../IgniteHadoopClientProtocolProvider.java     |   138 +
 .../mapreduce/IgniteHadoopMapReducePlanner.java |   435 +
 .../apache/ignite/hadoop/mapreduce/package.html |    24 +
 .../java/org/apache/ignite/hadoop/package.html  |    24 +
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |   412 -
 .../igfs/hadoop/IgfsHadoopParameters.java       |    94 -
 .../org/apache/ignite/igfs/hadoop/package.html  |    24 -
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |  1254 --
 .../apache/ignite/igfs/hadoop/v1/package.html   |    24 -
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |  1008 --
 .../apache/ignite/igfs/hadoop/v2/package.html   |    24 -
 .../java/org/apache/ignite/igfs/package.html    |    24 -
 .../ignite/internal/igfs/hadoop/IgfsHadoop.java |   198 -
 .../IgfsHadoopCommunicationException.java       |    57 -
 .../igfs/hadoop/IgfsHadoopEndpoint.java         |   210 -
 .../internal/igfs/hadoop/IgfsHadoopEx.java      |    88 -
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |    88 -
 .../internal/igfs/hadoop/IgfsHadoopFuture.java  |    94 -
 .../internal/igfs/hadoop/IgfsHadoopInProc.java  |   409 -
 .../igfs/hadoop/IgfsHadoopInputStream.java      |   626 -
 .../internal/igfs/hadoop/IgfsHadoopIo.java      |    76 -
 .../internal/igfs/hadoop/IgfsHadoopIpcIo.java   |   599 -
 .../igfs/hadoop/IgfsHadoopIpcIoListener.java    |    36 -
 .../igfs/hadoop/IgfsHadoopJclLogger.java        |   112 -
 .../internal/igfs/hadoop/IgfsHadoopOutProc.java |   466 -
 .../igfs/hadoop/IgfsHadoopOutputStream.java     |   201 -
 .../igfs/hadoop/IgfsHadoopProxyInputStream.java |   335 -
 .../hadoop/IgfsHadoopProxyOutputStream.java     |   165 -
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |   104 -
 .../igfs/hadoop/IgfsHadoopStreamDelegate.java   |    96 -
 .../hadoop/IgfsHadoopStreamEventListener.java   |    39 -
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   131 -
 .../internal/igfs/hadoop/IgfsHadoopWrapper.java |   511 -
 .../ignite/internal/igfs/hadoop/package.html    |    24 -
 .../apache/ignite/internal/igfs/package.html    |    24 -
 .../hadoop/GridHadoopClassLoader.java           |   552 -
 .../processors/hadoop/GridHadoopComponent.java  |    61 -
 .../processors/hadoop/GridHadoopContext.java    |   196 -
 .../hadoop/GridHadoopDefaultJobInfo.java        |   163 -
 .../processors/hadoop/GridHadoopImpl.java       |   132 -
 .../processors/hadoop/GridHadoopSetup.java      |   505 -
 .../GridHadoopTaskCancelledException.java       |    35 -
 .../processors/hadoop/GridHadoopUtils.java      |   308 -
 .../processors/hadoop/HadoopClassLoader.java    |   552 +
 .../processors/hadoop/HadoopComponent.java      |    61 +
 .../processors/hadoop/HadoopContext.java        |   197 +
 .../processors/hadoop/HadoopDefaultJobInfo.java |   163 +
 .../internal/processors/hadoop/HadoopImpl.java  |   134 +
 .../hadoop/HadoopMapReduceCounterGroup.java     |   121 +
 .../hadoop/HadoopMapReduceCounters.java         |   216 +
 .../processors/hadoop/HadoopProcessor.java      |   227 +
 .../internal/processors/hadoop/HadoopSetup.java |   505 +
 .../hadoop/HadoopTaskCancelledException.java    |    35 +
 .../internal/processors/hadoop/HadoopUtils.java |   308 +
 .../hadoop/IgniteHadoopProcessor.java           |   225 -
 .../hadoop/SecondaryFileSystemProvider.java     |   111 +
 .../counter/GridHadoopCounterAdapter.java       |   128 -
 .../hadoop/counter/GridHadoopCountersImpl.java  |   198 -
 .../counter/GridHadoopFSCounterWriter.java      |    91 -
 .../hadoop/counter/GridHadoopLongCounter.java   |    92 -
 .../counter/GridHadoopPerformanceCounter.java   |   279 -
 .../hadoop/counter/HadoopCounterAdapter.java    |   127 +
 .../hadoop/counter/HadoopCountersImpl.java      |   197 +
 .../hadoop/counter/HadoopLongCounter.java       |    90 +
 .../counter/HadoopPerformanceCounter.java       |   279 +
 .../fs/GridHadoopDistributedFileSystem.java     |    91 -
 .../hadoop/fs/GridHadoopFileSystemsUtils.java   |    57 -
 .../hadoop/fs/GridHadoopLocalFileSystemV1.java  |    39 -
 .../hadoop/fs/GridHadoopLocalFileSystemV2.java  |    86 -
 .../hadoop/fs/GridHadoopRawLocalFileSystem.java |   304 -
 .../hadoop/fs/HadoopDistributedFileSystem.java  |    91 +
 .../hadoop/fs/HadoopFileSystemsUtils.java       |    57 +
 .../hadoop/fs/HadoopLocalFileSystemV1.java      |    39 +
 .../hadoop/fs/HadoopLocalFileSystemV2.java      |    86 +
 .../processors/hadoop/fs/HadoopParameters.java  |    94 +
 .../hadoop/fs/HadoopRawLocalFileSystem.java     |   304 +
 .../processors/hadoop/igfs/HadoopIgfs.java      |   198 +
 .../igfs/HadoopIgfsCommunicationException.java  |    57 +
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |   210 +
 .../processors/hadoop/igfs/HadoopIgfsEx.java    |    88 +
 .../hadoop/igfs/HadoopIgfsFuture.java           |    94 +
 .../hadoop/igfs/HadoopIgfsInProc.java           |   409 +
 .../hadoop/igfs/HadoopIgfsInputStream.java      |   626 +
 .../processors/hadoop/igfs/HadoopIgfsIo.java    |    76 +
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java |   599 +
 .../hadoop/igfs/HadoopIgfsIpcIoListener.java    |    36 +
 .../hadoop/igfs/HadoopIgfsJclLogger.java        |   115 +
 .../hadoop/igfs/HadoopIgfsOutProc.java          |   466 +
 .../hadoop/igfs/HadoopIgfsOutputStream.java     |   201 +
 .../hadoop/igfs/HadoopIgfsProperties.java       |    88 +
 .../hadoop/igfs/HadoopIgfsProxyInputStream.java |   335 +
 .../igfs/HadoopIgfsProxyOutputStream.java       |   165 +
 ...fsSecondaryFileSystemPositionedReadable.java |   104 +
 .../hadoop/igfs/HadoopIgfsStreamDelegate.java   |    96 +
 .../igfs/HadoopIgfsStreamEventListener.java     |    39 +
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |   131 +
 .../hadoop/igfs/HadoopIgfsWrapper.java          |   511 +
 .../jobtracker/GridHadoopJobMetadata.java       |   305 -
 .../hadoop/jobtracker/GridHadoopJobTracker.java |  1625 --
 .../hadoop/jobtracker/HadoopJobMetadata.java    |   306 +
 .../hadoop/jobtracker/HadoopJobTracker.java     |  1626 ++
 .../hadoop/message/GridHadoopMessage.java       |    27 -
 .../hadoop/message/HadoopMessage.java           |    27 +
 .../planner/GridHadoopDefaultMapReducePlan.java |   107 -
 .../GridHadoopDefaultMapReducePlanner.java      |   434 -
 .../planner/HadoopDefaultMapReducePlan.java     |   107 +
 .../GridHadoopProtocolJobCountersTask.java      |    45 -
 .../proto/GridHadoopProtocolJobStatusTask.java  |    81 -
 .../proto/GridHadoopProtocolKillJobTask.java    |    46 -
 .../proto/GridHadoopProtocolNextTaskIdTask.java |    35 -
 .../proto/GridHadoopProtocolSubmitJobTask.java  |    57 -
 .../proto/GridHadoopProtocolTaskAdapter.java    |   113 -
 .../proto/GridHadoopProtocolTaskArguments.java  |    81 -
 .../hadoop/proto/HadoopClientProtocol.java      |   333 +
 .../proto/HadoopProtocolJobCountersTask.java    |    46 +
 .../proto/HadoopProtocolJobStatusTask.java      |    81 +
 .../hadoop/proto/HadoopProtocolKillJobTask.java |    46 +
 .../proto/HadoopProtocolNextTaskIdTask.java     |    35 +
 .../proto/HadoopProtocolSubmitJobTask.java      |    57 +
 .../hadoop/proto/HadoopProtocolTaskAdapter.java |   113 +
 .../proto/HadoopProtocolTaskArguments.java      |    81 +
 .../hadoop/shuffle/GridHadoopShuffle.java       |   256 -
 .../hadoop/shuffle/GridHadoopShuffleAck.java    |    91 -
 .../hadoop/shuffle/GridHadoopShuffleJob.java    |   593 -
 .../shuffle/GridHadoopShuffleMessage.java       |   242 -
 .../hadoop/shuffle/HadoopShuffle.java           |   256 +
 .../hadoop/shuffle/HadoopShuffleAck.java        |    91 +
 .../hadoop/shuffle/HadoopShuffleJob.java        |   593 +
 .../hadoop/shuffle/HadoopShuffleMessage.java    |   241 +
 .../GridHadoopConcurrentHashMultimap.java       |   611 -
 .../collections/GridHadoopHashMultimap.java     |   174 -
 .../collections/GridHadoopHashMultimapBase.java |   208 -
 .../shuffle/collections/GridHadoopMultimap.java |   112 -
 .../collections/GridHadoopMultimapBase.java     |   368 -
 .../shuffle/collections/GridHadoopSkipList.java |   726 -
 .../HadoopConcurrentHashMultimap.java           |   611 +
 .../shuffle/collections/HadoopHashMultimap.java |   174 +
 .../collections/HadoopHashMultimapBase.java     |   208 +
 .../shuffle/collections/HadoopMultimap.java     |   112 +
 .../shuffle/collections/HadoopMultimapBase.java |   368 +
 .../shuffle/collections/HadoopSkipList.java     |   726 +
 .../shuffle/streams/GridHadoopDataInStream.java |   170 -
 .../streams/GridHadoopDataOutStream.java        |   131 -
 .../streams/GridHadoopOffheapBuffer.java        |   122 -
 .../shuffle/streams/HadoopDataInStream.java     |   170 +
 .../shuffle/streams/HadoopDataOutStream.java    |   131 +
 .../shuffle/streams/HadoopOffheapBuffer.java    |   122 +
 .../GridHadoopEmbeddedTaskExecutor.java         |   146 -
 .../taskexecutor/GridHadoopExecutorService.java |   232 -
 .../taskexecutor/GridHadoopRunnableTask.java    |   268 -
 .../GridHadoopTaskExecutorAdapter.java          |    57 -
 .../taskexecutor/GridHadoopTaskState.java       |    38 -
 .../taskexecutor/GridHadoopTaskStatus.java      |   114 -
 .../HadoopEmbeddedTaskExecutor.java             |   146 +
 .../taskexecutor/HadoopExecutorService.java     |   231 +
 .../hadoop/taskexecutor/HadoopRunnableTask.java |   268 +
 .../taskexecutor/HadoopTaskExecutorAdapter.java |    57 +
 .../hadoop/taskexecutor/HadoopTaskState.java    |    38 +
 .../hadoop/taskexecutor/HadoopTaskStatus.java   |   114 +
 .../GridHadoopExternalTaskExecutor.java         |   960 --
 .../GridHadoopExternalTaskMetadata.java         |    68 -
 .../GridHadoopJobInfoUpdateRequest.java         |   109 -
 .../GridHadoopPrepareForJobRequest.java         |   126 -
 .../external/GridHadoopProcessDescriptor.java   |   150 -
 .../external/GridHadoopProcessStartedAck.java   |    46 -
 .../GridHadoopTaskExecutionRequest.java         |   110 -
 .../external/GridHadoopTaskFinishedMessage.java |    92 -
 .../external/HadoopExternalTaskExecutor.java    |   960 ++
 .../external/HadoopExternalTaskMetadata.java    |    68 +
 .../external/HadoopJobInfoUpdateRequest.java    |   109 +
 .../external/HadoopPrepareForJobRequest.java    |   126 +
 .../external/HadoopProcessDescriptor.java       |   150 +
 .../external/HadoopProcessStartedAck.java       |    46 +
 .../external/HadoopTaskExecutionRequest.java    |   110 +
 .../external/HadoopTaskFinishedMessage.java     |    92 +
 .../child/GridHadoopChildProcessRunner.java     |   440 -
 .../child/GridHadoopExternalProcessStarter.java |   296 -
 .../child/HadoopChildProcessRunner.java         |   440 +
 .../child/HadoopExternalProcessStarter.java     |   296 +
 .../GridHadoopAbstractCommunicationClient.java  |    96 -
 .../GridHadoopCommunicationClient.java          |    72 -
 .../GridHadoopExternalCommunication.java        |  1431 --
 .../GridHadoopHandshakeTimeoutException.java    |    42 -
 .../GridHadoopIpcToNioAdapter.java              |   239 -
 .../GridHadoopMarshallerFilter.java             |    84 -
 .../GridHadoopMessageListener.java              |    39 -
 .../GridHadoopTcpNioCommunicationClient.java    |    99 -
 .../HadoopAbstractCommunicationClient.java      |    96 +
 .../HadoopCommunicationClient.java              |    72 +
 .../HadoopExternalCommunication.java            |  1431 ++
 .../HadoopHandshakeTimeoutException.java        |    42 +
 .../communication/HadoopIpcToNioAdapter.java    |   239 +
 .../communication/HadoopMarshallerFilter.java   |    84 +
 .../communication/HadoopMessageListener.java    |    39 +
 .../HadoopTcpNioCommunicationClient.java        |    99 +
 .../hadoop/v1/GridHadoopV1CleanupTask.java      |    62 -
 .../hadoop/v1/GridHadoopV1Counter.java          |   105 -
 .../hadoop/v1/GridHadoopV1MapTask.java          |   111 -
 .../hadoop/v1/GridHadoopV1OutputCollector.java  |   130 -
 .../hadoop/v1/GridHadoopV1Partitioner.java      |    44 -
 .../hadoop/v1/GridHadoopV1ReduceTask.java       |    92 -
 .../hadoop/v1/GridHadoopV1Reporter.java         |    79 -
 .../hadoop/v1/GridHadoopV1SetupTask.java        |    56 -
 .../hadoop/v1/GridHadoopV1Splitter.java         |    97 -
 .../processors/hadoop/v1/GridHadoopV1Task.java  |    95 -
 .../hadoop/v1/HadoopV1CleanupTask.java          |    62 +
 .../processors/hadoop/v1/HadoopV1Counter.java   |   105 +
 .../processors/hadoop/v1/HadoopV1MapTask.java   |   111 +
 .../hadoop/v1/HadoopV1OutputCollector.java      |   130 +
 .../hadoop/v1/HadoopV1Partitioner.java          |    44 +
 .../hadoop/v1/HadoopV1ReduceTask.java           |    92 +
 .../processors/hadoop/v1/HadoopV1Reporter.java  |    79 +
 .../processors/hadoop/v1/HadoopV1SetupTask.java |    56 +
 .../processors/hadoop/v1/HadoopV1Splitter.java  |    97 +
 .../processors/hadoop/v1/HadoopV1Task.java      |    95 +
 .../hadoop/v2/GridHadoopExternalSplit.java      |    87 -
 .../hadoop/v2/GridHadoopNativeCodeLoader.java   |    74 -
 .../v2/GridHadoopSerializationWrapper.java      |   133 -
 .../v2/GridHadoopShutdownHookManager.java       |    96 -
 .../hadoop/v2/GridHadoopSplitWrapper.java       |   118 -
 .../hadoop/v2/GridHadoopV2CleanupTask.java      |    73 -
 .../hadoop/v2/GridHadoopV2Context.java          |   230 -
 .../hadoop/v2/GridHadoopV2Counter.java          |    87 -
 .../processors/hadoop/v2/GridHadoopV2Job.java   |   280 -
 .../v2/GridHadoopV2JobResourceManager.java      |   305 -
 .../hadoop/v2/GridHadoopV2MapTask.java          |   109 -
 .../hadoop/v2/GridHadoopV2Partitioner.java      |    44 -
 .../hadoop/v2/GridHadoopV2ReduceTask.java       |    88 -
 .../hadoop/v2/GridHadoopV2SetupTask.java        |    66 -
 .../hadoop/v2/GridHadoopV2Splitter.java         |   105 -
 .../processors/hadoop/v2/GridHadoopV2Task.java  |   181 -
 .../hadoop/v2/GridHadoopV2TaskContext.java      |   443 -
 .../v2/GridHadoopWritableSerialization.java     |    74 -
 .../hadoop/v2/HadoopExternalSplit.java          |    87 +
 .../hadoop/v2/HadoopNativeCodeLoader.java       |    74 +
 .../hadoop/v2/HadoopSerializationWrapper.java   |   133 +
 .../hadoop/v2/HadoopShutdownHookManager.java    |    96 +
 .../hadoop/v2/HadoopSplitWrapper.java           |   118 +
 .../hadoop/v2/HadoopV2CleanupTask.java          |    73 +
 .../processors/hadoop/v2/HadoopV2Context.java   |   230 +
 .../processors/hadoop/v2/HadoopV2Counter.java   |    87 +
 .../processors/hadoop/v2/HadoopV2Job.java       |   280 +
 .../hadoop/v2/HadoopV2JobResourceManager.java   |   305 +
 .../processors/hadoop/v2/HadoopV2MapTask.java   |   109 +
 .../hadoop/v2/HadoopV2Partitioner.java          |    44 +
 .../hadoop/v2/HadoopV2ReduceTask.java           |    88 +
 .../processors/hadoop/v2/HadoopV2SetupTask.java |    66 +
 .../processors/hadoop/v2/HadoopV2Splitter.java  |   105 +
 .../processors/hadoop/v2/HadoopV2Task.java      |   181 +
 .../hadoop/v2/HadoopV2TaskContext.java          |   444 +
 .../hadoop/v2/HadoopWritableSerialization.java  |    74 +
 ...op.mapreduce.protocol.ClientProtocolProvider |     2 +-
 ...ridHadoopClientProtocolEmbeddedSelfTest.java |    34 -
 .../GridHadoopClientProtocolSelfTest.java       |   633 -
 .../HadoopClientProtocolEmbeddedSelfTest.java   |    34 +
 .../hadoop/HadoopClientProtocolSelfTest.java    |   635 +
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  1967 +++
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |    74 +
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |    74 +
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   305 +
 .../igfs/HadoopIgfsDualAsyncSelfTest.java       |    32 +
 .../ignite/igfs/HadoopIgfsDualSyncSelfTest.java |    32 +
 ...oopSecondaryFileSystemConfigurationTest.java |   559 +
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |    54 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |  1967 ---
 ...doop20FileSystemLoopbackPrimarySelfTest.java |    74 -
 ...sHadoop20FileSystemShmemPrimarySelfTest.java |    74 -
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |   304 -
 .../igfs/IgfsHadoopDualAsyncSelfTest.java       |    32 -
 .../ignite/igfs/IgfsHadoopDualSyncSelfTest.java |    32 -
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |  2366 ---
 .../IgfsHadoopFileSystemClientSelfTest.java     |   199 -
 .../IgfsHadoopFileSystemHandshakeSelfTest.java  |   311 -
 .../IgfsHadoopFileSystemIpcCacheSelfTest.java   |   207 -
 .../IgfsHadoopFileSystemLoggerSelfTest.java     |   287 -
 ...IgfsHadoopFileSystemLoggerStateSelfTest.java |   325 -
 ...adoopFileSystemLoopbackAbstractSelfTest.java |    46 -
 ...SystemLoopbackEmbeddedDualAsyncSelfTest.java |    33 -
 ...eSystemLoopbackEmbeddedDualSyncSelfTest.java |    33 -
 ...leSystemLoopbackEmbeddedPrimarySelfTest.java |    33 -
 ...SystemLoopbackEmbeddedSecondarySelfTest.java |    34 -
 ...SystemLoopbackExternalDualAsyncSelfTest.java |    33 -
 ...eSystemLoopbackExternalDualSyncSelfTest.java |    33 -
 ...leSystemLoopbackExternalPrimarySelfTest.java |    33 -
 ...SystemLoopbackExternalSecondarySelfTest.java |    34 -
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   319 -
 ...fsHadoopFileSystemShmemAbstractSelfTest.java |    88 -
 ...ileSystemShmemEmbeddedDualAsyncSelfTest.java |    33 -
 ...FileSystemShmemEmbeddedDualSyncSelfTest.java |    33 -
 ...pFileSystemShmemEmbeddedPrimarySelfTest.java |    33 -
 ...ileSystemShmemEmbeddedSecondarySelfTest.java |    33 -
 ...ileSystemShmemExternalDualAsyncSelfTest.java |    33 -
 ...FileSystemShmemExternalDualSyncSelfTest.java |    33 -
 ...pFileSystemShmemExternalPrimarySelfTest.java |    33 -
 ...ileSystemShmemExternalSecondarySelfTest.java |    33 -
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |     4 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |  2366 +++
 .../IgniteHadoopFileSystemClientSelfTest.java   |   199 +
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |   311 +
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |   207 +
 .../IgniteHadoopFileSystemLoggerSelfTest.java   |   287 +
 ...niteHadoopFileSystemLoggerStateSelfTest.java |   325 +
 ...adoopFileSystemLoopbackAbstractSelfTest.java |    46 +
 ...SystemLoopbackEmbeddedDualAsyncSelfTest.java |    33 +
 ...eSystemLoopbackEmbeddedDualSyncSelfTest.java |    33 +
 ...leSystemLoopbackEmbeddedPrimarySelfTest.java |    33 +
 ...SystemLoopbackEmbeddedSecondarySelfTest.java |    34 +
 ...SystemLoopbackExternalDualAsyncSelfTest.java |    33 +
 ...eSystemLoopbackExternalDualSyncSelfTest.java |    33 +
 ...leSystemLoopbackExternalPrimarySelfTest.java |    33 +
 ...SystemLoopbackExternalSecondarySelfTest.java |    34 +
 ...teHadoopFileSystemSecondaryModeSelfTest.java |   319 +
 ...teHadoopFileSystemShmemAbstractSelfTest.java |    88 +
 ...ileSystemShmemEmbeddedDualAsyncSelfTest.java |    33 +
 ...FileSystemShmemEmbeddedDualSyncSelfTest.java |    33 +
 ...pFileSystemShmemEmbeddedPrimarySelfTest.java |    33 +
 ...ileSystemShmemEmbeddedSecondarySelfTest.java |    33 +
 ...ileSystemShmemExternalDualAsyncSelfTest.java |    33 +
 ...FileSystemShmemExternalDualSyncSelfTest.java |    33 +
 ...pFileSystemShmemExternalPrimarySelfTest.java |    33 +
 ...ileSystemShmemExternalSecondarySelfTest.java |    33 +
 .../hadoop/GridHadoopAbstractSelfTest.java      |   222 -
 .../hadoop/GridHadoopAbstractWordCountTest.java |   138 -
 .../hadoop/GridHadoopClassLoaderTest.java       |    69 -
 .../hadoop/GridHadoopCommandLineTest.java       |   440 -
 ...idHadoopDefaultMapReducePlannerSelfTest.java |  1005 --
 .../hadoop/GridHadoopFileSystemsTest.java       |   177 -
 .../hadoop/GridHadoopGroupingTest.java          |   286 -
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |   330 -
 .../GridHadoopMapReduceEmbeddedSelfTest.java    |   245 -
 .../hadoop/GridHadoopMapReduceTest.java         |   195 -
 .../hadoop/GridHadoopPopularWordsTest.java      |   294 -
 .../GridHadoopSerializationWrapperSelfTest.java |    74 -
 .../processors/hadoop/GridHadoopSharedMap.java  |    67 -
 .../hadoop/GridHadoopSortingExternalTest.java   |    32 -
 .../hadoop/GridHadoopSortingTest.java           |   281 -
 .../hadoop/GridHadoopSplitWrapperSelfTest.java  |    68 -
 .../processors/hadoop/GridHadoopStartup.java    |    55 -
 .../hadoop/GridHadoopTaskExecutionSelfTest.java |   551 -
 .../hadoop/GridHadoopTasksAllVersionsTest.java  |   259 -
 .../hadoop/GridHadoopTasksV1Test.java           |    57 -
 .../hadoop/GridHadoopTasksV2Test.java           |    75 -
 .../GridHadoopTestRoundRobinMrPlanner.java      |    66 -
 .../hadoop/GridHadoopTestTaskContext.java       |   219 -
 .../processors/hadoop/GridHadoopTestUtils.java  |   102 -
 .../hadoop/GridHadoopV2JobSelfTest.java         |    88 -
 .../hadoop/GridHadoopValidationSelfTest.java    |    53 -
 .../hadoop/HadoopAbstractSelfTest.java          |   222 +
 .../hadoop/HadoopAbstractWordCountTest.java     |   138 +
 .../hadoop/HadoopClassLoaderTest.java           |    69 +
 .../hadoop/HadoopCommandLineTest.java           |   440 +
 .../HadoopDefaultMapReducePlannerSelfTest.java  |  1006 ++
 .../hadoop/HadoopFileSystemsTest.java           |   177 +
 .../processors/hadoop/HadoopGroupingTest.java   |   287 +
 .../hadoop/HadoopJobTrackerSelfTest.java        |   331 +
 .../hadoop/HadoopMapReduceEmbeddedSelfTest.java |   246 +
 .../processors/hadoop/HadoopMapReduceTest.java  |   197 +
 .../hadoop/HadoopPopularWordsTest.java          |   294 +
 .../HadoopSerializationWrapperSelfTest.java     |    74 +
 .../processors/hadoop/HadoopSharedMap.java      |    67 +
 .../hadoop/HadoopSortingExternalTest.java       |    34 +
 .../processors/hadoop/HadoopSortingTest.java    |   282 +
 .../hadoop/HadoopSplitWrapperSelfTest.java      |    68 +
 .../processors/hadoop/HadoopStartup.java        |    54 +
 .../hadoop/HadoopTaskExecutionSelfTest.java     |   551 +
 .../hadoop/HadoopTasksAllVersionsTest.java      |   259 +
 .../processors/hadoop/HadoopTasksV1Test.java    |    57 +
 .../processors/hadoop/HadoopTasksV2Test.java    |    75 +
 .../hadoop/HadoopTestRoundRobinMrPlanner.java   |    66 +
 .../hadoop/HadoopTestTaskContext.java           |   219 +
 .../processors/hadoop/HadoopTestUtils.java      |   102 +
 .../processors/hadoop/HadoopV2JobSelfTest.java  |    88 +
 .../hadoop/HadoopValidationSelfTest.java        |    53 +
 .../hadoop/examples/GridHadoopWordCount1.java   |    88 -
 .../examples/GridHadoopWordCount1Map.java       |    62 -
 .../examples/GridHadoopWordCount1Reduce.java    |    51 -
 .../hadoop/examples/GridHadoopWordCount2.java   |    95 -
 .../examples/GridHadoopWordCount2Mapper.java    |    72 -
 .../examples/GridHadoopWordCount2Reducer.java   |    70 -
 .../hadoop/examples/HadoopWordCount1.java       |    88 +
 .../hadoop/examples/HadoopWordCount1Map.java    |    62 +
 .../hadoop/examples/HadoopWordCount1Reduce.java |    51 +
 .../hadoop/examples/HadoopWordCount2.java       |    95 +
 .../hadoop/examples/HadoopWordCount2Mapper.java |    72 +
 .../examples/HadoopWordCount2Reducer.java       |    70 +
 .../collections/GridHadoopAbstractMapTest.java  |   152 -
 ...ridHadoopConcurrentHashMultimapSelftest.java |   267 -
 .../collections/GridHadoopHashMapSelfTest.java  |   170 -
 .../collections/GridHadoopSkipListSelfTest.java |   303 -
 .../collections/HadoopAbstractMapTest.java      |   154 +
 .../HadoopConcurrentHashMultimapSelftest.java   |   267 +
 .../collections/HadoopHashMapSelfTest.java      |   170 +
 .../collections/HadoopSkipListSelfTest.java     |   303 +
 .../streams/GridHadoopDataStreamSelfTest.java   |   151 -
 .../streams/HadoopDataStreamSelfTest.java       |   151 +
 .../GridHadoopExecutorServiceTest.java          |   119 -
 .../taskexecutor/HadoopExecutorServiceTest.java |   119 +
 ...GridHadoopExternalTaskExecutionSelfTest.java |   210 -
 .../HadoopExternalTaskExecutionSelfTest.java    |   211 +
 ...GridHadoopExternalCommunicationSelfTest.java |   209 -
 .../HadoopExternalCommunicationSelfTest.java    |   209 +
 .../testsuites/IgniteHadoopTestSuite.java       |    84 +-
 .../IgniteIgfsLinuxAndMacOSTestSuite.java       |    22 +-
 .../hibernate/CacheHibernateBlobStore.java      |     2 +-
 .../hibernate/HibernateL2CacheSelfTest.java     |     8 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    12 +-
 .../rest/protocols/http/jetty/rest.html         |    19 +-
 modules/scalar/pom.xml                          |     6 +
 .../ignite/schema/generator/PojoGenerator.java  |     3 +-
 .../schema/generator/SnippetGenerator.java      |   138 +
 .../schema/parser/DatabaseMetadataParser.java   |     7 +-
 .../parser/dialect/JdbcMetadataDialect.java     |    95 +-
 .../parser/dialect/OracleMetadataDialect.java   |    66 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |     7 +
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |     4 +-
 .../org/apache/ignite/IgniteSpringBean.java     |     4 +-
 .../ignite/internal/GridFactorySelfTest.java    |    10 +-
 ...gniteProjectionStartStopRestartSelfTest.java |    42 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |     2 +-
 .../scala/org/apache/ignite/visor/Packet.scala  |    38 -
 .../ignite/visor/commands/VisorConsole.scala    |    18 +-
 .../ignite/visor/commands/ack/Packet.scala      |    55 -
 .../visor/commands/ack/VisorAckCommand.scala    |     2 +-
 .../ignite/visor/commands/alert/Packet.scala    |   108 -
 .../ignite/visor/commands/cache/Packet.scala    |   127 -
 .../commands/cache/VisorCacheCommand.scala      |    28 +-
 .../commands/cache/VisorCacheScanCommand.scala  |     7 +-
 .../ignite/visor/commands/config/Packet.scala   |    55 -
 .../config/VisorConfigurationCommand.scala      |     5 +-
 .../ignite/visor/commands/deploy/Packet.scala   |    76 -
 .../ignite/visor/commands/disco/Packet.scala    |    72 -
 .../ignite/visor/commands/events/Packet.scala   |    97 -
 .../ignite/visor/commands/gc/Packet.scala       |    61 -
 .../ignite/visor/commands/ggcube_128x128.png    |   Bin 11444 -> 0 bytes
 .../ignite/visor/commands/ggcube_48x48.png      |   Bin 3365 -> 0 bytes
 .../ignite/visor/commands/kill/Packet.scala     |    78 -
 .../visor/commands/kill/VisorKillCommand.scala  |     2 +-
 .../visor/commands/logo_ignite_128x128.png      |   Bin 0 -> 18667 bytes
 .../ignite/visor/commands/logo_ignite_48x48.png |   Bin 0 -> 16572 bytes
 .../ignite/visor/commands/node/Packet.scala     |    60 -
 .../visor/commands/node/VisorNodeCommand.scala  |     6 +-
 .../ignite/visor/commands/ping/Packet.scala     |    50 -
 .../visor/commands/ping/VisorPingCommand.scala  |     2 +-
 .../ignite/visor/commands/start/Packet.scala    |    90 -
 .../ignite/visor/commands/tasks/Packet.scala    |   116 -
 .../commands/tasks/VisorTasksCommand.scala      |    26 +-
 .../ignite/visor/commands/top/Packet.scala      |    87 -
 .../ignite/visor/commands/vvm/Packet.scala      |    61 -
 .../scala/org/apache/ignite/visor/visor.scala   |    31 +-
 .../apache/ignite/visor/plugin/VisorPlugin.java |     2 +-
 pom.xml                                         |    66 +-
 830 files changed, 57281 insertions(+), 65442 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
index ee1762e,1b4be2d..946000d
--- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
@@@ -207,15 -209,15 +207,15 @@@ public interface GridCache<K, V> extend
       * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should
       * usually make sure that new nodes get placed on the same place of consistent hash ring as
       * the left nodes, and that nodes are restarted before
 -     * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
 +     * {@link CacheConfiguration#getRebalancePartitionedDelay() rebalanceDelay} expires. To place nodes
       * on the same place in consistent hash ring, use
-      * {@link org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction#setHashIdResolver(org.apache.ignite.cache.affinity.CacheAffinityNodeHashResolver)} to make sure that
+      * {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)} to make sure that
       * a node maps to the same hash ID if re-started.
       * <p>
 -     * See {@link org.apache.ignite.configuration.CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
 -     * preload re-partition delay.
 +     * See {@link org.apache.ignite.configuration.CacheConfiguration#getRebalancePartitionedDelay()} for more information on how to configure
 +     * rebalance re-partition delay.
       * <p>
 -     * @return Future that will be completed when preloading is finished.
 +     * @return Future that will be completed when rebalancing is finished.
       */
      public IgniteInternalFuture<?> forceRepartition();
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c427053,20ad5e1..c4739d8
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -556,13 -547,13 +547,13 @@@ public class GridCacheProcessor extend
                      "Deployment mode for cache is not CONTINUOUS or SHARED.");
          }
  
 -        maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
 +        maxRebalanceOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
  
          // Internal caches which should not be returned to user.
-         IgfsConfiguration[] igfsCfgs = ctx.grid().configuration().getIgfsConfiguration();
+         FileSystemConfiguration[] igfsCfgs = ctx.grid().configuration().getFileSystemConfiguration();
  
          if (igfsCfgs != null) {
-             for (IgfsConfiguration igfsCfg : igfsCfgs) {
+             for (FileSystemConfiguration igfsCfg : igfsCfgs) {
                  sysCaches.add(igfsCfg.getMetaCacheName());
                  sysCaches.add(igfsCfg.getDataCacheName());
              }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/config/load/dsi-49-server-production.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
index 30a9ba6,325d346..dea5baf
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
@@@ -81,18 -81,18 +81,18 @@@ public class GridCacheConfigurationVali
          CacheConfiguration dfltCacheCfg = defaultCacheConfiguration();
  
          dfltCacheCfg.setCacheMode(PARTITIONED);
 -        dfltCacheCfg.setPreloadMode(ASYNC);
 +        dfltCacheCfg.setRebalanceMode(ASYNC);
          dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-         dfltCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction());
+         dfltCacheCfg.setAffinity(new CacheRendezvousAffinityFunction());
  
          // Non-default cache configuration.
          CacheConfiguration namedCacheCfg = defaultCacheConfiguration();
  
          namedCacheCfg.setCacheMode(PARTITIONED);
 -        namedCacheCfg.setPreloadMode(ASYNC);
 +        namedCacheCfg.setRebalanceMode(ASYNC);
          namedCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
          namedCacheCfg.setName(NON_DFLT_CACHE_NAME);
-         namedCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction());
+         namedCacheCfg.setAffinity(new CacheRendezvousAffinityFunction());
  
          // Modify cache config according to test parameters.
          if (gridName.contains(WRONG_PRELOAD_MODE_GRID_NAME))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index c5acd6b,f3ba5c8..353f7da
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@@ -112,9 -112,9 +112,9 @@@ public abstract class GridCachePreloadR
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(FULL_SYNC);
          cc.setStartSize(20);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setRebalanceBatchSize(preloadBatchSize);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cc.setPreloadBatchSize(preloadBatchSize);
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
          cc.setAtomicityMode(TRANSACTIONAL);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index 7512f71,504ec12..b56e306
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@@ -64,8 -64,8 +64,8 @@@ public class GridCacheDhtInternalEntryS
          CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setCacheMode(PARTITIONED);
 -        cacheCfg.setPreloadMode(SYNC);
 +        cacheCfg.setRebalanceMode(SYNC);
-         cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 2));
+         cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, 2));
          cacheCfg.setBackups(0);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cacheCfg.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index 277d0da,3769f8d..2d4aac7
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@@ -82,10 -82,10 +82,10 @@@ public class GridCacheDhtPreloadBigData
          CacheConfiguration cc = defaultCacheConfiguration();
  
          cc.setCacheMode(PARTITIONED);
 -        cc.setPreloadBatchSize(preloadBatchSize);
 +        cc.setRebalanceBatchSize(preloadBatchSize);
          cc.setWriteSynchronizationMode(FULL_SYNC);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
  
          TcpDiscoverySpi disco = new TcpDiscoverySpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index a2d81c1,33ac600..884bbfa
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@@ -73,9 -73,9 +73,9 @@@ public class GridCacheDhtPreloadDelayed
  
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setRebalancePartitionedDelay(delay);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 128));
+         cc.setPreloadPartitionedDelay(delay);
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, 128));
          cc.setBackups(1);
          cc.setAtomicityMode(TRANSACTIONAL);
          cc.setDistributionMode(NEAR_PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 4d09a78,7b9a9bc..8f65007
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@@ -82,8 -82,8 +82,8 @@@ public class GridCacheDhtPreloadDisable
  
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
 -        cacheCfg.setPreloadMode(NONE);
 +        cacheCfg.setRebalanceMode(NONE);
-         cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cacheCfg.setBackups(backups);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
          cacheCfg.setDistributionMode(NEAR_PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index f4a1058,64f01f4..6120935
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@@ -62,8 -62,8 +62,8 @@@ public class GridCacheDhtPreloadMessage
  
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(FULL_SYNC);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 521));
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, 521));
          cc.setBackups(1);
  
          TcpDiscoverySpi disco = new TcpDiscoverySpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index c03ac23,5c2273c..f0c6c1c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@@ -109,10 -109,10 +109,10 @@@ public class GridCacheDhtPreloadSelfTes
          CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setCacheMode(PARTITIONED);
 -        cacheCfg.setPreloadBatchSize(preloadBatchSize);
 +        cacheCfg.setRebalanceBatchSize(preloadBatchSize);
          cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
 -        cacheCfg.setPreloadMode(preloadMode);
 +        cacheCfg.setRebalanceMode(preloadMode);
-         cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cacheCfg.setBackups(backups);
  
          return cacheCfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index fa04778,0f7bcb3..5d27015
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@@ -95,10 -95,10 +95,10 @@@ public class GridCacheDhtPreloadStartSt
              cacheCfg.setName("partitioned-" + i);
  
              cacheCfg.setCacheMode(PARTITIONED);
 -            cacheCfg.setPreloadBatchSize(preloadBatchSize);
 +            cacheCfg.setRebalanceBatchSize(preloadBatchSize);
              cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
 -            cacheCfg.setPreloadMode(preloadMode);
 +            cacheCfg.setRebalanceMode(preloadMode);
-             cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+             cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
              cacheCfg.setBackups(backups);
              cacheCfg.setAtomicityMode(TRANSACTIONAL);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index 38a87d1,d454845..072aa03
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@@ -83,10 -83,10 +83,10 @@@ public class GridCacheDhtPreloadUnloadS
          CacheConfiguration cc = defaultCacheConfiguration();
  
          cc.setCacheMode(PARTITIONED);
 -        cc.setPreloadBatchSize(preloadBatchSize);
 +        cc.setRebalanceBatchSize(preloadBatchSize);
          cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
          cc.setAtomicityMode(TRANSACTIONAL);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 00bee77,8a2cfa0..a635e63
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@@ -75,9 -75,9 +75,9 @@@ public class GridCachePartitionedTopolo
          CacheConfiguration cc = defaultCacheConfiguration();
  
          cc.setCacheMode(PARTITIONED);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18));
          cc.setBackups(1);
 -        cc.setPreloadMode(SYNC);
 +        cc.setRebalanceMode(SYNC);
          cc.setDistributionMode(PARTITIONED_ONLY);
  
          c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index f983248,f451a34..771ba52
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@@ -18,7 -18,7 +18,8 @@@
  package org.apache.ignite.internal.processors.cache.distributed.dht;
  
  import org.apache.ignite.*;
- import org.apache.ignite.cache.affinity.consistenthash.*;
++import org.apache.ignite.cache.*;
+ import org.apache.ignite.cache.affinity.rendezvous.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
@@@ -60,8 -60,8 +61,8 @@@ public class GridCachePartitionedUnload
      protected CacheConfiguration cacheConfiguration() {
          CacheConfiguration cacheCfg = defaultCacheConfiguration();
          cacheCfg.setCacheMode(PARTITIONED);
 -        cacheCfg.setPreloadMode(SYNC);
 +        cacheCfg.setRebalanceMode(SYNC);
-         cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
+         cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10));
          cacheCfg.setBackups(0);
          return cacheCfg;
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 48f4948,069ffb6..58aef90
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@@ -40,8 -39,7 +39,8 @@@ import java.util.concurrent.atomic.*
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
  import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
 +import static org.apache.ignite.cache.CacheRebalanceMode.*;
- import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*;
+ import static org.apache.ignite.cache.CachePreloadMode.*;
  import static org.apache.ignite.events.EventType.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index 5fac564,40acefb..d68eb82
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@@ -43,9 -43,9 +43,9 @@@ public class GridCachePartitionedNodeRe
          cc.setWriteSynchronizationMode(FULL_ASYNC);
          cc.setDistributionMode(PARTITIONED_ONLY);
          cc.setStartSize(20);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setRebalanceBatchSize(preloadBatchSize);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cc.setPreloadBatchSize(preloadBatchSize);
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
  
          c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index a6d7032,0d71336..1aed0b7
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@@ -42,9 -42,9 +42,9 @@@ public class GridCachePartitionedOptimi
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(FULL_ASYNC);
          cc.setStartSize(20);
 -        cc.setPreloadMode(preloadMode);
 +        cc.setRebalanceMode(preloadMode);
-         cc.setRebalanceBatchSize(preloadBatchSize);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
+         cc.setPreloadBatchSize(preloadBatchSize);
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
  
          c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 9e80df6,b8a3cc9..1b56e8c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@@ -76,9 -76,9 +76,9 @@@ public class GridCachePartitionedTxSalv
          CacheConfiguration cc = defaultCacheConfiguration();
  
          cc.setCacheMode(CacheMode.PARTITIONED);
-         cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
+         cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18));
          cc.setBackups(1);
 -        cc.setPreloadMode(CachePreloadMode.SYNC);
 +        cc.setRebalanceMode(CacheRebalanceMode.SYNC);
  
          c.setCacheConfiguration(cc);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f470f682/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------


Mime
View raw message