Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-560
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.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/e96dd28e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e96dd28e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e96dd28e
Branch: refs/heads/ignite-560
Commit: e96dd28efacd0685715474ba6cc0a01e0887e03c
Parents: 91ef369 ea777d4
Author: sboikov <[email protected]>
Authored: Fri Apr 3 17:47:13 2015 +0300
Committer: sboikov <[email protected]>
Committed: Fri Apr 3 17:47:13 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 36 +-
RELEASE_NOTES.txt | 20 +-
assembly/dependencies-visor-console.xml | 5 +
assembly/libs/README.txt | 1 -
examples/pom-standalone.xml | 17 +-
examples/pom.xml | 105 +-
examples/schema-import/pom.xml | 11 +-
.../java/org/apache/ignite/schema/Demo.java | 2 +-
.../examples/datagrid/CacheQueryExample.java | 24 +-
.../datagrid/CacheTransactionExample.java | 6 +-
.../starschema/CacheStarSchemaExample.java | 5 +-
.../store/dummy/CacheDummyStoreExample.java | 5 +-
.../hibernate/CacheHibernateStoreExample.java | 2 +-
.../store/jdbc/CacheJdbcStoreExample.java | 2 +-
.../misc/schedule/ComputeScheduleExample.java | 2 +-
.../misc/schedule/ComputeScheduleExample.java | 6 +-
.../examples/ScalarCacheAffinityExample.scala | 8 +-
.../scalar/examples/ScalarCacheExample.scala | 4 +-
.../ScalarCachePopularNumbersExample.scala | 6 +-
.../examples/ScalarCacheQueryExample.scala | 2 +-
.../scalar/examples/ScalarClosureExample.scala | 5 +-
.../examples/ScalarContinuationExample.scala | 7 +-
.../examples/ScalarCreditRiskExample.scala | 5 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 2 +-
.../scalar/examples/ScalarPingPongExample.scala | 5 +-
.../scalar/examples/ScalarPrimeExample.scala | 4 +-
.../scalar/examples/ScalarScheduleExample.scala | 5 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 4 +-
.../scalar/examples/ScalarTaskExample.scala | 5 +-
.../examples/ScalarWorldShortestMapReduce.scala | 5 +-
ipc/shmem/README.txt | 2 +-
modules/aop/pom.xml | 25 +-
modules/aws/pom.xml | 43 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-
modules/clients/pom.xml | 43 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../rest/AbstractRestProcessorSelfTest.java | 11 +-
.../JettyRestProcessorAbstractSelfTest.java | 5 -
modules/codegen/pom.xml | 15 +-
modules/core/pom.xml | 88 +-
.../src/main/java/org/apache/ignite/Ignite.java | 84 +-
.../java/org/apache/ignite/IgniteCache.java | 63 +-
.../java/org/apache/ignite/IgniteCluster.java | 4 +-
.../java/org/apache/ignite/IgniteCompute.java | 161 +--
.../java/org/apache/ignite/IgniteEvents.java | 60 +-
.../java/org/apache/ignite/IgniteMessaging.java | 56 +-
.../java/org/apache/ignite/IgniteServices.java | 40 +-
.../org/apache/ignite/IgniteTransactions.java | 26 +-
.../apache/ignite/cache/CacheInterceptor.java | 3 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../apache/ignite/cache/affinity/Affinity.java | 49 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 180 ++-
.../org/apache/ignite/cluster/ClusterNode.java | 49 +-
.../cluster/ClusterTopologyException.java | 2 +-
.../configuration/CacheConfiguration.java | 57 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../configuration/IgniteConfiguration.java | 32 +-
.../org/apache/ignite/events/CacheEvent.java | 25 +-
.../ignite/events/CacheRebalancingEvent.java | 26 +-
.../org/apache/ignite/events/EventType.java | 135 +-
.../ignite/internal/GridCachePluginContext.java | 78 ++
.../ignite/internal/GridKernalContextImpl.java | 17 +-
.../ignite/internal/IgniteComponentType.java | 7 +
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 17 +-
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../internal/MarshallerContextAdapter.java | 11 +-
.../ignite/internal/MarshallerContextImpl.java | 151 ++-
.../internal/client/GridClientCacheFlag.java | 13 -
.../impl/connection/GridClientConnection.java | 9 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../discovery/GridDiscoveryManager.java | 10 +-
.../swapspace/GridSwapSpaceManager.java | 6 +-
.../cache/CacheConflictResolutionManager.java | 30 +
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../internal/processors/cache/CacheFlag.java | 108 --
.../processors/cache/CacheFlagException.java | 67 -
.../processors/cache/CacheMetricsImpl.java | 1 +
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectContext.java | 14 +-
.../processors/cache/CacheObjectImpl.java | 10 +-
.../cache/CacheOsConflictResolutionManager.java | 58 +
.../processors/cache/CacheProjection.java | 275 +---
.../cache/CacheStorePartialUpdateException.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 2 +-
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 561 +-------
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 78 +-
.../processors/cache/GridCacheContext.java | 265 +---
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 59 +-
.../processors/cache/GridCacheMapEntry.java | 352 ++---
.../cache/GridCacheMapEntryFactory.java | 2 -
.../GridCachePartitionExchangeManager.java | 2 +-
.../processors/cache/GridCachePeekMode.java | 81 --
.../processors/cache/GridCacheProcessor.java | 195 +--
.../processors/cache/GridCacheProjectionEx.java | 29 -
.../cache/GridCacheProjectionImpl.java | 370 +-----
.../processors/cache/GridCacheProxyImpl.java | 85 +-
.../cache/GridCacheSharedContext.java | 21 -
.../processors/cache/GridCacheStoreManager.java | 1202 -----------------
.../processors/cache/GridCacheUtils.java | 55 +-
.../cache/GridCacheWriteBehindStore.java | 1015 ---------------
.../processors/cache/IgniteCacheProxy.java | 35 +-
.../CacheDataStructuresManager.java | 4 +-
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 18 +-
.../GridFutureRemapTimeoutObject.java | 73 ++
.../dht/GridClientPartitionTopology.java | 10 +-
.../distributed/dht/GridDhtCacheAdapter.java | 33 +-
.../distributed/dht/GridDhtCacheEntry.java | 8 +-
.../distributed/dht/GridDhtLocalPartition.java | 105 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../dht/GridDhtPartitionTopology.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 20 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/GridPartitionedGetFuture.java | 27 +-
.../dht/atomic/GridDhtAtomicCache.java | 75 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +-
.../dht/colocated/GridDhtColocatedCache.java | 37 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtDetachedCacheEntry.java | 7 +-
.../preloader/GridDhtPartitionDemandPool.java | 18 +-
.../distributed/near/GridNearAtomicCache.java | 7 +-
.../distributed/near/GridNearCacheAdapter.java | 91 +-
.../distributed/near/GridNearCacheEntry.java | 26 +-
.../distributed/near/GridNearGetFuture.java | 78 +-
.../distributed/near/GridNearLockFuture.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 -
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../near/GridNearTxPrepareFuture.java | 4 +-
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 ++
.../cache/dr/os/GridOsCacheDrManager.java | 111 --
.../processors/cache/local/GridLocalCache.java | 3 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 81 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../cache/query/GridCacheQueryManager.java | 20 +-
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 30 +-
.../cache/store/CacheOsStoreManager.java | 59 +
.../cache/store/CacheStoreManager.java | 182 +++
.../store/GridCacheStoreManagerAdapter.java | 1111 ++++++++++++++++
.../cache/store/GridCacheWriteBehindStore.java | 1015 +++++++++++++++
.../transactions/IgniteTransactionsImpl.java | 5 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 60 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../version/CacheVersionConflictResolver.java | 40 +
...ridCacheVersionAbstractConflictResolver.java | 56 -
.../GridCacheVersionConflictResolver.java | 59 -
.../cacheobject/IgniteCacheObjectProcessor.java | 14 +-
.../IgniteCacheObjectProcessorImpl.java | 183 ++-
.../datastreamer/DataStreamerImpl.java | 23 +-
.../datastructures/DataStructuresProcessor.java | 13 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +-
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../processors/plugin/CachePluginManager.java | 142 ++
.../processors/query/GridQueryIndexing.java | 3 +-
.../processors/query/GridQueryProcessor.java | 180 +--
.../messages/GridQueryNextPageResponse.java | 34 +-
.../handlers/cache/GridCacheCommandHandler.java | 66 +-
.../service/GridServiceProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 14 +
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 81 +-
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../cache/VisorCacheStoreConfiguration.java | 18 +-
.../visor/event/VisorGridEventsLost.java | 7 +-
.../event/VisorGridSecuritySessionEvent.java | 91 --
.../visor/node/VisorGridConfiguration.java | 28 +-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../org/apache/ignite/lang/IgnitePredicate.java | 3 +-
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 8 +-
.../optimized/OptimizedMarshallerUtils.java | 11 +-
.../ignite/plugin/CachePluginConfiguration.java | 36 +
.../ignite/plugin/CachePluginContext.java | 65 +
.../ignite/plugin/CachePluginProvider.java | 84 ++
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 23 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 13 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
.../spi/swapspace/SwapSpaceSpiListener.java | 3 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../apache/ignite/transactions/Transaction.java | 8 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 9 +
.../resources/META-INF/classnames.properties | 94 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 47 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../GridProjectionForCachesSelfTest.java | 14 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridCacheAbstractFailoverSelfTest.java | 136 +-
.../GridCacheAbstractFailoverTxSelfTest.java | 110 ++
.../cache/GridCacheAbstractFlagsTest.java | 97 --
.../cache/GridCacheAbstractFullApiSelfTest.java | 156 +--
.../cache/GridCacheAbstractMetricsSelfTest.java | 4 +
.../cache/GridCacheAbstractSelfTest.java | 109 +-
.../cache/GridCacheClearLocallySelfTest.java | 81 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 28 -
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheExAbstractFullApiSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 20 +-
.../cache/GridCacheMemoryModeSelfTest.java | 40 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 8 +
.../cache/GridCacheOffHeapSelfTest.java | 662 ----------
.../processors/cache/GridCacheOffHeapTest.java | 4 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 24 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 26 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 19 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../GridCacheReturnValueTransferSelfTest.java | 36 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 30 +-
.../processors/cache/GridCacheTestEntryEx.java | 43 +-
...idCacheValueConsistencyAbstractSelfTest.java | 104 +-
...heValueConsistencyTransactionalSelfTest.java | 2 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 189 ---
.../GridCacheWriteBehindStoreAbstractTest.java | 349 -----
.../GridCacheWriteBehindStoreLocalTest.java | 30 -
...heWriteBehindStoreMultithreadedSelfTest.java | 163 ---
...BehindStorePartitionedMultiNodeSelfTest.java | 215 ---
...ridCacheWriteBehindStorePartitionedTest.java | 30 -
...GridCacheWriteBehindStoreReplicatedTest.java | 30 -
.../GridCacheWriteBehindStoreSelfTest.java | 267 ----
.../IgniteCacheAtomicLocalStoreValueTest.java | 49 +
...iteCacheAtomicNearEnabledStoreValueTest.java | 30 +
...maryWriteOrderNearEnabledStoreValueTest.java | 31 +
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 +
.../cache/IgniteCacheAtomicStoreValueTest.java | 55 +
.../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 19 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
.../IgniteCacheStoreValueAbstractTest.java | 311 +++++
.../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +
.../IgniteCacheTxNearEnabledStoreValueTest.java | 30 +
.../cache/IgniteCacheTxStoreValueTest.java | 49 +
.../IgniteClientAffinityAssignmentSelfTest.java | 103 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 33 +
.../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 20 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
.../GridCacheClientModesAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 287 ++--
.../GridCacheNodeFailureAbstractTest.java | 8 -
...ridCachePartitionNotLoadedEventSelfTest.java | 148 +++
...GridCachePreloadRestartAbstractSelfTest.java | 9 -
.../IgniteCacheSystemTransactionsSelfTest.java | 38 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 4 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
.../IgniteTxTimeoutAbstractTest.java | 8 -
...heAbstractTransformWriteThroughSelfTest.java | 2 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 14 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 8 -
.../distributed/dht/GridCacheDhtTestUtils.java | 12 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 17 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +
...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +
...GridCacheValueConsistencyAtomicSelfTest.java | 103 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCacheNearMetricsSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 105 +-
.../near/GridCacheNearOneNodeSelfTest.java | 35 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 26 +-
.../near/GridCacheNearReadersSelfTest.java | 154 +--
.../GridCachePartitionedFailoverSelfTest.java | 2 +-
...GridCachePartitionedFilteredPutSelfTest.java | 5 +-
.../near/GridCachePartitionedFlagsTest.java | 41 -
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 8 -
...achePartitionedMultiNodeFullApiSelfTest.java | 70 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 2 +-
.../GridCacheReplicatedEvictionSelfTest.java | 8 +-
.../GridCacheReplicatedFailoverSelfTest.java | 2 +-
.../GridCacheReplicatedFlagsTest.java | 28 -
.../GridCacheReplicatedInvalidateSelfTest.java | 13 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +-
.../GridCacheReplicatedPreloadSelfTest.java | 13 +-
.../eviction/GridCacheEvictionAbstractTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 10 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 ++
.../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 22 +-
...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +++
.../GridCacheWriteBehindStoreAbstractTest.java | 350 +++++
.../GridCacheWriteBehindStoreLocalTest.java | 30 +
...heWriteBehindStoreMultithreadedSelfTest.java | 163 +++
...BehindStorePartitionedMultiNodeSelfTest.java | 216 ++++
...ridCacheWriteBehindStorePartitionedTest.java | 30 +
...GridCacheWriteBehindStoreReplicatedTest.java | 30 +
.../GridCacheWriteBehindStoreSelfTest.java | 268 ++++
.../DataStreamProcessorSelfTest.java | 8 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 2 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsDualAbstractSelfTest.java | 2 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 11 +-
.../processors/igfs/IgfsSizeSelfTest.java | 54 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 7 +-
.../processors/igfs/IgsfStartCacheTest.java | 115 ++
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 17 +
.../loadtests/hashmap/GridCacheTestContext.java | 16 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../ignite/messaging/GridMessagingSelfTest.java | 13 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 9 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../testframework/GridSpiTestContext.java | 18 +-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../testframework/junits/GridAbstractTest.java | 28 +-
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/common/GridCommonAbstractTest.java | 127 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +-
.../IgniteCacheFailoverTestSuite.java | 22 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 15 +-
.../IgniteCacheWriteBehindTestSuite.java | 3 +-
modules/extdata/p2p/pom.xml | 23 +-
modules/extdata/uri/pom.xml | 25 +-
modules/geospatial/README.txt | 15 +
modules/geospatial/pom.xml | 43 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 14 +-
modules/hadoop/pom.xml | 38 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../processors/hadoop/HadoopClassLoader.java | 21 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 2 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 11 +-
.../processors/hadoop/v2/HadoopDaemon.java | 125 ++
.../processors/hadoop/v2/HadoopV2Job.java | 58 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 3 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +-
modules/hibernate/README.txt | 15 +
modules/hibernate/pom.xml | 32 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/pom.xml | 43 +-
.../processors/query/h2/IgniteH2Indexing.java | 54 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 +-
.../query/h2/opt/GridH2RowDescriptor.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 31 +-
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 86 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 40 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 52 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 129 +-
.../cache/GridCacheOffHeapSelfTest.java | 624 +++++++++
.../cache/GridCacheQueryMetricsSelfTest.java | 6 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 5 +-
.../processors/cache/GridCacheSwapSelfTest.java | 138 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 16 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 319 +++++
.../cache/IgniteCacheQueryLoadSelfTest.java | 26 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 79 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 7 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 16 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++++++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 +
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 +
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 +
...TtlOffheapTransactionalAbstractSelfTest.java | 29 +
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 +
...OffheapTransactionalPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 +
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 +
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 +
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 +
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 +
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 +
...lOnheapTransactionalPartitionedSelfTest.java | 34 +
.../query/h2/GridH2IndexRebuildTest.java | 66 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 8 +-
.../query/h2/sql/IgniteVsH2QueryTest.java | 853 ++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 5 +-
.../IgniteCacheWithIndexingTestSuite.java | 51 +
.../IgniteH2IndexingSpiTestSuite.java | 7 -
modules/jcl/pom.xml | 16 +-
modules/jta/pom.xml | 30 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
modules/log4j/pom.xml | 16 +-
modules/rest-http/pom.xml | 14 +-
.../http/jetty/GridJettyRestHandler.java | 6 +
modules/scalar/pom.xml | 51 +-
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 -
modules/schedule/README.txt | 15 +
modules/schedule/pom.xml | 16 +-
modules/schema-import/pom.xml | 14 +-
modules/slf4j/pom.xml | 14 +-
modules/spring/pom.xml | 20 +-
modules/ssh/pom.xml | 20 +-
modules/tools/pom.xml | 11 +-
.../ant/beautifier/GridJavadocAntTask.java | 10 +-
modules/urideploy/pom.xml | 52 +-
.../GridUriDeploymentFileResourceLoader.java | 2 +-
modules/visor-console/pom.xml | 24 +-
.../ignite/visor/commands/VisorConsole.scala | 4 +-
.../commands/cache/VisorCacheCommand.scala | 4 +-
.../commands/deploy/VisorDeployCommand.scala | 106 +-
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../commands/start/VisorStartCommand.scala | 17 +-
.../commands/tasks/VisorTasksCommand.scala | 14 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
modules/visor-plugins/pom.xml | 14 +-
modules/web/pom.xml | 26 +-
modules/yardstick/config/ignite-base-config.xml | 2 +
modules/yardstick/pom.xml | 22 +-
parent/pom.xml | 720 +++++++++++
pom.xml | 1220 +++---------------
scripts/git-apply-patch.sh | 88 ++
scripts/git-format-patch.sh | 84 ++
scripts/git-patch-functions.sh | 132 ++
scripts/git-patch-prop.sh | 28 +
473 files changed, 14534 insertions(+), 12221 deletions(-)
----------------------------------------------------------------------
