ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into ignite-164v2stable
Date Thu, 05 Feb 2015 16:25:31 GMT
Merge remote-tracking branch 'origin/sprint-1' into ignite-164v2stable

Conflicts:
	modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
	modules/core/src/main/java/org/apache/ignite/events/IgniteEventType.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.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/8446c4b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8446c4b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8446c4b7

Branch: refs/heads/ignite-164v2stable
Commit: 8446c4b7ee6c1fc4c4c7a58260d32c792115c991
Parents: 758ff46 bb8b07d
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Feb 5 19:24:20 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Feb 5 19:24:20 2015 +0300

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 config/hadoop/default-config.xml                |     2 +-
 .../datagrid/CacheContinuousQueryExample.java   |     2 +-
 .../datastructures/CacheAtomicLongExample.java  |    78 -
 .../CacheAtomicReferenceExample.java            |   126 -
 .../CacheAtomicSequenceExample.java             |   112 -
 .../CacheAtomicStampedExample.java              |   132 -
 .../CacheCountDownLatchExample.java             |   112 -
 .../datastructures/CacheQueueExample.java       |   214 -
 .../datastructures/CacheSetExample.java         |   193 -
 .../datastructures/IgniteAtomicLongExample.java |    74 +
 .../IgniteAtomicReferenceExample.java           |   110 +
 .../IgniteAtomicSequenceExample.java            |    96 +
 .../IgniteAtomicStampedExample.java             |   117 +
 .../IgniteCountDownLatchExample.java            |    96 +
 .../datastructures/IgniteQueueExample.java      |   206 +
 .../datastructures/IgniteSetExample.java        |   186 +
 .../client/memcache/MemcacheRestExample.java    |     3 +-
 .../examples/ScalarCacheAffinityExample1.scala  |     2 +-
 .../examples/ScalarCacheAffinityExample2.scala  |     2 +-
 .../ScalarCacheAffinitySimpleExample.scala      |     2 +-
 .../scalar/examples/ScalarCacheExample.scala    |     2 +-
 .../ScalarCachePopularNumbersExample.scala      |     4 +-
 .../examples/ScalarCacheQueryExample.scala      |     2 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |     4 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |    14 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |     2 +-
 .../integration/ClientAbstractSelfTest.java     |     4 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |    12 -
 .../rest/AbstractRestProcessorSelfTest.java     |     2 +-
 .../rest/ClientMemcachedProtocolSelfTest.java   |     8 +-
 .../JettyRestProcessorAbstractSelfTest.java     |    21 +-
 .../rest/RestBinaryProtocolSelfTest.java        |     6 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |    66 +-
 .../processors/rest/TestMemcacheClient.java     |    11 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |     7 +-
 .../src/test/resources/spring-server-node.xml   |     6 +-
 .../test/resources/spring-server-ssl-node.xml   |     6 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   115 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |   163 +
 .../apache/ignite/IgniteAtomicReference.java    |    99 +
 .../org/apache/ignite/IgniteAtomicSequence.java |   136 +
 .../org/apache/ignite/IgniteAtomicStamped.java  |   128 +
 .../java/org/apache/ignite/IgniteCache.java     |    16 +-
 .../org/apache/ignite/IgniteCountDownLatch.java |   232 +
 .../java/org/apache/ignite/IgnitePortables.java |     4 +-
 .../java/org/apache/ignite/IgniteQueue.java     |   185 +
 .../main/java/org/apache/ignite/IgniteSet.java  |   107 +
 .../apache/ignite/cache/CacheConfiguration.java |   118 +-
 .../org/apache/ignite/cache/CacheEntry.java     |     5 +-
 .../apache/ignite/cache/CacheEntryEvent.java    |    75 -
 .../org/apache/ignite/cache/CachePeekMode.java  |    12 +-
 .../apache/ignite/cache/CacheProjection.java    |    52 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   145 +
 .../apache/ignite/cache/CacheTypeMetadata.java  |   330 +
 .../java/org/apache/ignite/cache/GridCache.java |    14 -
 .../apache/ignite/cache/GridCachePeekMode.java  |    85 -
 .../ignite/cache/GridCacheVersionedEntry.java   |     3 +-
 .../cache/datastructures/CacheAtomicLong.java   |   157 -
 .../datastructures/CacheAtomicReference.java    |    93 -
 .../datastructures/CacheAtomicSequence.java     |   130 -
 .../datastructures/CacheAtomicStamped.java      |   121 -
 .../datastructures/CacheCountDownLatch.java     |   226 -
 .../CacheDataStructureInvalidException.java     |    66 -
 ...cheDataStructureInvalidRuntimeException.java |    66 -
 .../CacheDataStructureRemovedException.java     |    61 -
 ...cheDataStructureRemovedRuntimeException.java |    61 -
 .../datastructures/CacheDataStructures.java     |   220 -
 .../ignite/cache/datastructures/CacheQueue.java |   182 -
 .../ignite/cache/datastructures/CacheSet.java   |    61 -
 .../ignite/cache/datastructures/package.html    |    24 -
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |     1 +
 .../random/CacheRandomEvictionPolicy.java       |     1 +
 .../cache/query/CacheContinuousQuery.java       |    61 +-
 .../cache/query/CacheQueryConfiguration.java    |    23 -
 .../cache/query/CacheQueryGroupIndex.java       |     9 -
 .../ignite/cache/query/CacheQuerySqlField.java  |    10 -
 .../cache/query/CacheQueryTypeMetadata.java     |   196 -
 .../query/annotations/QueryGroupIndex.java      |     9 -
 .../cache/query/annotations/QuerySqlField.java  |    10 -
 .../ignite/cache/store/CacheLocalStore.java     |    31 -
 .../apache/ignite/cache/store/CacheStore.java   |     2 +-
 .../cache/store/CacheStoreBalancingWrapper.java |   296 -
 .../ignite/cache/store/jdbc/JdbcCacheStore.java |  1560 ++
 .../cache/store/jdbc/JdbcPojoCacheStore.java    |   205 +
 .../store/jdbc/dialect/BasicJdbcDialect.java    |   274 +
 .../cache/store/jdbc/dialect/DB2Dialect.java    |    68 +
 .../cache/store/jdbc/dialect/H2Dialect.java     |    41 +
 .../cache/store/jdbc/dialect/JdbcDialect.java   |   117 +
 .../cache/store/jdbc/dialect/MySQLDialect.java  |    48 +
 .../cache/store/jdbc/dialect/OracleDialect.java |    72 +
 .../store/jdbc/dialect/SQLServerDialect.java    |    67 +
 .../cache/store/jdbc/dialect/package.html       |    24 +
 .../apache/ignite/client/GridClientNode.java    |    24 -
 .../ignite/client/GridClientProtocol.java       |     4 -
 .../ignite/client/impl/GridClientNodeImpl.java  |    15 -
 .../IgniteAtomicConfiguration.java              |   105 +
 .../IgniteCollectionConfiguration.java          |    67 +
 .../configuration/IgniteConfiguration.java      |    27 +-
 .../DataStructureRemovedException.java          |    61 +
 .../apache/ignite/events/IgniteEventType.java   |   120 -
 .../org/apache/ignite/hadoop/GridHadoop.java    |    86 -
 .../ignite/hadoop/GridHadoopConfiguration.java  |   172 -
 .../apache/ignite/hadoop/GridHadoopCounter.java |    44 -
 .../ignite/hadoop/GridHadoopCounterWriter.java  |    36 -
 .../ignite/hadoop/GridHadoopCounters.java       |    49 -
 .../ignite/hadoop/GridHadoopFileBlock.java      |   162 -
 .../ignite/hadoop/GridHadoopInputSplit.java     |    54 -
 .../org/apache/ignite/hadoop/GridHadoopJob.java |   102 -
 .../apache/ignite/hadoop/GridHadoopJobId.java   |   102 -
 .../apache/ignite/hadoop/GridHadoopJobInfo.java |    83 -
 .../ignite/hadoop/GridHadoopJobPhase.java       |    38 -
 .../ignite/hadoop/GridHadoopJobProperty.java    |   138 -
 .../ignite/hadoop/GridHadoopJobStatus.java      |   207 -
 .../ignite/hadoop/GridHadoopMapReducePlan.java  |    80 -
 .../hadoop/GridHadoopMapReducePlanner.java      |    40 -
 .../ignite/hadoop/GridHadoopPartitioner.java    |    33 -
 .../ignite/hadoop/GridHadoopSerialization.java  |    54 -
 .../apache/ignite/hadoop/GridHadoopTask.java    |    72 -
 .../ignite/hadoop/GridHadoopTaskContext.java    |   189 -
 .../ignite/hadoop/GridHadoopTaskInfo.java       |   153 -
 .../ignite/hadoop/GridHadoopTaskInput.java      |    55 -
 .../ignite/hadoop/GridHadoopTaskOutput.java     |    40 -
 .../ignite/hadoop/GridHadoopTaskType.java       |    56 -
 .../java/org/apache/ignite/hadoop/package.html  |    24 -
 .../apache/ignite/internal/GridComponent.java   |    19 +
 .../ignite/internal/GridJobExecuteRequest.java  |    95 +-
 .../ignite/internal/GridKernalContext.java      |     8 +
 .../ignite/internal/GridKernalContextImpl.java  |    12 +
 .../ignite/internal/GridPluginComponent.java    |     9 +-
 .../org/apache/ignite/internal/IgniteEx.java    |     8 +
 .../apache/ignite/internal/IgniteKernal.java    |   151 +-
 .../ignite/internal/IgniteNodeAttributes.java   |     4 -
 .../org/apache/ignite/internal/IgnitionEx.java  |    80 +-
 .../internal/managers/GridManagerAdapter.java   |     7 +-
 .../managers/GridNoopManagerAdapter.java        |     5 +
 .../discovery/GridDiscoveryManager.java         |    90 +-
 .../processors/GridProcessorAdapter.java        |     5 +
 .../affinity/GridAffinityAssignmentCache.java   |    23 +-
 .../processors/cache/CacheEntryEvent.java       |    75 +
 .../processors/cache/CacheInvokeEntry.java      |    12 +-
 .../cache/CacheStoreBalancingWrapper.java       |   297 +
 .../processors/cache/GridCacheAdapter.java      |   307 +-
 .../processors/cache/GridCacheAttributes.java   |    42 +-
 .../cache/GridCacheClearAllRunnable.java        |    12 +-
 .../cache/GridCacheConcurrentMap.java           |     2 +-
 .../processors/cache/GridCacheContext.java      |     6 +-
 .../cache/GridCacheDeploymentManager.java       |     4 +-
 .../processors/cache/GridCacheEntryEx.java      |    14 +
 .../processors/cache/GridCacheEntryImpl.java    |     4 +-
 .../processors/cache/GridCacheEntrySet.java     |     2 +-
 .../processors/cache/GridCacheEventManager.java |     4 +-
 .../cache/GridCacheEvictionEntry.java           |     2 +-
 .../cache/GridCacheFilterEvaluationEntry.java   |     2 +-
 .../processors/cache/GridCacheKeySet.java       |     2 +-
 .../processors/cache/GridCacheMapAdapter.java   |     2 +-
 .../processors/cache/GridCacheMapEntry.java     |    50 +-
 .../GridCachePartitionExchangeManager.java      |     2 +-
 .../processors/cache/GridCachePeekMode.java     |    85 +
 .../processors/cache/GridCacheProcessor.java    |    31 +-
 .../cache/GridCacheProjectionImpl.java          |    30 +-
 .../processors/cache/GridCacheProxyImpl.java    |    56 +-
 .../processors/cache/GridCacheStoreManager.java |     1 +
 .../processors/cache/GridCacheSwapManager.java  |    48 +-
 .../processors/cache/GridCacheUtils.java        |    19 +-
 .../cache/GridCacheValueCollection.java         |     2 +-
 .../processors/cache/IgniteCacheProxy.java      |    51 +-
 .../CacheDataStructuresManager.java             |   719 +
 .../GridAtomicCacheQueueImpl.java               |   255 -
 .../GridCacheAnnotationHelper.java              |   240 -
 .../datastructures/GridCacheAtomicLongEx.java   |    32 -
 .../datastructures/GridCacheAtomicLongImpl.java |   527 -
 .../GridCacheAtomicLongValue.java               |    84 -
 .../GridCacheAtomicReferenceEx.java             |    32 -
 .../GridCacheAtomicReferenceImpl.java           |   319 -
 .../GridCacheAtomicReferenceValue.java          |   106 -
 .../GridCacheAtomicSequenceEx.java              |    32 -
 .../GridCacheAtomicSequenceImpl.java            |   517 -
 .../GridCacheAtomicSequenceValue.java           |    84 -
 .../GridCacheAtomicStampedEx.java               |    32 -
 .../GridCacheAtomicStampedImpl.java             |   349 -
 .../GridCacheAtomicStampedValue.java            |   135 -
 .../GridCacheCountDownLatchEx.java              |    39 -
 .../GridCacheCountDownLatchImpl.java            |   359 -
 .../GridCacheCountDownLatchValue.java           |   115 -
 .../GridCacheDataStructuresImpl.java            |   119 -
 .../GridCacheDataStructuresManager.java         |  1592 --
 .../GridCacheDataStructuresProxy.java           |   267 -
 .../datastructures/GridCacheInternalKey.java    |    31 -
 .../GridCacheInternalKeyImpl.java               |    89 -
 .../datastructures/GridCacheQueueAdapter.java   |  1022 --
 .../datastructures/GridCacheQueueHeader.java    |   199 -
 .../datastructures/GridCacheQueueHeaderKey.java |    88 -
 .../datastructures/GridCacheQueueItemKey.java   |   121 -
 .../datastructures/GridCacheQueueProxy.java     |   746 -
 .../datastructures/GridCacheRemovable.java      |    37 -
 .../datastructures/GridCacheSetHeader.java      |    85 -
 .../datastructures/GridCacheSetHeaderKey.java   |    88 -
 .../cache/datastructures/GridCacheSetImpl.java  |   576 -
 .../datastructures/GridCacheSetItemKey.java     |   109 -
 .../cache/datastructures/GridCacheSetProxy.java |   537 -
 .../datastructures/GridSetQueryPredicate.java   |   115 -
 .../GridTransactionalCacheQueueImpl.java        |   240 -
 .../GridDistributedCacheAdapter.java            |   134 +
 .../GridPartitionedCacheEntryImpl.java          |     2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |     4 +-
 .../distributed/dht/GridDhtCacheEntryImpl.java  |     2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |    10 +-
 .../dht/colocated/GridDhtColocatedCache.java    |     2 +-
 .../distributed/near/GridNearAtomicCache.java   |     4 +-
 .../distributed/near/GridNearCacheAdapter.java  |    18 +-
 .../near/GridNearCacheClearAllRunnable.java     |     2 +-
 .../distributed/near/GridNearTxRemote.java      |     2 +-
 .../processors/cache/local/GridLocalCache.java  |     6 +
 .../local/atomic/GridLocalAtomicCache.java      |     6 +-
 .../query/GridCacheDistributedQueryManager.java |     2 -
 .../cache/query/GridCacheQueriesProxy.java      |     2 +-
 .../cache/query/GridCacheQueryAdapter.java      |     2 +-
 .../cache/query/GridCacheQueryManager.java      |     4 +-
 .../GridCacheContinuousQueryAdapter.java        |   125 +-
 .../GridCacheContinuousQueryHandler.java        |    15 +-
 .../GridCacheContinuousQueryManager.java        |    19 +-
 .../processors/cache/store/CacheLocalStore.java |    31 +
 .../cache/transactions/IgniteTxAdapter.java     |     2 +-
 .../cache/transactions/IgniteTxEntry.java       |     2 +-
 .../transactions/IgniteTxLocalAdapter.java      |     2 +-
 .../cache/transactions/IgniteTxManager.java     |     3 +-
 .../continuous/GridContinuousProcessor.java     |    20 +-
 .../dataload/GridDataLoadCacheUpdaters.java     |    12 +-
 .../dataload/IgniteDataLoaderImpl.java          |    27 +-
 .../CacheDataStructuresConfigurationKey.java    |    62 +
 .../datastructures/DataStructuresProcessor.java |  1662 +++
 .../GridAtomicCacheQueueImpl.java               |   255 +
 .../GridCacheAnnotationHelper.java              |   240 +
 .../datastructures/GridCacheAtomicLongEx.java   |    32 +
 .../datastructures/GridCacheAtomicLongImpl.java |   554 +
 .../GridCacheAtomicLongValue.java               |    84 +
 .../GridCacheAtomicReferenceEx.java             |    32 +
 .../GridCacheAtomicReferenceImpl.java           |   340 +
 .../GridCacheAtomicReferenceValue.java          |   106 +
 .../GridCacheAtomicSequenceEx.java              |    32 +
 .../GridCacheAtomicSequenceImpl.java            |   556 +
 .../GridCacheAtomicSequenceValue.java           |    84 +
 .../GridCacheAtomicStampedEx.java               |    32 +
 .../GridCacheAtomicStampedImpl.java             |   380 +
 .../GridCacheAtomicStampedValue.java            |   135 +
 .../GridCacheCountDownLatchEx.java              |    39 +
 .../GridCacheCountDownLatchImpl.java            |   394 +
 .../GridCacheCountDownLatchValue.java           |   115 +
 .../datastructures/GridCacheInternalKey.java    |    31 +
 .../GridCacheInternalKeyImpl.java               |    89 +
 .../datastructures/GridCacheQueueAdapter.java   |  1038 ++
 .../datastructures/GridCacheQueueHeader.java    |   199 +
 .../datastructures/GridCacheQueueHeaderKey.java |    88 +
 .../datastructures/GridCacheQueueItemKey.java   |   121 +
 .../datastructures/GridCacheQueueProxy.java     |   771 +
 .../datastructures/GridCacheRemovable.java      |    37 +
 .../datastructures/GridCacheSetHeader.java      |    85 +
 .../datastructures/GridCacheSetHeaderKey.java   |    88 +
 .../datastructures/GridCacheSetImpl.java        |   595 +
 .../datastructures/GridCacheSetItemKey.java     |   109 +
 .../datastructures/GridCacheSetProxy.java       |   563 +
 .../datastructures/GridSetQueryPredicate.java   |   116 +
 .../GridTransactionalCacheQueueImpl.java        |   240 +
 .../processors/fs/GridGgfsAttributes.java       |     8 +-
 .../internal/processors/fs/GridGgfsPaths.java   |     8 +-
 .../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      |   102 +
 .../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 +
 .../hadoop/IgniteHadoopNoopProcessor.java       |     1 -
 .../hadoop/IgniteHadoopProcessorAdapter.java    |     1 -
 .../internal/processors/hadoop/package.html     |    24 +
 .../plugin/IgnitePluginProcessor.java           |    40 +
 .../portable/GridPortableInputStream.java       |     7 +
 .../processors/query/GridQueryProcessor.java    |    38 +-
 .../processors/rest/GridRestCommand.java        |    12 +-
 .../processors/rest/GridRestProcessor.java      |    10 +-
 .../client/message/GridClientCacheRequest.java  |     4 +-
 .../handlers/cache/GridCacheCommandHandler.java |   107 +-
 .../DataStructuresCommandHandler.java           |   110 +
 .../tcp/GridTcpMemcachedNioListener.java        |    64 +-
 .../rest/request/DataStructuresRequest.java     |    74 +
 .../rest/request/GridRestCacheRequest.java      |    37 +-
 .../ignite/internal/util/IgniteUtils.java       |    37 +-
 .../internal/util/future/IgniteFutureImpl.java  |     9 +-
 .../apache/ignite/internal/util/typedef/X.java  |    19 -
 .../visor/cache/VisorCacheClearTask.java        |     2 +-
 .../visor/cache/VisorCacheConfiguration.java    |     2 -
 .../org/apache/ignite/lang/IgniteFuture.java    |    18 +-
 .../segmentation/GridSegmentationPolicy.java    |     1 -
 .../apache/ignite/portables/PortableObject.java |    14 -
 .../ignite/spi/discovery/DiscoverySpi.java      |     4 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |     4 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |     6 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    31 +-
 .../TcpDiscoveryJoinRequestMessage.java         |    10 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |    24 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  |   101 +
 .../store/GridCacheBalancingStoreSelfTest.java  |     1 +
 ...ractJdbcCacheStoreMultithreadedSelfTest.java |   196 +
 .../PojoJdbcCacheStoreMultitreadedSelfTest.java |    34 +
 .../store/jdbc/PojoJdbcCacheStoreTest.java      |   702 +
 .../cache/store/jdbc/model/Organization.java    |   155 +
 .../cache/store/jdbc/model/OrganizationKey.java |    97 +
 .../ignite/cache/store/jdbc/model/Person.java   |   155 +
 .../cache/store/jdbc/model/PersonKey.java       |    97 +
 .../ignite/cache/store/jdbc/model/package.html  |    24 +
 .../ignite/internal/GridAffinitySelfTest.java   |     2 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |    22 -
 .../cache/GridCacheAbstractFullApiSelfTest.java |   184 +-
 .../GridCacheAbstractProjectionSelfTest.java    |    31 +-
 .../cache/GridCacheAbstractSelfTest.java        |    12 +-
 .../cache/GridCacheAbstractTxReadTest.java      |     2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |     8 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |     2 +-
 .../cache/GridCacheClearAllSelfTest.java        |    32 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |    22 +-
 ...idCacheConfigurationConsistencySelfTest.java |     5 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |     4 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |     6 +-
 .../cache/GridCacheOffHeapSelfTest.java         |     2 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |     4 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |     4 +-
 .../GridCacheReferenceCleanupSelfTest.java      |     2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |     6 +
 .../processors/cache/GridCacheTestValue.java    |     2 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |     6 +-
 .../cache/IgniteCacheAtomicLocalPeekTest.java   |    43 +
 .../cache/IgniteCacheAtomicPeekTest.java        |    49 +
 .../IgniteCacheAtomicReplicatedPeekTest.java    |    32 +
 .../cache/IgniteCachePeekAbstractTest.java      |   333 +
 .../cache/IgniteCacheTxLocalPeekTest.java       |    43 +
 .../processors/cache/IgniteCacheTxPeekTest.java |    49 +
 .../cache/IgniteCacheTxReplicatedPeekTest.java  |    32 +
 ...eAbstractDataStructuresFailoverSelfTest.java |   424 +-
 ...actQueueFailoverDataConsistencySelfTest.java |    79 +-
 .../GridCacheAtomicLongApiSelfTest.java         |   484 -
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   137 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |    61 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |    57 +-
 .../GridCacheCountDownLatchSelfTest.java        |   410 -
 .../GridCacheMultiNodeDataStructureTest.java    |     7 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   250 +-
 .../GridCacheQueueCleanupSelfTest.java          |    50 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |    34 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   188 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |   137 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |   149 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   200 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    40 +-
 .../GridCacheSetAbstractSelfTest.java           |   272 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    38 +-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |   267 +
 .../IgniteAtomicsAbstractTest.java              |    83 +
 .../IgniteCollectionAbstractTest.java           |   255 +
 .../IgniteCountDownLatchAbstractSelfTest.java   |   270 +
 .../IgniteDataStructureUniqueNameTest.java      |   356 +
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |    11 +-
 .../local/GridCacheLocalAtomicSetSelfTest.java  |     4 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |    19 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |    17 +-
 .../local/GridCacheLocalSetSelfTest.java        |     8 +-
 .../local/IgniteLocalAtomicLongApiSelfTest.java |    33 +
 .../IgniteLocalCountDownLatchSelfTest.java      |    95 +
 ...dCachePartitionedAtomicQueueApiSelfTest.java |    13 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |    10 +-
 ...micQueueFailoverDataConsistencySelfTest.java |     2 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |    13 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |    13 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |    19 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |    19 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   102 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |     8 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |    21 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |    23 +-
 ...rtitionedDataStructuresFailoverSelfTest.java |     8 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |    19 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |    25 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    50 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    53 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |     7 +
 ...CachePartitionedQueueJoinedNodeSelfTest.java |    25 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |    23 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |    24 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |    24 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |    25 +-
 ...GridCachePartitionedSetFailoverSelfTest.java |     6 +-
 .../GridCachePartitionedSetSelfTest.java        |     8 +-
 .../IgnitePartitionedAtomicLongApiSelfTest.java |    33 +
 ...IgnitePartitionedCountDownLatchSelfTest.java |    33 +
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |    68 +
 ...cheReplicatedAtomicReferenceApiSelfTest.java |    16 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |    16 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |    15 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |     8 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |    22 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |    22 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |    22 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |    17 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |    19 +-
 .../GridCacheReplicatedSetSelfTest.java         |     8 +-
 .../IgniteReplicatedAtomicLongApiSelfTest.java  |    33 +
 .../IgniteReplicatedCountDownLatchSelfTest.java |    33 +
 .../GridCacheBasicOpAbstractTest.java           |     2 +-
 .../distributed/GridCacheLockAbstractTest.java  |    21 +
 .../GridCacheMultiNodeAbstractTest.java         |     2 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |     2 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |    13 +-
 ...heAbstractTransformWriteThroughSelfTest.java |     2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |     4 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |     2 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |     2 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    40 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |    16 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |     8 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |     2 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |    20 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |     4 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |     2 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |     5 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |     2 +-
 .../cache/eviction/GridCacheMockEntry.java      |     1 +
 .../local/GridCacheLocalFullApiSelfTest.java    |     5 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |     3 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |    69 +-
 .../fs/GridGgfsDataManagerSelfTest.java         |     4 +-
 .../util/future/IgniteFutureImplTest.java       |     3 +-
 .../loadtests/cache/GridCacheBenchmark.java     |     2 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   203 +-
 .../loadtests/cache/GridCacheLoadTest.java      |     2 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |     2 +-
 .../GridContinuousOperationsLoadTest.java       |     9 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |    15 +-
 .../loadtests/dsi/GridDsiLifecycleBean.java     |     2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |     7 +-
 .../loadtests/hashmap/GridCacheTestContext.java |     2 +-
 .../ignite/loadtests/mapper/TestObject.java     |     2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    32 -
 .../discovery/AbstractDiscoverySelfTest.java    |     6 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |     4 +-
 .../ignite/testframework/junits/IgniteMock.java |    58 +-
 .../junits/spi/GridSpiAbstractTest.java         |     6 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |    13 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |     7 +
 .../client/hadoop/GridHadoopClientProtocol.java |     1 -
 .../counter/GridHadoopClientCounters.java       |     2 +-
 .../ignite/hadoop/GridHadoopDefaultJobInfo.java |   163 -
 .../apache/ignite/hadoop/GridHadoopSetup.java   |   506 -
 .../processors/hadoop/GridHadoopContext.java    |     1 -
 .../hadoop/GridHadoopDefaultJobInfo.java        |   162 +
 .../processors/hadoop/GridHadoopImpl.java       |     1 -
 .../processors/hadoop/GridHadoopSetup.java      |   506 +
 .../processors/hadoop/GridHadoopUtils.java      |     1 -
 .../hadoop/IgniteHadoopProcessor.java           |     1 -
 .../counter/GridHadoopCounterAdapter.java       |     2 +-
 .../hadoop/counter/GridHadoopCountersImpl.java  |     2 +-
 .../counter/GridHadoopFSCounterWriter.java      |     2 +-
 .../hadoop/counter/GridHadoopLongCounter.java   |     2 +-
 .../counter/GridHadoopPerformanceCounter.java   |     2 +-
 .../jobtracker/GridHadoopJobMetadata.java       |     4 +-
 .../hadoop/jobtracker/GridHadoopJobTracker.java |    48 +-
 .../planner/GridHadoopDefaultMapReducePlan.java |     2 +-
 .../GridHadoopDefaultMapReducePlanner.java      |     2 +-
 .../GridHadoopProtocolJobCountersTask.java      |     2 +-
 .../proto/GridHadoopProtocolJobStatusTask.java  |     2 +-
 .../proto/GridHadoopProtocolKillJobTask.java    |     2 +-
 .../proto/GridHadoopProtocolNextTaskIdTask.java |     2 +-
 .../proto/GridHadoopProtocolSubmitJobTask.java  |     4 +-
 .../proto/GridHadoopProtocolTaskAdapter.java    |     5 +-
 .../hadoop/shuffle/GridHadoopShuffle.java       |     1 -
 .../hadoop/shuffle/GridHadoopShuffleAck.java    |     2 +-
 .../hadoop/shuffle/GridHadoopShuffleJob.java    |     4 +-
 .../shuffle/GridHadoopShuffleMessage.java       |     2 +-
 .../GridHadoopConcurrentHashMultimap.java       |     2 +-
 .../collections/GridHadoopHashMultimap.java     |     2 +-
 .../collections/GridHadoopHashMultimapBase.java |     2 +-
 .../shuffle/collections/GridHadoopMultimap.java |     2 +-
 .../collections/GridHadoopMultimapBase.java     |     4 +-
 .../shuffle/collections/GridHadoopSkipList.java |     2 +-
 .../GridHadoopEmbeddedTaskExecutor.java         |     2 +-
 .../taskexecutor/GridHadoopExecutorService.java |     2 +-
 .../taskexecutor/GridHadoopRunnableTask.java    |     5 +-
 .../GridHadoopTaskExecutorAdapter.java          |     1 -
 .../taskexecutor/GridHadoopTaskStatus.java      |     2 +-
 .../GridHadoopExternalTaskExecutor.java         |     1 -
 .../GridHadoopJobInfoUpdateRequest.java         |     2 +-
 .../GridHadoopPrepareForJobRequest.java         |     2 +-
 .../GridHadoopTaskExecutionRequest.java         |     2 +-
 .../external/GridHadoopTaskFinishedMessage.java |     2 +-
 .../child/GridHadoopChildProcessRunner.java     |     4 +-
 .../hadoop/v1/GridHadoopV1CleanupTask.java      |     2 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |     1 -
 .../hadoop/v1/GridHadoopV1OutputCollector.java  |     2 +-
 .../hadoop/v1/GridHadoopV1Partitioner.java      |     2 +-
 .../hadoop/v1/GridHadoopV1ReduceTask.java       |     1 -
 .../hadoop/v1/GridHadoopV1Reporter.java         |     2 +-
 .../hadoop/v1/GridHadoopV1SetupTask.java        |     2 +-
 .../hadoop/v1/GridHadoopV1Splitter.java         |     1 -
 .../processors/hadoop/v1/GridHadoopV1Task.java  |     1 -
 .../hadoop/v2/GridHadoopExternalSplit.java      |     2 +-
 .../v2/GridHadoopSerializationWrapper.java      |     2 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |     2 +-
 .../hadoop/v2/GridHadoopV2CleanupTask.java      |     2 +-
 .../hadoop/v2/GridHadoopV2Context.java          |     1 -
 .../processors/hadoop/v2/GridHadoopV2Job.java   |     1 -
 .../v2/GridHadoopV2JobResourceManager.java      |     2 +-
 .../hadoop/v2/GridHadoopV2MapTask.java          |     2 +-
 .../hadoop/v2/GridHadoopV2Partitioner.java      |     2 +-
 .../hadoop/v2/GridHadoopV2ReduceTask.java       |     2 +-
 .../hadoop/v2/GridHadoopV2SetupTask.java        |     2 +-
 .../hadoop/v2/GridHadoopV2Splitter.java         |     1 -
 .../processors/hadoop/v2/GridHadoopV2Task.java  |     2 +-
 .../hadoop/v2/GridHadoopV2TaskContext.java      |     1 -
 .../v2/GridHadoopWritableSerialization.java     |     2 +-
 ...ridHadoopClientProtocolEmbeddedSelfTest.java |     2 +-
 .../hadoop/GridHadoopPopularWordsTest.java      |   294 -
 .../ignite/hadoop/GridHadoopTestUtils.java      |   102 -
 .../ignite/hadoop/books/alice-in-wonderland.txt |  3735 -----
 .../apache/ignite/hadoop/books/art-of-war.txt   |  6982 ---------
 .../ignite/hadoop/books/huckleberry-finn.txt    | 11733 ---------------
 .../ignite/hadoop/books/sherlock-holmes.txt     | 13052 -----------------
 .../apache/ignite/hadoop/books/tom-sawyer.txt   |  8858 -----------
 .../hadoop/GridHadoopAbstractSelfTest.java      |     1 -
 .../hadoop/GridHadoopCommandLineTest.java       |     1 -
 ...idHadoopDefaultMapReducePlannerSelfTest.java |     6 +-
 .../hadoop/GridHadoopGroupingTest.java          |     1 -
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |     1 -
 .../GridHadoopMapReduceEmbeddedSelfTest.java    |     1 -
 .../hadoop/GridHadoopMapReduceTest.java         |     1 -
 .../hadoop/GridHadoopPopularWordsTest.java      |   294 +
 .../GridHadoopSerializationWrapperSelfTest.java |     1 -
 .../hadoop/GridHadoopSortingExternalTest.java   |     2 -
 .../hadoop/GridHadoopSortingTest.java           |     1 -
 .../hadoop/GridHadoopTaskExecutionSelfTest.java |     2 +-
 .../hadoop/GridHadoopTasksAllVersionsTest.java  |     1 -
 .../hadoop/GridHadoopTasksV1Test.java           |     1 -
 .../hadoop/GridHadoopTasksV2Test.java           |     1 -
 .../GridHadoopTestRoundRobinMrPlanner.java      |     1 -
 .../hadoop/GridHadoopTestTaskContext.java       |     1 -
 .../processors/hadoop/GridHadoopTestUtils.java  |   102 +
 .../hadoop/GridHadoopV2JobSelfTest.java         |     1 -
 .../hadoop/books/alice-in-wonderland.txt        |  3735 +++++
 .../processors/hadoop/books/art-of-war.txt      |  6982 +++++++++
 .../hadoop/books/huckleberry-finn.txt           | 11733 +++++++++++++++
 .../processors/hadoop/books/sherlock-holmes.txt | 13052 +++++++++++++++++
 .../processors/hadoop/books/tom-sawyer.txt      |  8858 +++++++++++
 .../collections/GridHadoopAbstractMapTest.java  |     2 +-
 ...ridHadoopConcurrentHashMultimapSelftest.java |     2 +-
 .../collections/GridHadoopHashMapSelfTest.java  |     2 +-
 .../collections/GridHadoopSkipListSelfTest.java |     2 +-
 ...GridHadoopExternalTaskExecutionSelfTest.java |     1 -
 .../GridHibernateAccessStrategyAdapter.java     |     4 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |     2 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |     2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |     2 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   134 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |     4 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |    13 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    12 +-
 .../cache/GridCacheQueryTestValue.java          |     2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |     2 +-
 .../GridCacheReplicatedQuerySelfTest.java       |     2 +-
 .../http/jetty/GridJettyRestHandler.java        |    23 +-
 .../tests/ScalarAffinityRoutingSpec.scala       |     5 +-
 .../processors/schedule/ScheduleFutureImpl.java |    16 +-
 modules/schema-load/pom.xml                     |   107 +
 .../main/java/media/data_connection_48x48.png   |   Bin 0 -> 4443 bytes
 .../src/main/java/media/error_48x48.png         |   Bin 0 -> 4349 bytes
 .../src/main/java/media/ignite_128x128.png      |   Bin 0 -> 4917 bytes
 .../src/main/java/media/ignite_16x16.png        |   Bin 0 -> 608 bytes
 .../src/main/java/media/ignite_24x24.png        |   Bin 0 -> 930 bytes
 .../src/main/java/media/ignite_32x32.png        |   Bin 0 -> 1203 bytes
 .../src/main/java/media/ignite_48x48.png        |   Bin 0 -> 1868 bytes
 .../src/main/java/media/ignite_64x64.png        |   Bin 0 -> 2453 bytes
 .../src/main/java/media/information_48x48.png   |   Bin 0 -> 4102 bytes
 .../src/main/java/media/question_48x48.png      |   Bin 0 -> 3857 bytes
 .../src/main/java/media/sign_warning_48x48.png  |   Bin 0 -> 2988 bytes
 .../schema-load/src/main/java/media/style.css   |    95 +
 .../src/main/java/media/text_tree_48x48.png     |   Bin 0 -> 2567 bytes
 .../ignite/schema/generator/PojoGenerator.java  |   415 +
 .../ignite/schema/generator/XmlGenerator.java   |   341 +
 .../ignite/schema/model/PojoDescriptor.java     |   508 +
 .../apache/ignite/schema/model/PojoField.java   |   421 +
 .../schema/parser/DatabaseMetadataParser.java   |   105 +
 .../apache/ignite/schema/parser/DbColumn.java   |    76 +
 .../apache/ignite/schema/parser/DbTable.java    |   105 +
 .../parser/dialect/DB2MetadataDialect.java      |    30 +
 .../parser/dialect/DatabaseMetadataDialect.java |    78 +
 .../parser/dialect/JdbcMetadataDialect.java     |   144 +
 .../parser/dialect/OracleMetadataDialect.java   |   257 +
 .../ignite/schema/ui/ConfirmCallable.java       |    81 +
 .../org/apache/ignite/schema/ui/Controls.java   |   661 +
 .../org/apache/ignite/schema/ui/GridPaneEx.java |   177 +
 .../org/apache/ignite/schema/ui/MessageBox.java |   233 +
 .../apache/ignite/schema/ui/ModalDialog.java    |    50 +
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |  1395 ++
 .../ignite/schema/ui/TextColumnValidator.java   |    32 +
 .../schema/load/AbstractSchemaLoaderTest.java   |   134 +
 .../load/generator/PojoGeneratorTest.java       |    70 +
 .../schema/load/generator/XmlGeneratorTest.java |    50 +
 .../apache/ignite/schema/load/model/Ignite.xml  |   321 +
 .../apache/ignite/schema/load/model/Objects.txt |   502 +
 .../ignite/schema/load/model/ObjectsKey.txt     |    96 +
 .../ignite/schema/load/model/Primitives.txt     |   506 +
 .../ignite/schema/load/model/PrimitivesKey.txt  |    96 +
 .../load/parser/DbMetadataParserTest.java       |   118 +
 .../testsuites/IgniteSchemaLoadTestSuite.java   |    41 +
 .../org/apache/ignite/IgniteSpringBean.java     |    77 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |     4 +-
 .../config/benchmark-multicast.properties       |    74 +
 .../yardstick/config/benchmark-store.properties |    69 +
 modules/yardstick/config/benchmark.properties   |    70 +-
 .../yardstick/config/ignite-store-config.xml    |   203 +
 .../ignite/yardstick/cache/model/SampleKey.java |    88 +
 .../yardstick/cache/model/SampleValue.java      |     9 +-
 .../jdbc/IgniteJdbcStoreAbstractBenchmark.java  |    44 +
 .../store/jdbc/IgniteJdbcStoreGetBenchmark.java |    53 +
 .../store/jdbc/IgniteJdbcStorePutBenchmark.java |    42 +
 .../jdbc/IgniteJdbcStorePutGetBenchmark.java    |    47 +
 pom.xml                                         |     7 +-
 640 files changed, 78369 insertions(+), 64799 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/config/hadoop/default-config.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index c0e3151,0b59564..3ae60cd
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@@ -1386,13 -1409,13 +1409,13 @@@ public interface CacheProjection<K, V> 
  
      /**
       * Clears cache on all nodes that store it's data. That is, caches are cleared on remote
-      * nodes and local node, as opposed to {@link CacheProjection#clearAll()} method which only
+      * nodes and local node, as opposed to {@link CacheProjection#clearLocally()} method which only
       * clears local node's cache.
       * <p>
-      * Ignite will make the best attempt to clear caches on all nodes. If some caches
 -     * GridGain will make the best attempt to clearLocally caches on all nodes. If some caches
++     * Ignite will make the best attempt to clearLocally caches on all nodes. If some caches
       * could not be cleared, then exception will be thrown.
       *
-      * @param timeout Timeout for clear all task in milliseconds (0 for never).
+      * @param timeout Timeout for clearLocally all task in milliseconds (0 for never).
       *      Set it to larger value for large caches.
       * @throws IgniteCheckedException In case of cache could not be cleared on any of the nodes.
       */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuerySqlField.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlField.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/events/IgniteEventType.java
