ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Date Wed, 18 Mar 2015 04:45:03 GMT
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests

Conflicts:
	examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
	modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
	modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
	modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
	modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
	modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
	modules/yardstick/config/ignite-base-config.xml


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

Branch: refs/heads/ignite-496
Commit: 8c4e3222a0fa228d246da6f6f95a7e72d59b6529
Parents: 2933a78 d8c0766
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Fri Mar 13 04:23:27 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Fri Mar 13 04:23:27 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   23 +
 LICENSE.txt                                     |   54 +-
 NOTICE.txt                                      |   11 +
 RELEASE_NOTES.txt                               |    0
 assembly/dependencies-optional-fabric.xml       |    2 +-
 assembly/dependencies-optional-hadoop.xml       |    2 +-
 assembly/dependencies-schema-import.xml         |   56 +
 assembly/dependencies-schema-load.xml           |   56 -
 assembly/release-hadoop.xml                     |   16 +-
 bin/ignite-schema-import.bat                    |  116 ++
 bin/ignite-schema-import.sh                     |   78 +
 bin/ignite-schema-load.bat                      |  116 --
 bin/ignite-schema-load.sh                       |   78 -
 bin/include/target-classpath.bat                |    2 +-
 bin/include/target-classpath.sh                 |    2 +-
 config/hadoop/default-config.xml                |   10 +-
 docs/core-site.ignite.xml                       |   90 -
 docs/hadoop_readme.md                           |  117 --
 docs/hadoop_readme.pdf                          |  Bin 82297 -> 0 bytes
 docs/hive-site.ignite.xml                       |   37 -
 docs/mapred-site.ignite.xml                     |   66 -
 examples/config/example-cache.xml               |    4 +-
 examples/config/filesystem/example-igfs.xml     |   13 +-
 examples/config/store/example-database.script   |   27 +
 .../config/store/example-jdbc-pojo-store.xml    |  142 ++
 examples/pom-standalone.xml                     |    2 +-
 .../datagrid/CacheDataLoaderExample.java        |   85 -
 .../datagrid/CacheDataStreamerExample.java      |   85 +
 .../datagrid/CachePopularNumbersExample.java    |   14 +-
 .../store/CacheNodeWithStoreStartup.java        |   33 +
 .../datagrid/store/CacheStoreExample.java       |    1 +
 .../store/CacheStoreLoadDataExample.java        |   10 +-
 .../ignite/examples/datagrid/store/Person.java  |  103 --
 .../store/dummy/CacheDummyPersonStore.java      |    2 +-
 .../hibernate/CacheHibernatePersonStore.java    |    2 +-
 .../datagrid/store/hibernate/Person.hbm.xml     |    2 +-
 .../datagrid/store/hibernate/hibernate.cfg.xml  |    3 -
 .../store/jdbc/CacheJdbcPersonStore.java        |    4 +-
 .../store/jdbc/CacheJdbcPojoPersonStore.java    |   96 ++
 .../examples/datagrid/store/model/Person.java   |  155 ++
 .../datagrid/store/model/PersonKey.java         |   97 ++
 .../MemcacheRestExampleNodeStartup.java         |    4 +-
 .../ScalarCachePopularNumbersExample.scala      |   49 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |    6 +-
 ipc/shmem/compile                               |    4 +
 ipc/shmem/config.guess                          |    4 +
 ipc/shmem/config.sub                            |    4 +
 ipc/shmem/depcomp                               |    4 +
 ipc/shmem/ltmain.sh                             |    3 +
 ipc/shmem/missing                               |    4 +
 license/header-customisation.xml                |   51 -
 license/header.txt                              |   14 -
 .../apache/ignite/gridify/AbstractAopTest.java  |    4 +-
 .../spi/checkpoint/s3/S3CheckpointData.java     |   62 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |    8 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |    2 +-
 .../s3/S3CheckpointSpiStartStopSelfTest.java    |    2 +-
 modules/clients/readme.md                       |   17 +
 .../ClientAbstractMultiNodeSelfTest.java        |   12 +-
 .../rest/protocols/tcp/MockNioSession.java      |    7 +-
 modules/clients/src/test/keystore/generate.sh   |   26 +-
 .../clients/src/test/resources/spring-cache.xml |    8 +-
 .../ignite/codegen/MessageCodeGenerator.java    |    6 +-
 modules/core/licenses/snaptree-bsd-license.txt  |   35 +
 modules/core/licenses/snaptree-license.txt      |   35 -
 modules/core/licenses/sun-bcl-license.txt       |   50 -
 modules/core/pom.xml                            |   56 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   10 +-
 .../java/org/apache/ignite/IgniteCache.java     |   24 +
 .../org/apache/ignite/IgniteDataLoader.java     |  379 ----
 .../org/apache/ignite/IgniteDataStreamer.java   |  401 +++++
 .../org/apache/ignite/IgniteFileSystem.java     |   24 +-
 .../apache/ignite/IgniteSystemProperties.java   |   15 +-
 .../org/apache/ignite/IgniteTransactions.java   |    2 +-
 .../apache/ignite/cache/CacheInterceptor.java   |   34 +-
 .../ignite/cache/CacheInterceptorAdapter.java   |   12 +-
 .../org/apache/ignite/cache/CacheManager.java   |    1 -
 .../cache/CachePartialUpdateException.java      |    3 +
 .../apache/ignite/cache/CachePreloadMode.java   |   67 -
 .../apache/ignite/cache/CacheRebalanceMode.java |   67 +
 .../java/org/apache/ignite/cache/GridCache.java |   14 +-
 .../apache/ignite/cache/IgniteImmutable.java    |   45 +
 .../CacheRendezvousAffinityFunction.java        |   13 +-
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |    3 -
 .../eviction/lru/CacheLruEvictionPolicy.java    |    1 -
 .../store/jdbc/CacheAbstractJdbcStore.java      |   33 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   52 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |   66 +-
 .../ignite/compute/ComputeJobContext.java       |    1 -
 .../configuration/CacheConfiguration.java       |  293 ++--
 .../configuration/FileSystemConfiguration.java  |   55 +-
 .../configuration/HadoopConfiguration.java      |   17 +-
 .../configuration/IgniteConfiguration.java      |   10 +-
 .../ignite/events/CachePreloadingEvent.java     |  172 --
 .../ignite/events/CacheRebalancingEvent.java    |  172 ++
 .../java/org/apache/ignite/events/Event.java    |    2 +-
 .../org/apache/ignite/events/EventType.java     |   46 +-
 .../IgfsConcurrentModificationException.java    |   29 +-
 .../ignite/igfs/IgfsCorruptedFileException.java |   16 +-
 .../igfs/IgfsDirectoryNotEmptyException.java    |   56 +
 .../org/apache/ignite/igfs/IgfsException.java   |   16 +-
 .../ignite/igfs/IgfsFileNotFoundException.java  |   44 -
 .../org/apache/ignite/igfs/IgfsInputStream.java |    2 -
 .../igfs/IgfsInvalidHdfsVersionException.java   |   23 +-
 .../ignite/igfs/IgfsInvalidPathException.java   |   16 +-
 .../igfs/IgfsIpcEndpointConfiguration.java      |  241 +++
 .../apache/ignite/igfs/IgfsIpcEndpointType.java |   29 +
 .../ignite/igfs/IgfsOutOfSpaceException.java    |   16 +-
 .../igfs/IgfsParentNotDirectoryException.java   |   20 +-
 .../igfs/IgfsPathAlreadyExistsException.java    |   19 +-
 .../igfs/IgfsPathIsDirectoryException.java      |   56 +
 .../igfs/IgfsPathIsNotDirectoryException.java   |   56 +
 .../ignite/igfs/IgfsPathNotFoundException.java  |   56 +
 .../igfs/secondary/IgfsSecondaryFileSystem.java |   10 +-
 .../ignite/internal/AsyncSupportAdapter.java    |   16 +-
 .../ClusterLocalNodeMetricsMXBeanImpl.java      |    5 +
 .../ignite/internal/ClusterMetricsSnapshot.java |   27 +-
 .../internal/ComputeTaskInternalFuture.java     |    3 +
 .../internal/GridEventConsumeHandler.java       |   13 +-
 .../ignite/internal/GridKernalContext.java      |   32 +-
 .../ignite/internal/GridKernalContextImpl.java  |   74 +-
 .../internal/GridMessageListenHandler.java      |   11 +-
 .../ignite/internal/GridTaskSessionImpl.java    |    3 +-
 .../org/apache/ignite/internal/GridTopic.java   |   91 +-
 .../ignite/internal/GridUpdateNotifier.java     |   15 -
 .../internal/IgniteCodeGeneratingFail.java      |   29 +
 .../apache/ignite/internal/IgniteKernal.java    |   51 +-
 .../ignite/internal/IgniteTransactionsEx.java   |   16 -
 .../org/apache/ignite/internal/IgnitionEx.java  |   79 +-
 .../internal/MarshallerContextAdapter.java      |  130 ++
 .../ignite/internal/MarshallerContextImpl.java  |   81 +
 .../balancer/GridClientBalancerAdapter.java     |    2 +-
 .../client/impl/GridClientComputeImpl.java      |    2 +-
 .../client/impl/GridClientFutureAdapter.java    |    3 +
 .../GridClientConnectionManagerAdapter.java     |    2 +-
 .../GridClientOptimizedMarshaller.java          |   42 +-
 .../impl/GridRouterCommandLineStartup.java      |    2 +-
 .../internal/direct/DirectByteBufferStream.java |   62 +-
 .../internal/direct/DirectMessageWriter.java    |    7 +
 .../direct/DirectMessageWriterState.java        |    3 +
 .../igfs/common/IgfsControlResponse.java        |    4 +-
 .../internal/igfs/common/IgfsMarshaller.java    |    1 -
 .../internal/managers/GridManagerAdapter.java   |   35 +-
 .../managers/communication/GridIoManager.java   |  102 +-
 .../communication/GridIoMessageFactory.java     |   95 +-
 .../managers/communication/GridIoPolicy.java    |    5 +-
 .../loadbalancer/GridLoadBalancerManager.java   |    3 -
 .../affinity/GridAffinityAssignmentCache.java   |   20 +-
 .../affinity/GridAffinityMessage.java           |   13 +-
 .../affinity/GridAffinityProcessor.java         |   35 +-
 .../cache/CacheEntryInfoCollection.java         |  111 ++
 .../processors/cache/CacheEntryPredicate.java   |   45 +
 .../cache/CacheEntryPredicateAdapter.java       |   88 +
 .../cache/CacheEntryPredicateContainsValue.java |  132 ++
 .../cache/CacheEntryPredicateHasValue.java      |   31 +
 .../cache/CacheEntryPredicateNoValue.java       |   31 +
 .../cache/CacheEntrySerializablePredicate.java  |  152 ++
 .../processors/cache/CacheEvictionEntry.java    |  182 ++
 .../cache/CacheInvokeDirectResult.java          |  213 +++
 .../processors/cache/CacheInvokeEntry.java      |   79 +-
 .../processors/cache/CacheInvokeResult.java     |   12 +-
 .../processors/cache/CacheLazyEntry.java        |  133 ++
 .../internal/processors/cache/CacheObject.java  |   73 +
 .../processors/cache/CacheObjectAdapter.java    |  118 ++
 .../cache/CacheObjectByteArrayImpl.java         |  156 ++
 .../processors/cache/CacheObjectContext.java    |  130 ++
 .../processors/cache/CacheObjectImpl.java       |  120 ++
 .../processors/cache/CachePeekModes.java        |   28 +
 .../processors/cache/CacheProjection.java       |  140 +-
 .../cache/CacheStoreBalancingWrapper.java       |    2 +
 .../processors/cache/EvictableEntryImpl.java    |   33 +-
 .../processors/cache/GridCacheAdapter.java      | 1552 +++++++----------
 .../cache/GridCacheAffinityManager.java         |   20 +-
 .../processors/cache/GridCacheAtomicFuture.java |    4 +-
 .../processors/cache/GridCacheAttributes.java   |   47 +-
 .../cache/GridCacheBatchSwapEntry.java          |   27 +-
 .../cache/GridCacheClearAllRunnable.java        |   26 +-
 .../cache/GridCacheConcurrentMap.java           |  355 ++--
 .../processors/cache/GridCacheContext.java      |  489 +++---
 .../GridCacheDefaultAffinityKeyMapper.java      |   47 +-
 .../cache/GridCacheDeploymentManager.java       |  124 +-
 .../processors/cache/GridCacheEntryEx.java      |  201 +--
 .../processors/cache/GridCacheEntryInfo.java    |  337 ++--
 .../GridCacheEntryInfoCollectSwapListener.java  |   56 +-
 .../processors/cache/GridCacheEventManager.java |  133 +-
 .../cache/GridCacheEvictionManager.java         |  240 +--
 .../cache/GridCacheEvictionRequest.java         |   46 +-
 .../cache/GridCacheEvictionResponse.java        |   27 +-
 .../cache/GridCacheExplicitLockSpan.java        |   40 +-
 .../cache/GridCacheFilterFailedException.java   |    8 +-
 .../processors/cache/GridCacheIoManager.java    |   48 +-
 .../processors/cache/GridCacheKeySet.java       |    4 +-
 .../cache/GridCacheManagerAdapter.java          |    2 +-
 .../processors/cache/GridCacheMapEntry.java     | 1524 ++++++++---------
 .../cache/GridCacheMapEntryFactory.java         |   12 +-
 .../processors/cache/GridCacheMessage.java      |  235 ++-
 .../cache/GridCacheMultiTxFuture.java           |    9 +-
 .../processors/cache/GridCacheMvcc.java         |  214 +--
 .../processors/cache/GridCacheMvccCallback.java |   12 +-
 .../cache/GridCacheMvccCandidate.java           |   50 +-
 .../processors/cache/GridCacheMvccFuture.java   |    4 +-
 .../processors/cache/GridCacheMvccManager.java  |  201 +--
 .../cache/GridCacheOffheapSwapEntry.java        |   20 +-
 .../GridCachePartitionExchangeManager.java      |  110 +-
 .../processors/cache/GridCachePreloader.java    |   10 +-
 .../cache/GridCachePreloaderAdapter.java        |   12 +-
 .../processors/cache/GridCacheProcessor.java    |  133 +-
 .../processors/cache/GridCacheProjectionEx.java |   59 +-
 .../cache/GridCacheProjectionImpl.java          |  606 ++-----
 .../processors/cache/GridCacheProxyImpl.java    |  203 +--
 .../processors/cache/GridCacheReturn.java       |  317 +++-
 .../cache/GridCacheSharedContext.java           |   42 +-
 .../processors/cache/GridCacheStoreManager.java |  210 +--
 .../processors/cache/GridCacheSwapEntry.java    |   16 +-
 .../cache/GridCacheSwapEntryImpl.java           |   60 +-
 .../processors/cache/GridCacheSwapListener.java |    5 +-
 .../processors/cache/GridCacheSwapManager.java  |  733 +++++---
 .../processors/cache/GridCacheTtlManager.java   |   26 +-
 .../cache/GridCacheUpdateAtomicResult.java      |   27 +-
 .../cache/GridCacheUpdateTxResult.java          |    8 +-
 .../processors/cache/GridCacheUtils.java        |  222 ++-
 .../processors/cache/GridCacheValueBytes.java   |  194 ---
 .../cache/GridCacheValueCollection.java         |    4 +-
 .../cache/IgniteCacheExpiryPolicy.java          |    8 +-
 .../IgniteCacheOsSerializationManager.java      |   48 -
 .../processors/cache/IgniteCacheProxy.java      |   11 +-
 .../processors/cache/KeyCacheObject.java        |   33 +
 .../processors/cache/KeyCacheObjectImpl.java    |  132 ++
 .../cache/affinity/GridCacheAffinityImpl.java   |   10 +-
 .../CacheDataStructuresManager.java             |   14 +-
 .../distributed/GridCacheCommittedTxInfo.java   |   10 +-
 ...ridCacheOptimisticCheckPreparedTxFuture.java |   23 +-
 ...idCacheOptimisticCheckPreparedTxRequest.java |    4 +-
 ...dCacheOptimisticCheckPreparedTxResponse.java |    2 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |   75 +-
 .../distributed/GridDistributedBaseMessage.java |   28 +-
 .../GridDistributedCacheAdapter.java            |   56 +-
 .../distributed/GridDistributedCacheEntry.java  |  154 +-
 .../distributed/GridDistributedLockRequest.java |   73 +-
 .../GridDistributedLockResponse.java            |   93 +-
 .../GridDistributedTxFinishRequest.java         |   83 +-
 .../GridDistributedTxFinishResponse.java        |    2 +-
 .../distributed/GridDistributedTxMapping.java   |   38 +-
 .../GridDistributedTxPrepareRequest.java        |  273 ++-
 .../GridDistributedTxPrepareResponse.java       |   14 +-
 .../GridDistributedTxRemoteAdapter.java         |  162 +-
 .../GridDistributedUnlockRequest.java           |   52 +-
 .../IgniteExternalizableExpiryPolicy.java       |   12 +-
 .../dht/GridClientPartitionTopology.java        |   24 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |    2 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    6 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |   17 +-
 .../cache/distributed/dht/GridDhtCache.java     |    2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  184 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  120 +-
 .../distributed/dht/GridDhtEmbeddedFuture.java  |    3 +
 .../cache/distributed/dht/GridDhtGetFuture.java |   96 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   56 +-
 .../distributed/dht/GridDhtLockFuture.java      |  108 +-
 .../distributed/dht/GridDhtLockRequest.java     |   69 +-
 .../distributed/dht/GridDhtLockResponse.java    |   77 +-
 .../dht/GridDhtPartitionTopology.java           |   20 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   62 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  274 ++-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   40 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   48 +-
 .../dht/GridDhtTxFinishResponse.java            |    2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   67 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  187 +-
 .../cache/distributed/dht/GridDhtTxMapping.java |    4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  275 ++-
 .../dht/GridDhtTxPrepareRequest.java            |  152 +-
 .../dht/GridDhtTxPrepareResponse.java           |   84 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   53 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   46 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |   28 +-
 .../dht/GridPartitionedGetFuture.java           |  128 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  687 ++++----
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   13 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |    2 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   74 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  222 +--
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   66 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  170 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  238 +--
 .../atomic/GridNearAtomicUpdateResponse.java    |  142 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  179 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   13 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  141 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |   30 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   84 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   43 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   63 +-
 .../GridDhtPartitionDemandMessage.java          |    8 +-
 .../preloader/GridDhtPartitionDemandPool.java   |  179 +-
 .../GridDhtPartitionSupplyMessage.java          |   93 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  103 +-
 .../GridDhtPartitionsAbstractMessage.java       |    2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   80 +-
 .../preloader/GridDhtPartitionsFullMessage.java |    6 +-
 .../GridDhtPartitionsSingleMessage.java         |    6 +-
 .../GridDhtPartitionsSingleRequest.java         |    2 +-
 .../dht/preloader/GridDhtPreloader.java         |   76 +-
 .../preloader/GridDhtPreloaderAssignments.java  |    8 +-
 .../distributed/near/CacheVersionedValue.java   |  169 ++
 .../distributed/near/GridNearAtomicCache.java   |  149 +-
 .../distributed/near/GridNearCacheAdapter.java  |  176 +-
 .../distributed/near/GridNearCacheEntry.java    |  143 +-
 .../distributed/near/GridNearGetFuture.java     |  134 +-
 .../distributed/near/GridNearGetRequest.java    |  106 +-
 .../distributed/near/GridNearGetResponse.java   |   37 +-
 .../distributed/near/GridNearLockFuture.java    |  165 +-
 .../distributed/near/GridNearLockMapping.java   |   23 +-
 .../distributed/near/GridNearLockRequest.java   |   50 +-
 .../distributed/near/GridNearLockResponse.java  |   12 +-
 .../near/GridNearTransactionalCache.java        |  139 +-
 .../near/GridNearTxFinishFuture.java            |   39 +-
 .../near/GridNearTxFinishRequest.java           |   34 +-
 .../near/GridNearTxFinishResponse.java          |    6 +-
 .../cache/distributed/near/GridNearTxLocal.java |  212 +--
 .../near/GridNearTxPrepareFuture.java           |  163 +-
 .../near/GridNearTxPrepareRequest.java          |   58 +-
 .../near/GridNearTxPrepareResponse.java         |  177 +-
 .../distributed/near/GridNearTxRemote.java      |   66 +-
 .../distributed/near/GridNearUnlockRequest.java |    2 +-
 .../cache/dr/GridCacheDrExpirationInfo.java     |   23 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |   28 +-
 .../processors/cache/dr/GridCacheDrManager.java |   10 +-
 .../cache/dr/os/GridOsCacheDrManager.java       |   10 +-
 .../extras/GridCacheAttributesEntryExtras.java  |   24 +-
 .../GridCacheAttributesMvccEntryExtras.java     |   30 +-
 ...dCacheAttributesMvccObsoleteEntryExtras.java |   30 +-
 ...cheAttributesMvccObsoleteTtlEntryExtras.java |   30 +-
 .../GridCacheAttributesMvccTtlEntryExtras.java  |   30 +-
 .../GridCacheAttributesObsoleteEntryExtras.java |   26 +-
 ...idCacheAttributesObsoleteTtlEntryExtras.java |   26 +-
 .../GridCacheAttributesTtlEntryExtras.java      |   26 +-
 .../cache/extras/GridCacheEntryExtras.java      |   16 +-
 .../extras/GridCacheEntryExtrasAdapter.java     |    8 +-
 .../cache/extras/GridCacheMvccEntryExtras.java  |   24 +-
 .../GridCacheMvccObsoleteEntryExtras.java       |   26 +-
 .../GridCacheMvccObsoleteTtlEntryExtras.java    |   26 +-
 .../extras/GridCacheMvccTtlEntryExtras.java     |   26 +-
 .../extras/GridCacheObsoleteEntryExtras.java    |   18 +-
 .../extras/GridCacheObsoleteTtlEntryExtras.java |   20 +-
 .../cache/extras/GridCacheTtlEntryExtras.java   |   18 +-
 .../cache/jta/CacheJtaManagerAdapter.java       |    2 +-
 .../cache/jta/CacheNoopJtaManager.java          |    2 +-
 .../processors/cache/local/GridLocalCache.java  |   55 +-
 .../cache/local/GridLocalCacheEntry.java        |   85 +-
 .../cache/local/GridLocalLockCallback.java      |    9 +-
 .../cache/local/GridLocalLockFuture.java        |   40 +-
 .../processors/cache/local/GridLocalTx.java     |  206 ---
 .../cache/local/GridLocalTxFuture.java          |  302 ----
 .../local/atomic/GridLocalAtomicCache.java      |  342 ++--
 .../GridCacheDistributedFieldsQueryFuture.java  |    3 +
 .../query/GridCacheDistributedQueryFuture.java  |    5 +-
 .../query/GridCacheDistributedQueryManager.java |   38 +-
 .../query/GridCacheLocalFieldsQueryFuture.java  |    3 +
 .../cache/query/GridCacheLocalQueryFuture.java  |    9 +-
 .../cache/query/GridCacheQueriesImpl.java       |   17 -
 .../cache/query/GridCacheQueryAdapter.java      |   16 -
 .../cache/query/GridCacheQueryInfo.java         |   14 -
 .../cache/query/GridCacheQueryManager.java      |  134 +-
 .../cache/query/GridCacheQueryRequest.java      |   66 +-
 .../cache/query/GridCacheQueryResponse.java     |    6 +-
 .../continuous/CacheContinuousQueryEntry.java   |  273 +--
 .../continuous/CacheContinuousQueryEvent.java   |   41 +-
 .../continuous/CacheContinuousQueryHandler.java |   77 +-
 .../continuous/CacheContinuousQueryManager.java |  158 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   12 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   12 +-
 .../IgniteCacheSerializationManager.java        |   51 -
 .../cache/transactions/IgniteInternalTx.java    |   56 +-
 .../transactions/IgniteTransactionsImpl.java    |   36 +-
 .../cache/transactions/IgniteTxAdapter.java     |  158 +-
 .../cache/transactions/IgniteTxEntry.java       |  700 +++-----
 .../cache/transactions/IgniteTxHandler.java     |  242 +--
 .../cache/transactions/IgniteTxKey.java         |   99 +-
 .../transactions/IgniteTxLocalAdapter.java      |  861 +++++-----
 .../cache/transactions/IgniteTxLocalEx.java     |   56 +-
 .../cache/transactions/IgniteTxManager.java     |  372 ++--
 .../cache/transactions/IgniteTxMap.java         |   40 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |    4 +-
 .../transactions/TransactionProxyImpl.java      |   14 +-
 .../cache/transactions/TxEntryValueHolder.java  |  237 +++
 .../version/GridCacheRawVersionedEntry.java     |  245 ++-
 .../cache/version/GridCacheVersion.java         |   12 +-
 .../cache/version/GridCacheVersionEx.java       |   66 +-
 .../cache/version/GridCacheVersionManager.java  |    2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |  160 ++
 .../IgniteCacheObjectProcessorImpl.java         |  347 ++++
 .../processors/cacheobject/package.html         |   24 +
 .../processors/clock/GridClockMessage.java      |    1 -
 .../clock/GridClockSyncProcessor.java           |    2 +-
 .../closure/GridClosureProcessor.java           |  207 +--
 .../continuous/GridContinuousHandler.java       |    9 +-
 .../continuous/GridContinuousMessage.java       |   43 +-
 .../continuous/GridContinuousProcessor.java     |   54 +-
 .../dataload/GridDataLoadCacheUpdaters.java     |  199 ---
 .../dataload/GridDataLoadRequest.java           |  450 -----
 .../dataload/GridDataLoadResponse.java          |  166 --
 .../dataload/GridDataLoadUpdateJob.java         |  119 --
 .../dataload/GridDataLoaderFuture.java          |   59 -
 .../dataload/GridDataLoaderProcessor.java       |  316 ----
 .../dataload/IgniteDataLoaderImpl.java          | 1454 ----------------
 .../internal/processors/dataload/package.html   |   24 -
 .../datastreamer/DataStreamProcessor.java       |  307 ++++
 .../datastreamer/DataStreamerCacheUpdaters.java |  206 +++
 .../datastreamer/DataStreamerEntry.java         |  170 ++
 .../datastreamer/DataStreamerFuture.java        |   60 +
 .../datastreamer/DataStreamerImpl.java          | 1403 +++++++++++++++
 .../datastreamer/DataStreamerRequest.java       |  451 +++++
 .../datastreamer/DataStreamerResponse.java      |  166 ++
 .../datastreamer/DataStreamerUpdateJob.java     |  150 ++
 .../processors/datastreamer/package.html        |   24 +
 .../datastructures/DataStructuresProcessor.java |   43 +-
 .../datastructures/GridCacheSetImpl.java        |    4 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |   85 -
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |   92 +
 .../processors/igfs/IgfsDataManager.java        |   28 +-
 .../igfs/IgfsDirectoryNotEmptyException.java    |   44 -
 .../internal/processors/igfs/IgfsFileImpl.java  |    7 +
 .../internal/processors/igfs/IgfsFileInfo.java  |    3 +-
 .../internal/processors/igfs/IgfsImpl.java      |  605 +++----
 .../processors/igfs/IgfsInputStreamImpl.java    |    8 +-
 .../processors/igfs/IgfsMetaManager.java        |   45 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    2 +-
 .../internal/processors/igfs/IgfsServer.java    |   52 +-
 .../processors/igfs/IgfsServerManager.java      |   35 +-
 .../internal/processors/igfs/IgfsUtils.java     |   86 +
 .../offheap/GridOffHeapProcessor.java           |    9 +-
 .../portable/GridPortableProcessor.java         |  142 --
 .../portable/os/GridOsPortableProcessor.java    |  120 --
 .../processors/portable/os/package.html         |   24 -
 .../resource/GridNoImplicitInjection.java       |   25 +
 .../processors/resource/GridResourceField.java  |   15 +-
 .../processors/resource/GridResourceIoc.java    |   90 +-
 .../processors/resource/GridResourceMethod.java |    3 +
 .../resource/GridResourceProcessor.java         |   57 +-
 .../resource/GridResourceServiceInjector.java   |    2 +-
 .../processors/rest/GridRestCommand.java        |    8 +-
 .../processors/rest/GridRestProcessor.java      |    2 -
 .../processors/rest/GridRestResponse.java       |    1 -
 .../message/GridClientAbstractMessage.java      |    1 -
 .../message/GridClientHandshakeRequest.java     |    1 -
 .../handlers/cache/GridCacheCommandHandler.java |   46 +-
 .../handlers/task/GridTaskCommandHandler.java   |    3 +-
 .../protocols/tcp/GridMemcachedMessage.java     |    1 -
 .../protocols/tcp/GridTcpRestNioListener.java   |    3 -
 .../rest/protocols/tcp/GridTcpRestParser.java   |    6 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |    9 -
 .../rest/request/GridRestRequest.java           |   17 -
 .../rest/request/GridRestTaskRequest.java       |   17 -
 .../service/GridServiceDeploymentFuture.java    |    3 +
 .../processors/service/GridServiceProxy.java    |    2 +-
 .../streamer/GridStreamerExecutionBatch.java    |   12 +-
 .../GridStreamerStageExecutionFuture.java       |    3 +
 .../processors/streamer/IgniteStreamerImpl.java |    4 +-
 .../processors/task/GridTaskProcessor.java      |   31 +-
 .../org/apache/ignite/internal/util/F0.java     |  147 ++
 .../internal/util/GridConcurrentFactory.java    |   59 -
 .../internal/util/GridIdentityHashSet.java      |   63 -
 .../internal/util/GridLeanIdentitySet.java      |  117 ++
 .../ignite/internal/util/GridLeanMap.java       |    2 +-
 .../ignite/internal/util/IgniteUtils.java       |   68 +-
 .../util/future/GridCompoundFuture.java         |    3 +
 .../util/future/GridCompoundIdentityFuture.java |    3 +
 .../util/future/GridEmbeddedFuture.java         |    3 +
 .../internal/util/future/GridFutureAdapter.java |    9 +
 .../util/ipc/IpcServerEndpointDeserializer.java |   66 -
 .../internal/util/lang/GridAbsClosure.java      |    2 -
 .../ignite/internal/util/lang/GridFunc.java     |   54 +-
 .../ignite/internal/util/lang/GridMapEntry.java |    2 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   71 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |    1 -
 .../util/nio/GridNioEmbeddedFuture.java         |    3 +
 .../internal/util/nio/GridNioFutureImpl.java    |    3 +
 .../ignite/internal/util/nio/GridNioServer.java |    3 +
 .../util/nio/GridTcpCommunicationClient.java    |    1 -
 .../util/offheap/unsafe/GridUnsafeMemory.java   |   26 +-
 .../internal/util/worker/GridWorkerFuture.java  |    3 +
 .../visor/cache/VisorCacheClearTask.java        |    6 +
 .../visor/cache/VisorCacheCompactTask.java      |   91 -
 .../visor/cache/VisorCacheConfiguration.java    |   11 -
 .../cache/VisorCachePreloadConfiguration.java   |   16 +-
 .../visor/node/VisorGridConfiguration.java      |    6 +-
 .../visor/node/VisorIgfsConfiguration.java      |    7 +-
 .../lang/IgniteFutureCancelledException.java    |    3 +
 .../lang/IgniteFutureTimeoutException.java      |    3 +
 .../ignite/lang/IgniteProductVersion.java       |    1 -
 .../java/org/apache/ignite/lang/IgniteUuid.java |   13 +-
 .../ignite/marshaller/AbstractMarshaller.java   |    8 +
 .../apache/ignite/marshaller/Marshaller.java    |    7 +
 .../ignite/marshaller/MarshallerContext.java    |   42 +
 .../optimized/OptimizedClassDescriptor.java     |  463 ++---
 .../optimized/OptimizedClassResolver.java       |  477 ------
 .../optimized/OptimizedMarshallable.java        |   65 -
 .../optimized/OptimizedMarshaller.java          |  148 +-
 .../optimized/OptimizedMarshallerIdMapper.java  |   33 +
 .../optimized/OptimizedMarshallerUtils.java     |  298 ++--
 .../optimized/OptimizedObjectInputStream.java   |  152 +-
 .../optimized/OptimizedObjectOutputStream.java  |   99 +-
 .../optimized-classnames.previous.properties    |   15 -
 .../optimized/optimized-classnames.properties   |  116 --
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |    4 +
 .../extensions/communication/MessageWriter.java |   11 +
 .../security/GridSecurityCredentials.java       |    1 -
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   18 -
 .../org/apache/ignite/spi/IgniteSpiContext.java |   43 -
 .../communication/tcp/TcpCommunicationSpi.java  |    3 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   11 +-
 .../tcp/internal/TcpDiscoveryNode.java          |    1 -
 .../TcpDiscoveryMulticastIpFinder.java          |    1 -
 .../messages/TcpDiscoveryAuthFailedMessage.java |    1 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |    1 -
 .../apache/ignite/transactions/Transaction.java |    6 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   |   14 +-
 .../META-INF/classnames-jdk.properties          |  371 ++++
 .../resources/META-INF/classnames.properties    | 1619 ++++++++++++++++++
 .../resources/META-INF/licenses/apache-2.0.txt  |    0
 .../core/src/main/resources/ignite.properties   |    2 +-
 .../core/src/test/config/discovery-stress.xml   |    2 +-
 modules/core/src/test/config/example-cache.xml  |    4 +-
 modules/core/src/test/config/igfs-loopback.xml  |    6 +-
 modules/core/src/test/config/igfs-shmem.xml     |    8 +-
 .../src/test/config/io-manager-benchmark.xml    |   12 -
 modules/core/src/test/config/jobs-load-base.xml |   11 -
 .../config/load/dsi-49-server-production.xml    |    4 +-
 .../core/src/test/config/load/dsi-load-base.xml |   16 -
 .../src/test/config/load/dsi-load-client.xml    |    4 +-
 .../src/test/config/load/dsi-load-server.xml    |    4 +-
 .../core/src/test/config/spring-cache-load.xml  |    2 +-
 .../core/src/test/config/spring-multicache.xml  |   16 +-
 modules/core/src/test/config/start-nodes.ini    |   15 +
 .../test/config/websession/spring-cache-1.xml   |    6 +-
 .../test/config/websession/spring-cache-2.xml   |    6 +-
 .../test/config/websession/spring-cache-3.xml   |    6 +-
 .../IgniteExternalizableAbstractTest.java       |    9 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   11 +-
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |    4 +-
 .../ignite/internal/ClusterMetricsSelfTest.java |    2 +
 .../ignite/internal/GridAffinitySelfTest.java   |    3 +-
 .../internal/GridUpdateNotifierSelfTest.java    |   16 +
 .../GridCommunicationSendMessageSelfTest.java   |    2 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    4 +-
 .../GridCacheAbstractFailoverSelfTest.java      |    4 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   62 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |    8 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |    8 +-
 ...acheAbstractUsersAffinityMapperSelfTest.java |    4 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    6 -
 .../cache/GridCacheBasicStoreAbstractTest.java  |    4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   12 +-
 ...idCacheConfigurationConsistencySelfTest.java |    6 +-
 ...ridCacheConfigurationValidationSelfTest.java |    8 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    9 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   12 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |    4 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |    2 +-
 .../GridCacheFinishPartitionsSelfTest.java      |    7 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |    4 +-
 .../cache/GridCacheIncrementTransformTest.java  |    4 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |  186 +-
 .../processors/cache/GridCacheLeakTest.java     |    2 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   10 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    8 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |    4 +-
 .../cache/GridCacheMvccFlagsTest.java           |    8 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  128 +-
 .../processors/cache/GridCacheMvccSelfTest.java |  232 +--
 .../cache/GridCacheObjectToStringSelfTest.java  |    2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    6 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  688 ++++++++
 .../GridCacheOnCopyFlagAtomicSelfTest.java      |   38 +
 .../cache/GridCacheOnCopyFlagLocalSelfTest.java |   38 +
 .../GridCacheOnCopyFlagReplicatedSelfTest.java  |   38 +
 ...ridCacheOnCopyFlagTxPartitionedSelfTest.java |   38 +
 .../GridCacheOrderedPreloadingSelfTest.java     |    6 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    8 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |    4 +-
 ...hePartitionedProjectionAffinitySelfTest.java |    4 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |    6 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    1 -
 .../GridCacheQueryInternalKeysSelfTest.java     |    4 +-
 .../GridCacheReturnValueTransferSelfTest.java   |    1 +
 .../cache/GridCacheStoreValueBytesSelfTest.java |   24 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   10 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  276 +--
 .../cache/GridCacheTtlManagerLoadTest.java      |    2 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |    4 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |    4 +-
 .../cache/GridCacheVersionMultinodeTest.java    |    2 +-
 .../cache/GridCacheVersionSelfTest.java         |    3 +
 .../IgniteCacheAbstractStopBusySelfTest.java    |    2 +-
 ...IgniteCacheAtomicCopyOnReadDisabledTest.java |   32 +
 .../IgniteCacheContainsKeyAbstractSelfTest.java |    4 +-
 ...niteCacheCopyOnReadDisabledAbstractTest.java |  123 ++
 .../IgniteCacheInterceptorSelfTestSuite.java    |    5 +
 .../IgniteCacheTxCopyOnReadDisabledTest.java    |   32 +
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |  111 ++
 .../cache/IgnitePutAllLargeBatchSelfTest.java   |    6 +-
 ...tAllUpdateNonPreloadedPartitionSelfTest.java |   10 +-
 .../IgniteTxConcurrentGetAbstractTest.java      |    4 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    4 +-
 ...actQueueFailoverDataConsistencySelfTest.java |    2 +-
 .../GridCacheQueueCleanupSelfTest.java          |    2 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |    3 +-
 .../GridCacheSetAbstractSelfTest.java           |    4 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    4 +-
 .../IgniteCollectionAbstractTest.java           |    4 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |    4 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |    4 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    4 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |    6 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |    4 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |   12 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    6 +-
 .../distributed/GridCacheLockAbstractTest.java  |    4 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |    4 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |    4 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |   61 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |    8 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    6 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   10 +-
 .../IgniteCacheSystemTransactionsSelfTest.java  |  188 ++
 ...iteTxConsistencyRestartAbstractSelfTest.java |    6 +-
 .../IgniteTxPreloadAbstractTest.java            |    6 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   16 +-
 .../dht/GridCacheColocatedDebugTest.java        |    6 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |    4 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   12 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   16 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   24 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    8 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    4 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   10 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   30 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   12 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |    4 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |    6 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   36 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   16 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   10 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   25 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |    4 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |    8 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |    4 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |   18 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   11 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |    2 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |    4 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   36 +
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |    4 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |    4 +-
 .../near/GridCacheNearEvictionSelfTest.java     |    7 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |    4 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   12 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |    2 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   14 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |    4 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |    4 +-
 .../near/GridCacheNearReadersSelfTest.java      |   25 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |    4 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |    4 +-
 .../GridCachePartitionedAffinitySelfTest.java   |    4 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |    2 +-
 ...yOnReadDisabledMultiNodeFullApiSelfTest.java |   37 +
 .../near/GridCachePartitionedEventSelfTest.java |    4 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |   10 +-
 .../GridCachePartitionedMetricsSelfTest.java    |    4 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   22 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   19 +-
 .../GridCachePartitionedNodeRestartTest.java    |    4 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |    4 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |    4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |    4 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |    4 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |    1 +
 .../GridCacheReplicatedInvalidateSelfTest.java  |    4 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |    6 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    6 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |    4 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   20 +-
 ...eplicatedPreloadStartStopEventsSelfTest.java |    6 +-
 .../GridCacheEvictionFilterSelfTest.java        |    4 +-
 .../cache/eviction/GridCacheMockEntry.java      |    5 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |    6 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |    6 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |    4 +-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |    2 +-
 .../query/GridCacheSwapScanQuerySelfTest.java   |    1 +
 ...ridCacheContinuousQueryAbstractSelfTest.java |    4 +-
 .../continuous/GridEventConsumeSelfTest.java    |    3 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |  215 ---
 .../dataload/GridDataLoaderPerformanceTest.java |  199 ---
 .../GridDataLoaderProcessorSelfTest.java        |  925 ----------
 .../DataStreamProcessorSelfTest.java            |  970 +++++++++++
 .../datastreamer/DataStreamerImplSelfTest.java  |  205 +++
 .../IgniteDataStreamerPerformanceTest.java      |  197 +++
 .../processors/igfs/IgfsAbstractSelfTest.java   |   57 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |   12 +-
 .../igfs/IgfsDataManagerSelfTest.java           |    6 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |    2 +
 .../processors/igfs/IgfsMetricsSelfTest.java    |   12 +-
 .../processors/igfs/IgfsModesSelfTest.java      |    9 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |   21 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |    7 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |    5 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   22 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    1 -
 .../streamer/GridStreamerFailoverSelfTest.java  |    2 +-
 .../IpcServerEndpointDeserializerSelfTest.java  |  160 --
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |    9 +-
 .../internal/util/nio/GridNioSelfTest.java      |   18 +-
 .../nio/impl/GridNioFilterChainSelfTest.java    |    7 +-
 .../ignite/jvmtest/ConcurrentMapTest.java       |    5 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |   80 +-
 .../lang/utils/GridLeanIdentitySetSelfTest.java |   62 +
 .../loadtests/GridCacheMultiNodeLoadTest.java   |    4 +-
 .../capacity/spring-capacity-cache.xml          |    4 +-
 .../loadtests/colocation/GridTestMain.java      |    4 +-
 .../loadtests/colocation/spring-colocation.xml  |    4 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |    2 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |    2 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   29 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   10 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    2 +-
 .../mapper/GridContinuousMapperLoadTest2.java   |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   15 +-
 .../GridMarshallerPerformanceTest.java          |    2 -
 .../marshaller/MarshallerContextTestImpl.java   |   43 +
 .../jdk/GridJdkMarshallerSelfTest.java          |    2 +-
 .../OptimizedMarshallerEnumSelfTest.java        |    4 +-
 .../optimized/OptimizedMarshallerSelfTest.java  |  186 +-
 .../optimized/OptimizedMarshallerTest.java      |  102 +-
 .../OptimizedObjectStreamSelfTest.java          |   43 +-
 .../ignite/messaging/GridMessagingSelfTest.java |    3 +
 .../GridP2PContinuousDeploymentSelfTest.java    |    4 +-
 .../communication/GridCacheMessageSelfTest.java |  546 ++++++
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    4 +-
 .../discovery/AbstractDiscoverySelfTest.java    |    1 -
 .../GridCacheStoreValueBytesNode.java           |    2 -
 .../testframework/GridSpiTestContext.java       |   18 -
 .../ignite/testframework/GridTestUtils.java     |   69 +-
 .../testframework/junits/GridAbstractTest.java  |    7 +-
 .../junits/GridTestKernalContext.java           |   14 +-
 .../ignite/testframework/junits/IgniteMock.java |    4 +-
 .../junits/IgniteTestResources.java             |   46 +-
 .../junits/common/GridCommonAbstractTest.java   |    6 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |    2 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   20 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |    4 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |    2 +
 .../testsuites/IgniteLangSelfTestSuite.java     |    1 +
 .../webapp/META-INF/ignite-webapp-config.xml    |   12 +-
 modules/hadoop/config/core-site.ignite.xml      |   90 +
 modules/hadoop/config/hive-site.ignite.xml      |   37 +
 modules/hadoop/config/mapred-site.ignite.xml    |   66 +
 modules/hadoop/docs/hadoop_readme.md            |  135 ++
 modules/hadoop/docs/hadoop_readme.pdf           |  Bin 0 -> 82297 bytes
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |   15 +-
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |   16 +-
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    |    8 +-
 .../IgniteHadoopClientProtocolProvider.java     |    7 +-
 .../processors/hadoop/HadoopProcessor.java      |    4 +-
 .../internal/processors/hadoop/HadoopSetup.java |   35 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |    5 +-
 .../hadoop/igfs/HadoopIgfsFuture.java           |    3 +
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |    3 +-
 .../hadoop/proto/HadoopClientProtocol.java      |    3 -
 .../external/HadoopExternalTaskExecutor.java    |    3 +
 .../child/HadoopExternalProcessStarter.java     |    4 +-
 .../HadoopClientProtocolEmbeddedSelfTest.java   |    3 +-
 .../hadoop/HadoopClientProtocolSelfTest.java    |    2 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |    4 +-
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |   14 +-
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |   14 +-
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   25 +-
 ...oopSecondaryFileSystemConfigurationTest.java |   25 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   44 +-
 .../java/org/apache/ignite/igfs/IgfsLoad.java   |  549 ------
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |   10 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   16 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |   11 +-
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |   14 +-
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |   10 +-
 ...niteHadoopFileSystemLoggerStateSelfTest.java |   12 +-
 ...adoopFileSystemLoopbackAbstractSelfTest.java |   12 +-
 ...teHadoopFileSystemSecondaryModeSelfTest.java |   23 +-
 ...teHadoopFileSystemShmemAbstractSelfTest.java |   12 +-
 .../hadoop/HadoopCommandLineTest.java           |   16 +-
 .../processors/hadoop/HadoopGroupingTest.java   |    3 +-
 .../hadoop/HadoopJobTrackerSelfTest.java        |    4 +-
 .../hadoop/HadoopMapReduceEmbeddedSelfTest.java |    3 +-
 .../hadoop/HadoopPopularWordsTest.java          |    4 +-
 .../hadoop/HadoopSortingExternalTest.java       |   13 +-
 .../processors/hadoop/HadoopSortingTest.java    |    3 +-
 .../hadoop/HadoopTaskExecutionSelfTest.java     |    6 +-
 .../HadoopExternalTaskExecutionSelfTest.java    |   13 +-
 .../HadoopExternalCommunicationSelfTest.java    |    4 +-
 .../ignite/loadtests/igfs/IgfsNodeStartup.java  |   48 -
 .../igfs/IgfsPerformanceBenchmark.java          |  281 ---
 .../testsuites/IgniteHadoopTestSuite.java       |    6 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    8 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   38 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    4 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    7 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |    4 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |    4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    2 +-
 .../cache/IgniteCacheQueryLoadSelfTest.java     |   22 +-
 .../IgniteCacheQueryNodeRestartSelfTest.java    |    6 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   25 +-
 .../query/h2/sql/GridQueryParsingTest.java      |    4 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    4 +-
 .../processors/cache/jta/CacheJtaManager.java   |    6 +-
 modules/scalar/pom.xml                          |    8 +
 .../scala/org/apache/ignite/scalar/scalar.scala |   13 +-
 .../scalar/testsuites/ScalarSelfTestSuite.scala |    6 +
 modules/schema-import/pom.xml                   |  107 ++
 modules/schema-import/readme.txt                |  214 +++
 .../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-import/src/main/java/media/style.css |  117 ++
 .../src/main/java/media/text_tree_48x48.png     |  Bin 0 -> 2567 bytes
 .../ignite/schema/generator/PojoGenerator.java  |  414 +++++
 .../schema/generator/SnippetGenerator.java      |  138 ++
 .../ignite/schema/generator/XmlGenerator.java   |  347 ++++
 .../ignite/schema/model/PojoDescriptor.java     |  510 ++++++
 .../apache/ignite/schema/model/PojoField.java   |  420 +++++
 .../schema/parser/DatabaseMetadataParser.java   |  108 ++
 .../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     |  141 ++
 .../parser/dialect/OracleMetadataDialect.java   |  281 +++
 .../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 |  246 +++
 .../apache/ignite/schema/ui/ModalDialog.java    |   50 +
 .../ignite/schema/ui/SchemaImportApp.java       | 1615 +++++++++++++++++
 .../ignite/schema/ui/TextColumnValidator.java   |   32 +
 .../schema/test/AbstractSchemaImportTest.java   |  134 ++
 .../test/generator/PojoGeneratorTest.java       |   70 +
 .../schema/test/generator/XmlGeneratorTest.java |   50 +
 .../apache/ignite/schema/test/model/Ignite.xml  |  390 +++++
 .../apache/ignite/schema/test/model/Objects.txt |  502 ++++++
 .../ignite/schema/test/model/ObjectsKey.txt     |   96 ++
 .../ignite/schema/test/model/Primitives.txt     |  506 ++++++
 .../ignite/schema/test/model/PrimitivesKey.txt  |   96 ++
 .../test/parser/DbMetadataParserTest.java       |  118 ++
 .../testsuites/IgniteSchemaImportTestSuite.java |   41 +
 modules/schema-load/pom.xml                     |  107 --
 .../main/java/media/data_connection_48x48.png   |  Bin 4443 -> 0 bytes
 .../src/main/java/media/error_48x48.png         |  Bin 4349 -> 0 bytes
 .../src/main/java/media/ignite_128x128.png      |  Bin 4917 -> 0 bytes
 .../src/main/java/media/ignite_16x16.png        |  Bin 608 -> 0 bytes
 .../src/main/java/media/ignite_24x24.png        |  Bin 930 -> 0 bytes
 .../src/main/java/media/ignite_32x32.png        |  Bin 1203 -> 0 bytes
 .../src/main/java/media/ignite_48x48.png        |  Bin 1868 -> 0 bytes
 .../src/main/java/media/ignite_64x64.png        |  Bin 2453 -> 0 bytes
 .../src/main/java/media/information_48x48.png   |  Bin 4102 -> 0 bytes
 .../src/main/java/media/question_48x48.png      |  Bin 3857 -> 0 bytes
 .../src/main/java/media/sign_warning_48x48.png  |  Bin 2988 -> 0 bytes
 .../schema-load/src/main/java/media/style.css   |  117 --
 .../src/main/java/media/text_tree_48x48.png     |  Bin 2567 -> 0 bytes
 .../ignite/schema/generator/PojoGenerator.java  |  414 -----
 .../schema/generator/SnippetGenerator.java      |  138 --
 .../ignite/schema/generator/XmlGenerator.java   |  347 ----
 .../ignite/schema/model/PojoDescriptor.java     |  510 ------
 .../apache/ignite/schema/model/PojoField.java   |  420 -----
 .../schema/parser/DatabaseMetadataParser.java   |  108 --
 .../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     |  141 --
 .../parser/dialect/OracleMetadataDialect.java   |  281 ---
 .../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 |  246 ---
 .../apache/ignite/schema/ui/ModalDialog.java    |   50 -
 .../apache/ignite/schema/ui/SchemaLoadApp.java  | 1615 -----------------
 .../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  |  390 -----
 .../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     |    4 +-
 .../cache/spring/SpringDynamicCacheManager.java |   36 +-
 .../GridSpringBeanSerializationSelfTest.java    |    2 +
 .../ignite/spring/GridSpringCacheTestKey.java   |    4 +-
 ...gniteProjectionStartStopRestartSelfTest.java |   42 +-
 .../ignite/tools/classgen/ClassesGenerator.java |  214 +++
 .../optimized/OptimizedClassNamesGenerator.java |  325 ----
 .../ignite/visor/commands/VisorConsole.scala    |    3 +-
 .../commands/cache/VisorCacheCommand.scala      |   31 +-
 .../cache/VisorCacheCompactCommand.scala        |  151 --
 .../commands/events/VisorEventsCommand.scala    |    4 +-
 .../commands/top/VisorTopologyCommand.scala     |    7 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   12 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |  103 --
 .../commands/tasks/VisorTasksCommandSpec.scala  |    5 +-
 .../testsuites/VisorConsoleSelfTestSuite.scala  |    3 +-
 .../apache/ignite/visor/plugin/VisorPlugin.java |    8 +-
 .../IgniteWebSessionSelfTestSuite.java          |    6 +
 modules/winservice/README.md                    |   17 +
 modules/yardstick/README.md                     |   17 +
 modules/yardstick/config/ignite-base-config.xml |   17 -
 .../yardstick/config/ignite-store-config.xml    |   18 -
 .../cache/IgniteSqlQueryBenchmark.java          |    2 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |    2 +-
 pom.xml                                         |  116 +-
 .../basic-concepts/async-support.md             |    0
 .../basic-concepts/getting-started.md           |    0
 .../basic-concepts/ignite-life-cycel.md         |    0
 .../documentation/basic-concepts/maven-setup.md |    0
 .../basic-concepts/what-is-ignite.md            |    0
 .../basic-concepts/zero-deployment.md           |    0
 wiki/documentation/clustering/aws-config.md     |    0
 wiki/documentation/clustering/cluster-config.md |    0
 wiki/documentation/clustering/cluster-groups.md |    0
 wiki/documentation/clustering/cluster.md        |    0
 .../documentation/clustering/leader-election.md |    0
 wiki/documentation/clustering/network-config.md |    0
 wiki/documentation/clustering/node-local-map.md |    0
 .../documentation/compute-grid/checkpointing.md |    0
 .../compute-grid/collocate-compute-and-data.md  |    0
 wiki/documentation/compute-grid/compute-grid.md |    0
 .../documentation/compute-grid/compute-tasks.md |    0
 .../compute-grid/distributed-closures.md        |    0
 .../compute-grid/executor-service.md            |    0
 .../compute-grid/fault-tolerance.md             |    0
 .../compute-grid/job-scheduling.md              |    0
 .../compute-grid/load-balancing.md              |    0
 .../data-grid/affinity-collocation.md           |    0
 .../data-grid/automatic-db-integration.md       |    0
 wiki/documentation/data-grid/cache-modes.md     |    0
 wiki/documentation/data-grid/cache-queries.md   |    0
 wiki/documentation/data-grid/data-grid.md       |    0
 wiki/documentation/data-grid/data-loading.md    |    0
 wiki/documentation/data-grid/evictions.md       |    0
 .../data-grid/hibernate-l2-cache.md             |    0
 wiki/documentation/data-grid/jcache.md          |    0
 wiki/documentation/data-grid/off-heap-memory.md |    0
 .../documentation/data-grid/persistent-store.md |    0
 wiki/documentation/data-grid/rebalancing.md     |    0
 wiki/documentation/data-grid/transactions.md    |    0
 .../data-grid/web-session-clustering.md         |    0
 .../distributed-data-structures/atomic-types.md |    0
 .../countdownlatch.md                           |    0
 .../distributed-data-structures/id-generator.md |    0
 .../queue-and-set.md                            |    0
 .../distributed-events/automatic-batching.md    |    0
 wiki/documentation/distributed-events/events.md |    0
 .../distributed-file-system/igfs.md             |    0
 .../distributed-messaging/messaging.md          |    0
 wiki/documentation/http/configuration.md        |    0
 wiki/documentation/http/rest-api.md             |    0
 .../release-notes/release-notes.md              |    0
 .../service-grid/cluster-singletons.md          |    0
 .../service-grid/service-configuration.md       |    0
 .../service-grid/service-example.md             |    0
 wiki/documentation/service-grid/service-grid.md |    0
 987 files changed, 38208 insertions(+), 32918 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/examples/config/example-cache.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/examples/config/filesystem/example-igfs.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index f1a16bb,58a2e2f..56e7521
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@@ -118,8 -119,7 +118,8 @@@ public class CachePopularNumbersExampl
  
                  try {
                      List<List<?>> results = new ArrayList<>(cache.queryFields(
-                         new SqlFieldsQuery("select _key, _val from Long order by _val desc limit ?").setArgs(cnt))
 -                        sql("select _key, _val from Long order by _val desc, _key limit ?").setArgs(cnt)).getAll());