----------------------------------------------------------------------

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index f6b9431,0000000..eab6b37
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@@ -1,145 -1,0 +1,141 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.ignite.internal;
 +
 +/**
 + * This class defines constants (NOT enums) for <b>internally-used</b> node attributes.
 + */
 +public final class IgniteNodeAttributes {
 +    /** Prefix for internally reserved attribute names. */
 +    public static final String ATTR_PREFIX = "org.apache.ignite";
 +
 +    /** Node compound version. */
 +    public static final String ATTR_BUILD_VER = ATTR_PREFIX + ".build.ver";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_BUILD_DATE = ATTR_PREFIX + ".build.date";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_COMPATIBLE_VERS = ATTR_PREFIX + ".compatible.vers";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_MARSHALLER = ATTR_PREFIX + ".marshaller";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_JIT_NAME = ATTR_PREFIX + ".jit.name";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_LANG_RUNTIME = ATTR_PREFIX + ".lang.rt";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_USER_NAME = ATTR_PREFIX + ".user.name";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_GRID_NAME = ATTR_PREFIX + ".ignite.name";
 +
 +    /** Deployment mode. */
 +    public static final String ATTR_DEPLOYMENT_MODE = ATTR_PREFIX + ".ignite.dep.mode";
 +
 +    /** Peer classloading enabled flag. */
 +    public static final String ATTR_PEER_CLASSLOADING = ATTR_PREFIX + ".peer.classloading.enabled";
 +
 +    /** Internal attribute name postfix constant. */
 +    public static final String ATTR_SPI_CLASS = ATTR_PREFIX + ".spi.class";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_CACHE = ATTR_PREFIX + ".cache";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
 +
 +    /** Internal attribute name constant. */
-     @Deprecated
-     public static final String ATTR_CACHE_PORTABLE = ATTR_PREFIX + ".cache.portable";
- 
-     /** Internal attribute name constant. */
 +    public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_DAEMON = ATTR_PREFIX + ".daemon";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_JMX_PORT = ATTR_PREFIX + ".jmx.port";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_RESTART_ENABLED = ATTR_PREFIX + ".restart.enabled";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_REST_TCP_ADDRS = ATTR_PREFIX + ".rest.tcp.addrs";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_REST_TCP_HOST_NAMES = ATTR_PREFIX + ".rest.tcp.host.names";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_REST_TCP_PORT = ATTR_PREFIX + ".rest.tcp.port";
 +
 +    /** Internal attribute name constant */
 +    public static final String ATTR_REST_PORT_RANGE = ATTR_PREFIX + ".rest.port.range";
 +
 +    /** Internal attribute name constant */
 +    public static final String ATTR_REST_JETTY_ADDRS = ATTR_PREFIX + ".rest.jetty.addrs";
 +
 +    /** Internal attribute name constant */
 +    public static final String ATTR_REST_JETTY_HOST_NAMES = ATTR_PREFIX + ".rest.jetty.host.names";
 +
 +    /** Internal attribute name constant */
 +    public static final String ATTR_REST_JETTY_PORT = ATTR_PREFIX + ".rest.jetty.port";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_IPS = ATTR_PREFIX + ".ips";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_MACS = ATTR_PREFIX + ".macs";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_PHY_RAM = ATTR_PREFIX + ".phy.ram";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_JVM_PID = ATTR_PREFIX + ".jvm.pid";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_JVM_ARGS = ATTR_PREFIX + ".jvm.args";
 +
 +    /** Internal attribute name constant. */
 +    public static final String ATTR_STREAMER = ATTR_PREFIX + ".streamer";
 +
 +    /** Time server host attribute name. */
 +    public static final String ATTR_TIME_SERVER_HOST = ATTR_PREFIX + ".time.host";
 +
 +    /** Time server port attribute name. */
 +    public static final String ATTR_TIME_SERVER_PORT = ATTR_PREFIX + ".time.port";
 +
 +    /** Security credentials attribute name. Attribute is not available via public API. */
 +    public static final String ATTR_SECURITY_CREDENTIALS = ATTR_PREFIX + ".security.cred";
 +
 +    /** Security subject for authenticated node. */
 +    public static final String ATTR_SECURITY_SUBJECT = ATTR_PREFIX + ".security.subject";
 +
 +    /** Cache interceptors. */
 +    public static final String ATTR_CACHE_INTERCEPTORS = ATTR_PREFIX + ".cache.interceptors";
 +
 +    /**
 +     * Enforces singleton.
 +     */
 +    private IgniteNodeAttributes() {
 +        /* No-op. */
 +    }
 +}

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 43de1f9,f4e51db..b340a37
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@@ -49,8 -49,8 +49,8 @@@ import static org.apache.ignite.cache.C
  import static org.apache.ignite.cache.CacheMode.*;
  import static org.apache.ignite.cache.CachePreloadMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