++                        new SqlFieldsQuery("select _key, _val from Long order by _val desc, _key limit ?").setArgs(cnt))
 +                        .getAll());
  
                      for (List<?> res : results)
                          System.out.println(res.get(0) + "=" + res.get(1));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index c06e4fe,7b04528..ed548ad
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@@ -18,9 -18,8 +18,9 @@@
  package org.apache.ignite.examples.datagrid.store.dummy;
  
  import org.apache.ignite.*;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.store.*;
- import org.apache.ignite.examples.datagrid.store.*;
+ import org.apache.ignite.examples.datagrid.store.model.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.resources.*;
  import org.apache.ignite.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index aca572f,b856fc4..1c79b64
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@@ -72,9 -72,16 +72,9 @@@ public class MemcacheRestExampleNodeSta
  
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
          cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
  
 -        CacheQueryConfiguration qryCfg = new CacheQueryConfiguration();
 -
 -        qryCfg.setIndexPrimitiveKey(true);
 -        qryCfg.setIndexFixedTyping(false);
 -
 -        cacheCfg.setQueryConfiguration(qryCfg);
 -
          cfg.setCacheConfiguration(cacheCfg);
  
          TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --cc modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 76fed7e,5037b8a..028236c
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@@ -18,7 -18,7 +18,8 @@@
  package org.apache.ignite.codegen;
  
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
+ import org.apache.ignite.internal.processors.datastreamer.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.plugin.extensions.communication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index d9fb719,7bb32c6..cfcb39e
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -284,10 -296,13 +284,10 @@@ public class CacheConfiguration<K, V> e
      private CacheAffinityKeyMapper affMapper;
  
      /** */
-     private long preloadDelay;
 -    private String indexingSpiName;
 -
 -    /** */
+     private long rebalanceDelay;
  
      /** */
-     private long preloadThrottle = DFLT_PRELOAD_THROTTLE;
+     private long rebalanceThrottle = DFLT_REBALANCE_THROTTLE;
  
      /** */
      private CacheInterceptor<?, ?> interceptor;
@@@ -307,15 -319,9 +307,18 @@@
      /** Collection of type metadata. */
      private Collection<CacheTypeMetadata> typeMeta;
  
 +    /** */
 +    private boolean sqlEscapeAll;
 +
 +    /** */
 +    private Class<?>[] indexedTypes;
 +
 +    /** */
 +    private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
 +
+     /** Copy on read flag. */
+     private boolean cpOnRead = DFLT_COPY_ON_READ;
+ 
      /** Empty constructor (all values are initialized to their defaults). */
      public CacheConfiguration() {
          /* No-op. */
@@@ -346,7 -352,9 +349,8 @@@
          cacheLoaderFactory = cc.getCacheLoaderFactory();
          cacheMode = cc.getCacheMode();
          cacheWriterFactory = cc.getCacheWriterFactory();
+         cpOnRead = cc.isCopyOnRead();
          dfltLockTimeout = cc.getDefaultLockTimeout();
 -        dfltQryTimeout = cc.getDefaultQueryTimeout();
          distro = cc.getDistributionMode();
          eagerTtl = cc.isEagerTtl();
          evictFilter = cc.getEvictionFilter();
@@@ -372,20 -380,18 +376,19 @@@
          name = cc.getName();
          nearStartSize = cc.getNearStartSize();
          nearEvictPlc = cc.getNearEvictionPolicy();
-         preloadMode = cc.getPreloadMode();
-         preloadBatchSize = cc.getPreloadBatchSize();
-         preloadDelay = cc.getPreloadPartitionedDelay();
-         preloadOrder = cc.getPreloadOrder();
-         preloadPoolSize = cc.getPreloadThreadPoolSize();
-         preloadTimeout = cc.getPreloadTimeout();
-         preloadThrottle = cc.getPreloadThrottle();
+         rebalanceMode = cc.getRebalanceMode();
+         rebalanceBatchSize = cc.getRebalanceBatchSize();
+         rebalanceDelay = cc.getRebalanceDelay();
+         rebalanceOrder = cc.getRebalanceOrder();
+         rebalancePoolSize = cc.getRebalanceThreadPoolSize();
+         rebalanceTimeout = cc.getRebalanceTimeout();
+         rebalanceThrottle = cc.getRebalanceThrottle();
 -        qryCfg = cc.getQueryConfiguration();
 -        qryIdxEnabled = cc.isQueryIndexEnabled();
          readFromBackup = cc.isReadFromBackup();
 +        sqlEscapeAll = cc.isSqlEscapeAll();
 +        sqlFuncCls = cc.getSqlFunctionClasses();
 +        sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
          startSize = cc.getStartSize();
          storeFactory = cc.getCacheStoreFactory();
-         storeValBytes = cc.isStoreValueBytes();
          swapEnabled = cc.isSwapEnabled();
          tmLookupClsName = cc.getTransactionManagerLookupClassName();
          ttl = cc.getDefaultTimeToLive();
@@@ -1507,121 -1602,29 +1488,145 @@@
      }
  
      /**
+      * Gets flag indicating whether copy of of the value stored in cache should be created
+      * for cache operation implying return value. Also if this flag is set copies are created for values
+      * passed to {@link CacheInterceptor} and to {@link org.apache.ignite.cache.IgniteEntryProcessor}.
+      * <p>
+      * Copies are not created for immutable types, see {@link IgniteImmutable}.
+      *
+      * @return Copy on get flag.
+      * @see IgniteImmutable
+      */
+     public boolean isCopyOnRead() {
+         return cpOnRead;
+     }
+ 
+     /**
+      * Set copy on get flag.
+      *
+      * @param cpOnGet Copy on get flag.
+      * @see #isCopyOnRead
+      */
+     public void setCopyOnRead(boolean cpOnGet) {
+         this.cpOnRead = cpOnGet;
+     }
+ 
++    /**
 +     * Sets classes with methods annotated by {@link QuerySqlFunction}
 +     * to be used as user-defined functions from SQL queries.
 +     *
 +     * @param cls One or more classes with SQL functions.
 +     */
 +    public void setSqlFunctionClasses(Class<?>... cls) {
 +        this.sqlFuncCls = cls;
 +    }
 +
 +    /**
 +     * Gets classes with methods annotated by {@link QuerySqlFunction}
 +     * to be used as user-defined functions from SQL queries.
 +     *
 +     * @return Classes with SQL functions.
 +     */
 +    @Nullable public Class<?>[] getSqlFunctionClasses() {
 +        return sqlFuncCls;
 +    }
 +
 +    /**
 +     * Gets timeout in milliseconds after which long query warning will be printed.
 +     *
 +     * @return Timeout in milliseconds.
 +     */
 +    public long getLongQueryWarningTimeout() {
 +        return longQryWarnTimeout;
 +    }
 +
 +    /**
 +     * Gets timeout in milliseconds after which long query warning will be printed.
 +     *
 +     * @param longQryWarnTimeout Timeout in milliseconds.
 +     */
 +    public void setLongQueryWarningTimeout(long longQryWarnTimeout) {
 +        this.longQryWarnTimeout = longQryWarnTimeout;
 +    }
 +
 +    /**
 +     * If {@code true} all the SQL table and field names will be escaped with double quotes like
 +     * ({@code "tableName"."fieldsName"}). This enforces case sensitivity for field names and
 +     * also allows having special characters in table and field names.
 +     *
 +     * @return Flag value.
 +     */
 +    public boolean isSqlEscapeAll() {
 +        return sqlEscapeAll;
 +    }
 +
 +    /**
 +     * If {@code true} all the SQL table and field names will be escaped with double quotes like
 +     * ({@code "tableName"."fieldsName"}). This enforces case sensitivity for field names and
 +     * also allows having special characters in table and field names.
 +     *
 +     * @param sqlEscapeAll Flag value.
 +     */
 +    public void setSqlEscapeAll(boolean sqlEscapeAll) {
 +        this.sqlEscapeAll = sqlEscapeAll;
 +    }
 +
 +    /**
 +     * Array of key and value type pairs to be indexed.
 +     * It means each even (0,2,4...) class in the array will be considered as key type for cache entry,
 +     * each odd (1,3,5...) class will be considered as value type for cache entry.
 +     * <p>
 +     * The same key class can occur multiple times for different value classes, but each value class must be unique
 +     * because SQL table will be named as value class simple name.
 +     * <p>
 +     * To expose fields of these types onto SQL level and to index them you have to use annotations
 +     * from package {@link org.apache.ignite.cache.query.annotations}.
 +     *
 +     * @return Key and value type pairs.
 +     */
 +    public Class<?>[] getIndexedTypes() {
 +        return indexedTypes;
 +    }
 +
 +    /**
 +     * Array of key and value type pairs to be indexed.
 +     * It means each even (0,2,4...) class in the array will be considered as key type for cache entry,
 +     * each odd (1,3,5...) class will be considered as value type for cache entry.
 +     * <p>
 +     * The same key class can occur multiple times for different value classes, but each value class must be unique
 +     * because SQL table will be named as value class simple name.
 +     * <p>
 +     * To expose fields of these types onto SQL level and to index them you have to use annotations
 +     * from package {@link org.apache.ignite.cache.query.annotations}.
 +     *
 +     * @param indexedTypes Key and value type pairs.
 +     */
 +    public void setIndexedTypes(Class<?>... indexedTypes) {
 +        this.indexedTypes = indexedTypes;
 +    }
 +
 +    /**
 +     * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
 +     * This setting only makes sense when offheap is enabled for this cache.
 +     *
 +     * @return size Cache size.
 +     * @see #setOffHeapMaxMemory(long)
 +     */
 +    public int getSqlOnheapRowCacheSize() {
 +        return sqlOnheapRowCacheSize;
 +    }
 +
 +    /**
 +     * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
 +     * This setting only makes sense when offheap is enabled for this cache.
 +     *
 +     * @param size Cache size.
 +     * @see #setOffHeapMaxMemory(long)
 +     */
 +    public void setSqlOnheapRowCacheSize(int size) {
 +        this.sqlOnheapRowCacheSize = size;
 +    }
 +
      /** {@inheritDoc} */
      @Override public String toString() {
          return S.toString(CacheConfiguration.class, this);

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index e8ffa4c,bd29bf8..d181b39
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@@ -1856,6 -1860,30 +1860,29 @@@ public class IgnitionEx 
          }
  
          /**
+          * Creates marshaller system cache configuration.
+          *
+          * @param client If {@code true} creates client-only cache configuration.
+          * @return Marshaller system cache configuration.
+          */
+         private static CacheConfiguration marshallerSystemCache(boolean client) {
+             CacheConfiguration cache = new CacheConfiguration();
+ 
+             cache.setName(CU.MARSH_CACHE_NAME);
+             cache.setCacheMode(REPLICATED);
+             cache.setAtomicityMode(TRANSACTIONAL);
+             cache.setSwapEnabled(false);
 -            cache.setQueryIndexEnabled(false);
+             cache.setRebalanceMode(SYNC);
+             cache.setWriteSynchronizationMode(FULL_SYNC);
+             cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100));
+ 
+             if (client)
+                 cache.setDistributionMode(CLIENT_ONLY);
+ 
+             return cache;
+         }
+ 
+         /**
           * Creates utility system cache configuration.
           *
           * @param client If {@code true} creates client-only cache configuration.
@@@ -1868,7 -1896,8 +1895,7 @@@
              cache.setCacheMode(REPLICATED);
              cache.setAtomicityMode(TRANSACTIONAL);
              cache.setSwapEnabled(false);
-             cache.setPreloadMode(SYNC);
 -            cache.setQueryIndexEnabled(false);
+             cache.setRebalanceMode(SYNC);
              cache.setWriteSynchronizationMode(FULL_SYNC);
              cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100));
  
@@@ -1891,7 -1920,8 +1918,7 @@@
              ccfg.setName(CU.ATOMICS_CACHE_NAME);
              ccfg.setAtomicityMode(TRANSACTIONAL);
              ccfg.setSwapEnabled(false);
-             ccfg.setPreloadMode(SYNC);
 -            ccfg.setQueryIndexEnabled(false);
+             ccfg.setRebalanceMode(SYNC);
              ccfg.setWriteSynchronizationMode(FULL_SYNC);
              ccfg.setCacheMode(cfg.getCacheMode());
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 4eb0c1d,762507a..d32d64b
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -32,9 -34,8 +34,9 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.version.*;
  import org.apache.ignite.internal.processors.clock.*;
  import org.apache.ignite.internal.processors.continuous.*;
- import org.apache.ignite.internal.processors.dataload.*;
+ import org.apache.ignite.internal.processors.datastreamer.*;
  import org.apache.ignite.internal.processors.igfs.*;
 +import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
  import org.apache.ignite.internal.processors.rest.handlers.task.*;
  import org.apache.ignite.internal.processors.streamer.*;
  import org.apache.ignite.internal.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index f8216ff,23fd0ee..ca39daf
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@@ -22,10 -22,8 +22,9 @@@ import org.apache.ignite.cache.*
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.cache.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.cache.transactions.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.transactions.*;
  import org.jetbrains.annotations.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 85bb6f9,dd08260..68c0940
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@@ -156,10 -160,11 +153,9 @@@ public class GridCacheAttributes implem
          loadPrevVal = cfg.isLoadPreviousValue();
          name = cfg.getName();
          partDistro = GridCacheUtils.distributionMode(cfg);
-         preloadBatchSize = cfg.getPreloadBatchSize();
-         preloadMode = cfg.getPreloadMode();
+         rebalanceBatchSize = cfg.getRebalanceBatchSize();
+         rebalanceMode = cfg.getRebalanceMode();
 -        qryIdxEnabled = cfg.isQueryIndexEnabled();
          readThrough = cfg.isReadThrough();
-         storeValBytes = cfg.isStoreValueBytes();
          swapEnabled = cfg.isSwapEnabled();
          ttl = cfg.getDefaultTimeToLive();
          writeBehindBatchSize = cfg.getWriteBehindBatchSize();
@@@ -473,10 -485,11 +462,9 @@@
          out.writeBoolean(loadPrevVal);
          U.writeString(out, name);
          U.writeEnum(out, partDistro);
-         out.writeInt(preloadBatchSize);
-         U.writeEnum(out, preloadMode);
+         out.writeInt(rebalanceBatchSize);
+         U.writeEnum(out, rebalanceMode);
 -        out.writeBoolean(qryIdxEnabled);
          out.writeBoolean(readThrough);
-         out.writeBoolean(storeValBytes);
          out.writeBoolean(swapEnabled);
          out.writeLong(ttl);
          out.writeInt(writeBehindBatchSize);
@@@ -513,10 -526,11 +501,9 @@@
          loadPrevVal = in.readBoolean();
          name = U.readString(in);
          partDistro = CacheDistributionMode.fromOrdinal(in.readByte());
-         preloadBatchSize = in.readInt();
-         preloadMode = CachePreloadMode.fromOrdinal(in.readByte());
+         rebalanceBatchSize = in.readInt();
+         rebalanceMode = CacheRebalanceMode.fromOrdinal(in.readByte());
 -        qryIdxEnabled = in.readBoolean();
          readThrough = in.readBoolean();
-         storeValBytes = in.readBoolean();
          swapEnabled = in.readBoolean();
          ttl = in.readLong();
          writeBehindBatchSize = in.readInt();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
index dc173ee,5a7b183..0a2e565
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
@@@ -80,12 -79,12 +80,12 @@@ public class GridCacheClearAllRunnable<
          // Clear swapped entries.
          if (!ctx.isNear()) {
              if (ctx.swap().offHeapEnabled()) {
 -                if (ctx.config().isQueryIndexEnabled()) {
 +                if (GridQueryProcessor.isEnabled(ctx.config())) {
-                     for (Iterator<Map.Entry<K, V>> it = ctx.swap().lazyOffHeapIterator(); it.hasNext();) {
-                         Map.Entry<K, V> e = it.next();
+                     for (Iterator<KeyCacheObject> it = ctx.swap().offHeapKeyIterator(true, true, -1L); it.hasNext();) {
+                         KeyCacheObject key = it.next();
  
-                         if (owns(e.getKey()))
-                             clearEntry(cache.entryEx(e.getKey()));
+                         if (owns(key))
+                             clearEntry(cache.entryEx(key));
  
                      }
                  }
@@@ -95,11 -94,11 +95,11 @@@
  
              if (ctx.isSwapOrOffheapEnabled()) {
                  if (ctx.swap().swapEnabled()) {
 -                    if (ctx.config().isQueryIndexEnabled()) {
 -                        Iterator<KeyCacheObject> it = null;
 +                    if (GridQueryProcessor.isEnabled(ctx.config())) {
 +                        Iterator<Map.Entry<K, V>> it = null;
  
                          try {
-                             it = ctx.swap().lazySwapIterator();
+                             it = ctx.swap().swapKeyIterator(true, true, -1L);
                          }
                          catch (IgniteCheckedException e) {
                              U.error(log, "Failed to get iterator over swap.", e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index f0b714c,ec94e04..1efc49a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@@ -37,13 -37,11 +37,13 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.local.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.cache.query.continuous.*;
- import org.apache.ignite.internal.processors.cache.serialization.*;
  import org.apache.ignite.internal.processors.cache.transactions.*;
  import org.apache.ignite.internal.processors.cache.version.*;
+ import org.apache.ignite.internal.processors.cacheobject.*;
  import org.apache.ignite.internal.processors.closure.*;
  import org.apache.ignite.internal.processors.offheap.*;
 +import org.apache.ignite.internal.processors.portable.*;
 +import org.apache.ignite.internal.processors.query.*;
  import org.apache.ignite.internal.processors.timeout.*;
  import org.apache.ignite.internal.util.*;
  import org.apache.ignite.internal.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c4e3222/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 fb0928c,7deb1fe..e13177b
--- 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
@@@ -38,10 -38,8 +38,9 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.local.atomic.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.cache.query.continuous.*;
- import org.apache.ignite.internal.processors.cache.serialization.*;
  import org.apache.ignite.internal.processors.cache.transactions.*;
  import org.apache.ignite.internal.processors.cache.version.*;
 +import org.apache.ignite.internal.processors.query.*;
  import org.apache.ignite.internal.util.*;
  import org.apache.ignite.internal.util.future.*;
  import org.apache.ignite.internal.util.typedef.*;
@@@ -1155,9 -1161,15 +1152,6 @@@ public class GridCacheProcessor extend
                              "Eviction max overflow ratio", locAttr.evictMaxOverflowRatio(),
                              rmtAttr.evictMaxOverflowRatio(), true);
  
-                         CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "storeValueBytes",
-                             "Store value bytes", locAttr.storeValueBytes(), rmtAttr.storeValueBytes(), true);
 -                        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "indexingSpiName", "IndexingSpiName",
 -                            locAttr.indexingSpiName(), rmtAttr.indexingSpiName(), true);
 -
 -                        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled",
 -                            "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(), true);
 -
 -                        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled",
 -                            "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(), true);
--
                          if (locAttr.cacheMode() == PARTITIONED) {
                              CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictSynchronized",
                                  "Eviction synchronized", locAttr.evictSynchronized(), rmtAttr.evictSynchronized(),


Mime
View raw message