- import static org.apache.ignite.cache.GridCachePeekMode.*;
+ import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 -import static org.apache.ignite.internal.GridNodeAttributes.*;
 +import static org.apache.ignite.internal.IgniteNodeAttributes.*;
  import static org.apache.ignite.internal.GridTopic.*;
  import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoop.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoop.java
index 0000000,246c4ed..c262d48
mode 000000,100644..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoop.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoop.java
@@@ -1,0 -1,86 +1,86 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.ignite.internal.processors.hadoop;
+ 
+ import org.apache.ignite.*;
+ import org.apache.ignite.internal.*;
+ import org.jetbrains.annotations.*;
+ 
+ /**
 - * Hadoop facade providing access to GridGain Hadoop features.
++ * Hadoop facade providing access to Ignite Hadoop features.
+  */
+ public interface GridHadoop {
+     /**
+      * Gets Hadoop module configuration.
+      *
+      * @return Hadoop module configuration.
+      */
+     public GridHadoopConfiguration configuration();
+ 
+     /**
+      * Generate next job ID.
+      *
+      * @return Next job ID.
+      */
+     public GridHadoopJobId nextJobId();
+ 
+     /**
+      * Submits job to job tracker.
+      *
+      * @param jobId Job ID to submit.
+      * @param jobInfo Job info to submit.
+      * @return Execution future.
+      */
+     public IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo);
+ 
+     /**
+      * Gets Hadoop job execution status.
+      *
+      * @param jobId Job ID to get status for.
+      * @return Job execution status or {@code null} in case job with the given ID is not found.
+      * @throws IgniteCheckedException If failed.
+      */
+     @Nullable public GridHadoopJobStatus status(GridHadoopJobId jobId) throws IgniteCheckedException;
+ 
+     /**
+      * Returns job counters.
+      *
+      * @param jobId Job ID to get counters for.
+      * @return Job counters object.
+      * @throws IgniteCheckedException If failed.
+      */
+     public GridHadoopCounters counters(GridHadoopJobId jobId) throws IgniteCheckedException;
+ 
+     /**
+      * Gets Hadoop finish future for particular job.
+      *
+      * @param jobId Job ID.
+      * @return Job finish future or {@code null} in case job with the given ID is not found.
+      * @throws IgniteCheckedException If failed.
+      */
+     @Nullable public IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException;
+ 
+     /**
+      * Kills job.
+      *
+      * @param jobId Job ID.
+      * @return {@code True} if job was killed.
+      * @throws IgniteCheckedException If failed.
+      */
+     public boolean kill(GridHadoopJobId jobId) throws IgniteCheckedException;
+ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJob.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJob.java
index 0000000,a1ec9a8..f7ea105
mode 000000,100644..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJob.java
@@@ -1,0 -1,102 +1,102 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.ignite.internal.processors.hadoop;
+ 
+ import org.apache.ignite.*;
+ 
+ import java.util.*;
+ 
+ /**
+  * Hadoop job.
+  */
+ public interface GridHadoopJob {
+     /**
+      * Gets job ID.
+      *
+      * @return Job ID.
+      */
+     public GridHadoopJobId id();
+ 
+     /**
+      * Gets job information.
+      *
+      * @return Job information.
+      */
+     public GridHadoopJobInfo info();
+ 
+     /**
+      * Gets collection of input splits for this job.
+      *
+      * @return Input splits.
+      */
+     public Collection<GridHadoopInputSplit> input() throws IgniteCheckedException;
+ 
+     /**
+      * Returns context for task execution.
+      *
+      * @param info Task info.
+      * @return Task Context.
+      * @throws IgniteCheckedException If failed.
+      */
+     public GridHadoopTaskContext getTaskContext(GridHadoopTaskInfo info) throws IgniteCheckedException;
+ 
+     /**
+      * Does all the needed initialization for the job. Will be called on each node where tasks for this job must
+      * be executed.
+      * <p>
 -     * If job is running in external mode this method will be called on instance in GridGain node with parameter
++     * If job is running in external mode this method will be called on instance in Ignite node with parameter
+      * {@code false} and on instance in external process with parameter {@code true}.
+      *
+      * @param external If {@code true} then this job instance resides in external process.
+      * @param locNodeId Local node ID.
+      * @throws IgniteCheckedException If failed.
+      */
+     public void initialize(boolean external, UUID locNodeId) throws IgniteCheckedException;
+ 
+     /**
+      * Release all the resources.
+      * <p>
 -     * If job is running in external mode this method will be called on instance in GridGain node with parameter
++     * If job is running in external mode this method will be called on instance in Ignite node with parameter
+      * {@code false} and on instance in external process with parameter {@code true}.
+      *
+      * @param external If {@code true} then this job instance resides in external process.
+      * @throws IgniteCheckedException If failed.
+      */
+     public void dispose(boolean external) throws IgniteCheckedException;
+ 
+     /**
+      * Prepare local environment for the task.
+      *
+      * @param info Task info.
+      * @throws IgniteCheckedException If failed.
+      */
+     public void prepareTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException;
+ 
+     /**
+      * Cleans up local environment of the task.
+      *
+      * @param info Task info.
+      * @throws IgniteCheckedException If failed.
+      */
+     public void cleanupTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException;
+ 
+     /**
+      * Cleans up the job staging directory.
+      */
+     void cleanupStagingDirectory();
+ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
index 0000000,f324645..18f422b
mode 000000,100644..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
@@@ -1,0 -1,138 +1,138 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.ignite.internal.processors.hadoop;
+ 
+ import org.jetbrains.annotations.*;
+ 
+ /**
 - * Enumeration of optional properties supported by GridGain for Apache Hadoop.
++ * Enumeration of optional properties supported by Ignite for Apache Hadoop.
+  */
+ public enum GridHadoopJobProperty {
+     /**
+      * Initial size for hashmap which stores output of mapper and will be used as input of combiner.
+      * <p>
+      * Setting it right allows to avoid rehashing.
+      */
+     COMBINER_HASHMAP_SIZE,
+ 
+     /**
+      * Initial size for hashmap which stores output of mapper or combiner and will be used as input of reducer.
+      * <p>
+      * Setting it right allows to avoid rehashing.
+      */
+     PARTITION_HASHMAP_SIZE,
+ 
+     /**
+      * Specifies number of concurrently running mappers for external execution mode.
+      * <p>
+      * If not specified, defaults to {@code Runtime.getRuntime().availableProcessors()}.
+      */
+     EXTERNAL_CONCURRENT_MAPPERS,
+ 
+     /**
+      * Specifies number of concurrently running reducers for external execution mode.
+      * <p>
+      * If not specified, defaults to {@code Runtime.getRuntime().availableProcessors()}.
+      */
+     EXTERNAL_CONCURRENT_REDUCERS,
+ 
+     /**
 -     * Delay in milliseconds after which GridGain server will reply job status.
++     * Delay in milliseconds after which Ignite server will reply job status.
+      */
+     JOB_STATUS_POLL_DELAY,
+ 
+     /**
+      * Size in bytes of single memory page which will be allocated for data structures in shuffle.
+      * <p>
+      * By default is {@code 32 * 1024}.
+      */
+     SHUFFLE_OFFHEAP_PAGE_SIZE,
+ 
+     /**
+      * If set to {@code true} then input for combiner will not be sorted by key.
+      * Internally hash-map will be used instead of sorted one, so {@link Object#equals(Object)}
+      * and {@link Object#hashCode()} methods of key must be implemented consistently with
+      * comparator for that type. Grouping comparator is not supported if this setting is {@code true}.
+      * <p>
+      * By default is {@code false}.
+      */
+     SHUFFLE_COMBINER_NO_SORTING,
+ 
+     /**
+      * If set to {@code true} then input for reducer will not be sorted by key.
+      * Internally hash-map will be used instead of sorted one, so {@link Object#equals(Object)}
+      * and {@link Object#hashCode()} methods of key must be implemented consistently with
+      * comparator for that type. Grouping comparator is not supported if this setting is {@code true}.
+      * <p>
+      * By default is {@code false}.
+      */
+     SHUFFLE_REDUCER_NO_SORTING;
+ 
+     /** */
+     private final String ptyName;
+ 
+     /**
+      *
+      */
+     GridHadoopJobProperty() {
+         ptyName = "gridgain." + name().toLowerCase().replace('_', '.');
+     }
+ 
+     /**
+      * @return Property name.
+      */
+     public String propertyName() {
+         return ptyName;
+     }
+ 
+     /**
+      * @param jobInfo Job info.
+      * @param pty Property.
+      * @param dflt Default value.
+      * @return Property value.
+      */
+     public static String get(GridHadoopJobInfo jobInfo, GridHadoopJobProperty pty, @Nullable String dflt) {
+         String res = jobInfo.property(pty.propertyName());
+ 
+         return res == null ? dflt : res;
+     }
+ 
+     /**
+      * @param jobInfo Job info.
+      * @param pty Property.
+      * @param dflt Default value.
+      * @return Property value.
+      */
+     public static int get(GridHadoopJobInfo jobInfo, GridHadoopJobProperty pty, int dflt) {
+         String res = jobInfo.property(pty.propertyName());
+ 
+         return res == null ? dflt : Integer.parseInt(res);
+     }
+ 
+     /**
+      * @param jobInfo Job info.
+      * @param pty Property.
+      * @param dflt Default value.
+      * @return Property value.
+      */
+     public static boolean get(GridHadoopJobInfo jobInfo, GridHadoopJobProperty pty, boolean dflt) {
+         String res = jobInfo.property(pty.propertyName());
+ 
+         return res == null ? dflt : Boolean.parseBoolean(res);
+     }
+ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8446c4b7/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
index 06f64ea,0000000..3ff933a
mode 100644,000000..100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
@@@ -1,496 -1,0 +1,496 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.ignite.spi.discovery;
 +
 +import mx4j.tools.adaptor.http.*;
 +import org.apache.ignite.cluster.*;
 +import org.apache.ignite.internal.managers.security.*;
 +import org.apache.ignite.internal.util.typedef.internal.*;
 +import org.apache.ignite.marshaller.*;
 +import org.apache.ignite.plugin.security.*;
 +import org.apache.ignite.spi.*;
 +import org.apache.ignite.testframework.config.*;
 +import org.apache.ignite.testframework.junits.*;
 +import org.apache.ignite.testframework.junits.spi.*;
 +
 +import javax.management.*;
 +import java.io.*;
 +import java.util.*;
 +import java.util.concurrent.atomic.*;
 +
 +import static org.apache.ignite.events.IgniteEventType.*;
 +import static org.apache.ignite.lang.IgniteProductVersion.*;
 +
 +/**
 + * Base discovery self-test class.
 + * @param <T> SPI implementation class.
 + */
 +@SuppressWarnings({"JUnitAbstractTestClassNamingConvention"})
 +public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends GridSpiAbstractTest<T> {
 +    /** */
 +    private static final List<DiscoverySpi> spis = new ArrayList<>();
 +
 +    /** */
 +    private static final Collection<IgniteTestResources> spiRsrcs = new ArrayList<>();
 +
 +    /** */
 +    private static long spiStartTime;
 +
 +    /** */
 +    private static final Object mux = new Object();
 +
 +    /** */
 +    private static final String TEST_ATTRIBUTE_NAME = "test.node.prop";
 +
 +    /** */
 +    protected AbstractDiscoverySelfTest() {
 +        super(false);
 +    }
 +
 +    /**
 +     * Checks that each started discovery spi found all other SPI's.
 +     * @throws Exception If failed.
 +     */
 +    @SuppressWarnings({"UnconditionalWait"})
 +    public void testDiscovery() throws Exception {
 +        assert spis.size() > 1;
 +        assert spiStartTime > 0;
 +        assert spiRsrcs.size() == getSpiCount();
 +
 +        boolean isAllDiscovered = false;
 +
 +        while (!isAllDiscovered) {
 +            for (DiscoverySpi spi : spis) {
 +                if (spi.getRemoteNodes().size() < (getSpiCount() - 1)) {
 +                    isAllDiscovered = false;
 +
 +                    break;
 +                }
 +
 +                isAllDiscovered = true;
 +
 +                for (IgniteTestResources rscrs : spiRsrcs) {
 +                    UUID nodeId = rscrs.getNodeId();
 +
 +                    if (!nodeId.equals(spi.getLocalNode().id())) {
 +                        if (!isContainsNodeId(spi.getRemoteNodes(), nodeId)) {
 +                            isAllDiscovered = false;
 +
 +                            break;
 +                        }
 +                    }
 +                }
 +            }
 +
 +            if (isAllDiscovered)
 +                info("All nodes discovered.");
 +            else {
 +                if (System.currentTimeMillis() > spiStartTime + getMaxDiscoveryTime()) {
 +                    for (int i = 0; i < getSpiCount(); i++) {
 +                        DiscoverySpi spi = spis.get(i);
 +
 +                        info("Remote nodes [spiIdx=" + i + ", nodes=" + spi.getRemoteNodes() + ']');
 +                    }
 +
 +                    fail("Nodes were not discovered.");
 +                }
 +                else {
 +                    synchronized (mux) {
 +                        mux.wait(getMaxDiscoveryTime());
 +                    }
 +                }
 +            }
 +        }
 +    }
 +
 +    /** */
 +    private static class DiscoveryListener implements DiscoverySpiListener {
 +        /** * */
 +        private boolean isMetricsUpdate;
 +
 +        /**
 +         *
 +         *
 +         * @return Metrics updates.
 +         */
 +        public boolean isMetricsUpdated() {
 +            return isMetricsUpdate;
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override public void onDiscovery(int type, long topVer, ClusterNode node, Collection<ClusterNode> topSnapshot,
 +            Map<Long, Collection<ClusterNode>> topHist) {
 +            if (type == EVT_NODE_METRICS_UPDATED)
 +                isMetricsUpdate = true;
 +        }
 +    }
 +
 +    /**
 +     * @throws Exception If failed.
 +     */
 +    @SuppressWarnings({"UnconditionalWait"})
 +    public void testMetrics() throws Exception {
 +        Collection<DiscoveryListener> listeners = new ArrayList<>();
 +
 +        long metricsStartTime = System.currentTimeMillis();
 +
 +        for (DiscoverySpi spi : spis) {
 +            DiscoveryListener metricsUpdateLsnr = new DiscoveryListener();
 +
 +            spi.setListener(metricsUpdateLsnr);
 +
 +            listeners.add(metricsUpdateLsnr);
 +        }
 +
 +        boolean isAllSpiMetricUpdated = false;
 +
 +        while (!isAllSpiMetricUpdated) {
 +            isAllSpiMetricUpdated = true;
 +
 +            for (DiscoveryListener lsnr : listeners) {
 +                if (!lsnr.isMetricsUpdated()) {
 +                    isAllSpiMetricUpdated = false;
 +
 +                    break;
 +                }
 +            }
 +
 +            if (isAllSpiMetricUpdated)
 +                info("All SPI metrics updated.");
 +            else {
 +                if (System.currentTimeMillis() > metricsStartTime + getMaxMetricsWaitTime()) {
 +                    for (int i = 0; i < getSpiCount(); i++) {
 +                        DiscoverySpi spi = spis.get(i);
 +
 +                        info("Remote nodes [spiIdx=" + i + ", nodes=" + spi.getRemoteNodes() + ']');
 +                    }
 +
 +                    fail("SPI Metrics not updated.");
 +                }
 +                else {
 +                    synchronized (mux) {
 +                        mux.wait(getMaxMetricsWaitTime());
 +                    }
 +                }
 +            }
 +        }
 +    }
 +
 +    /**
 +     * Tests whether local node heartbeats cause METRICS_UPDATE event.
 +     *
 +     * @throws Exception If test failed.
 +     */
 +    public void testLocalHeartbeat() throws Exception {
 +        AtomicInteger[] locUpdCnts = new AtomicInteger[getSpiCount()];
 +
 +        int i = 0;
 +
 +        for (final DiscoverySpi spi : spis) {
 +            final AtomicInteger spiCnt = new AtomicInteger(0);
 +
 +            DiscoverySpiListener locHeartbeatLsnr = new DiscoverySpiListener() {
 +                @Override public void onDiscovery(int type, long topVer, ClusterNode node,
 +                    Collection<ClusterNode> topSnapshot, Map<Long, Collection<ClusterNode>> topHist) {
 +                    // If METRICS_UPDATED came from local node
 +                    if (type == EVT_NODE_METRICS_UPDATED
 +                        && node.id().equals(spi.getLocalNode().id()))
 +                        spiCnt.addAndGet(1);
 +                }
 +            };
 +
 +            locUpdCnts[i] = spiCnt;
 +
 +            spi.setListener(locHeartbeatLsnr);
 +
 +            i++;
 +        }
 +
 +        // Sleep fro 3 Heartbeats.
 +        Thread.sleep(getMaxDiscoveryTime() * 3);
 +
 +        for (AtomicInteger cnt : locUpdCnts) {
 +            assert cnt.get() > 1 : "One of the SPIs did not get at least 2 METRICS_UPDATE events from local node";
 +        }
 +    }
 +
 +    /**
 +     * @param nodes Nodes iterator.
 +     * @param nodeId Node UUID.
 +     * @return {@code true} if provided iterator contains node with provided UUID.
 +     */
 +    private boolean isContainsNodeId(Iterable<ClusterNode> nodes, UUID nodeId) {
 +        for (ClusterNode node : nodes) {
 +            assert node.id() != null;
 +
 +            if (node.id().equals(nodeId))
 +                return true;
 +        }
 +
 +        return false;
 +    }
 +
 +    /**
 +     * Checks that physical address of local node is equal to local.ip property.
 +     */
 +    public void testLocalNode() {
 +        for (DiscoverySpi spi : spis) {
 +            ClusterNode loc = spi.getLocalNode();
 +
 +            Collection<ClusterNode> rmt = spi.getRemoteNodes();
 +
 +            assert !rmt.contains(loc);
 +        }
 +    }
 +
 +    /**
 +     * Check that "test.node.prop" is present on all nodes.
 +     */
 +    public void testNodeAttributes() {
 +        for (DiscoverySpi spi : spis) {
 +            assert !spi.getRemoteNodes().isEmpty() : "No remote nodes found in Spi.";
 +
 +            Collection<UUID> nodeIds = new HashSet<>();
 +
 +            for (IgniteTestResources rsrc : spiRsrcs) {
 +                nodeIds.add(rsrc.getNodeId());
 +            }
 +
 +            for (ClusterNode node : spi.getRemoteNodes()) {
 +                if (nodeIds.contains(node.id())) {
 +                    Serializable attr = node.attribute(TEST_ATTRIBUTE_NAME);
 +
 +                    if (attr == null || !(attr instanceof String)) {
 +                        fail("Node does not contains attribute [attr=" + TEST_ATTRIBUTE_NAME + ", nodeId=" +
 +                            node.id() + ", spiIdx=" + spis.indexOf(spi) + ']');
 +                    }
 +                    else if (!"true".equals(attr)) {
 +                        fail("Attribute value is wrong [attr=" + TEST_ATTRIBUTE_NAME + ", value=" + attr + ", nodeId=" +
 +                            node.id() + ", spiIdx=" + spis.indexOf(spi) + ']');
 +                    }
 +                    else {
 +                        info("Node contains attribute [attr=" + TEST_ATTRIBUTE_NAME + ", value=" + attr + ", nodeId=" +
 +                            node.id() + ", spiIdx=" + spis.indexOf(spi) + ']');
 +                    }
 +                }
 +                else
 +                    error("Discovered unknown node [node=" + node + ", spiIdx=" + spis.indexOf(spi) + ']');
 +            }
 +        }
 +    }
 +
 +    /**
 +     * Checks that each spi can pings all other.
 +     */
 +    public void testPing() {
 +        for (DiscoverySpi spi : spis) {
 +            for (IgniteTestResources rscrs : spiRsrcs) {
 +                UUID nodeId = rscrs.getNodeId();
 +
 +                if (spi.pingNode(nodeId))
 +                    info("Ping node success [nodeId=" + nodeId + ", spiIdx=" + spis.indexOf(spi) + ']');
 +                else
 +                    fail("Ping node error [nodeId=" + nodeId + ", spiIdx=" + spis.indexOf(spi) + ']');
 +            }
 +        }
 +    }
 +
 +    /**
 +     * Checks that node serializable.
 +     *
 +     * @throws Exception If failed.
 +     */
 +    public void testNodeSerialize() throws Exception {
 +        for (DiscoverySpi spi : spis) {
 +            ClusterNode node = spi.getLocalNode();
 +
 +            assert node != null;
 +
 +            writeObject(node);
 +
 +            info("Serialize node success [nodeId=" + node.id() + ", spiIdx=" + spis.indexOf(spi) + ']');
 +        }
 +    }
 +
 +    /**
 +     * @param idx Index.
 +     * @return Discovery SPI.
 +     */
 +    protected abstract DiscoverySpi getSpi(int idx);
 +
 +    /**
 +     * @return SPI count.
 +     */
 +    protected int getSpiCount() {
 +        return 2;
 +    }
 +
 +    /**
 +     * @return Maximum discovery time.
 +     */
 +    protected long getMaxDiscoveryTime() {
 +        return 10000;
 +    }
 +
 +    /**
 +     * @return Maximum metrics wait time.
 +     */
 +    protected long getMaxMetricsWaitTime() {
 +        return getMaxDiscoveryTime();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override protected void beforeTestsStarted() throws Exception {
 +        try {
 +            for (int i = 0; i < getSpiCount(); i++) {
 +                DiscoverySpi spi = getSpi(i);
 +
 +                IgniteTestResources rsrcMgr = new IgniteTestResources(getMBeanServer(i));
 +
 +                rsrcMgr.inject(spi);
 +
 +                spi.setNodeAttributes(Collections.<String, Object>singletonMap(TEST_ATTRIBUTE_NAME, "true"),
 +                    fromString("99.99.99"));
 +
 +                spi.setListener(new DiscoverySpiListener() {
 +                    @SuppressWarnings({"NakedNotify"})
 +                    @Override public void onDiscovery(int type, long topVer, ClusterNode node,
 +                        Collection<ClusterNode> topSnapshot, Map<Long, Collection<ClusterNode>> topHist) {
 +                        info("Discovery event [type=" + type + ", node=" + node + ']');
 +
 +                        synchronized (mux) {
 +                            mux.notifyAll();
 +                        }
 +                    }
 +                });
 +
 +                spi.setDataExchange(new DiscoverySpiDataExchange() {
-                     @Override public List<Object> collect(UUID nodeId) {
-                         return new LinkedList<>();
++                    @Override public Map<Integer, Object> collect(UUID nodeId) {
++                        return new HashMap<Integer, Object>();
 +                    }
 +
-                     @Override public void onExchange(List<Object> data) {
++                    @Override public void onExchange(Map<Integer, Object> data) {
 +                        // No-op.
 +                    }
 +                });
 +
 +                spi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
 +                    @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
 +                        GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
 +                            GridSecuritySubjectType.REMOTE_NODE, n.id());
 +
 +                        subj.permissions(new GridAllowAllPermissionSet());
 +
 +                        return new GridSecurityContext(subj);
 +                    }
 +
 +                    @Override public boolean isGlobalNodeAuthentication() {
 +                        return false;
 +                    }
 +                });
 +
 +
 +                spi.spiStart(getTestGridName() + i);
 +
 +                spis.add(spi);
 +
 +                spiRsrcs.add(rsrcMgr);
 +
 +                // Force to use test context instead of default dummy context.
 +                spi.onContextInitialized(initSpiContext());
 +            }
 +        }
 +        catch (Throwable e) {
 +            e.printStackTrace();
 +        }
 +
 +        spiStartTime = System.currentTimeMillis();
 +    }
 +
 +    /**
 +     * @param idx Index.
 +     * @return MBean server.
 +     * @throws Exception If failed.
 +     */
 +    private MBeanServer getMBeanServer(int idx) throws Exception {
 +        HttpAdaptor adaptor = new HttpAdaptor();
 +
 +        MBeanServer srv = MBeanServerFactory.createMBeanServer();
 +
 +        adaptor.setPort(Integer.valueOf(GridTestProperties.getProperty("discovery.mbeanserver.selftest.baseport")) +
 +            idx);
 +
 +        srv.registerMBean(adaptor, new ObjectName("mbeanAdaptor:protocol=HTTP"));
 +
 +        adaptor.start();
 +
 +        return srv;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override protected void afterTestsStopped() throws Exception {
 +        assert spis.size() > 1;
 +        assert spis.size() == spiRsrcs.size();
 +
 +        for (DiscoverySpi spi : spis) {
 +            spi.setListener(null);
 +
 +            spi.spiStop();
 +        }
 +
 +        for (IgniteTestResources rscrs : spiRsrcs) {
 +            rscrs.stopThreads();
 +        }
 +
 +        // Clear.
 +        spis.clear();
 +        spiRsrcs.clear();
 +
 +        spiStartTime = 0;
 +
 +        tearDown();
 +    }
 +
 +    /**
 +     * @param node Grid node.
 +     * @throws IOException If write failed.
 +     */
 +    private void writeObject(ClusterNode node) throws Exception {
 +
 +        IgniteMarshaller marshaller = getTestResources().getMarshaller();
 +
 +        OutputStream out = new NullOutputStream();
 +
 +        try {
 +            marshaller.marshal(node, out);
 +        }
 +        finally {
 +            U.close(out, null);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class NullOutputStream extends OutputStream {
 +        /** {@inheritDoc} */
 +        @Override public void write(int b) throws IOException {
 +            // No-op
 +        }
 +    }
 +}


Mime
View raw message