Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-291
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/677d8d8a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/677d8d8a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/677d8d8a Branch: refs/heads/ignite-471 Commit: 677d8d8a0fa28f3e03159dd9a498eede70d1d068 Parents: f1ab7bc 13edeb4 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Apr 1 12:57:55 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Apr 1 12:57:55 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 21 +- RELEASE_NOTES.txt | 20 +- assembly/dependencies-visor-console.xml | 5 + assembly/libs/README.txt | 1 - examples/pom.xml | 18 +- examples/schema-import/pom.xml | 10 +- .../examples/datagrid/CacheQueryExample.java | 12 +- modules/aop/pom.xml | 8 +- modules/aws/pom.xml | 6 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +- modules/clients/pom.xml | 12 +- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../rest/AbstractRestProcessorSelfTest.java | 11 +- .../JettyRestProcessorAbstractSelfTest.java | 5 - modules/codegen/pom.xml | 6 +- modules/core/pom.xml | 11 +- .../java/org/apache/ignite/IgniteCache.java | 4 +- .../configuration/CacheConfiguration.java | 23 + .../org/apache/ignite/events/CacheEvent.java | 25 +- .../ignite/events/CacheRebalancingEvent.java | 26 +- .../org/apache/ignite/events/EventType.java | 135 ++- .../ignite/internal/GridCachePluginContext.java | 72 ++ .../ignite/internal/GridKernalContextImpl.java | 17 +- .../org/apache/ignite/internal/IgniteEx.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 12 +- .../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 | 7 +- .../swapspace/GridSwapSpaceManager.java | 6 +- .../cache/CacheConflictResolutionManager.java | 30 + .../internal/processors/cache/CacheFlag.java | 108 --- .../processors/cache/CacheFlagException.java | 67 -- .../cache/CacheOsConflictResolutionManager.java | 58 ++ .../processors/cache/CacheProjection.java | 239 +----- .../internal/processors/cache/GridCache.java | 3 - .../processors/cache/GridCacheAdapter.java | 283 ++---- .../cache/GridCacheConcurrentMap.java | 44 +- .../processors/cache/GridCacheContext.java | 256 +----- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 91 +- .../processors/cache/GridCacheProjectionEx.java | 29 - .../cache/GridCacheProjectionImpl.java | 363 ++------ .../processors/cache/GridCacheProxyImpl.java | 61 +- .../cache/GridCacheSharedContext.java | 21 - .../processors/cache/GridCacheUtils.java | 44 +- .../processors/cache/IgniteCacheProxy.java | 35 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../dht/GridClientPartitionTopology.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 101 ++- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopology.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 20 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 32 - .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +- .../dht/colocated/GridDhtColocatedCache.java | 2 - .../colocated/GridDhtDetachedCacheEntry.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 16 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java | 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 +++ .../cache/dr/os/GridOsCacheDrManager.java | 111 --- .../local/atomic/GridLocalAtomicCache.java | 74 +- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../continuous/CacheContinuousQueryHandler.java | 5 - .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 19 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../version/CacheVersionConflictResolver.java | 40 + ...ridCacheVersionAbstractConflictResolver.java | 56 -- .../GridCacheVersionConflictResolver.java | 59 -- .../datastreamer/DataStreamerImpl.java | 2 +- .../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/plugin/CachePluginManager.java | 107 +++ .../processors/query/GridQueryIndexing.java | 3 +- .../processors/query/GridQueryProcessor.java | 22 +- .../handlers/cache/GridCacheCommandHandler.java | 66 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 14 + .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheStoreConfiguration.java | 18 +- .../visor/event/VisorGridEventsLost.java | 7 +- .../event/VisorGridSecuritySessionEvent.java | 91 -- .../ignite/lang/IgniteProductVersion.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 8 +- .../optimized/OptimizedMarshallerUtils.java | 11 +- .../ignite/plugin/CachePluginConfiguration.java | 33 + .../ignite/plugin/CachePluginContext.java | 54 ++ .../ignite/plugin/CachePluginProvider.java | 83 ++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../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 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 9 + .../ignite/IgniteCacheAffinitySelfTest.java | 45 +- ...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 - .../cache/GridCacheEntryVersionSelfTest.java | 4 +- .../GridCacheExAbstractFullApiSelfTest.java | 10 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 4 +- .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../cache/GridCacheLuceneQueryIndexTest.java | 20 +- .../cache/GridCacheMemoryModeSelfTest.java | 40 +- .../cache/GridCacheOffHeapSelfTest.java | 662 -------------- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 8 +- .../cache/GridCachePutAllFailoverSelfTest.java | 26 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 19 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 36 +- .../cache/GridCacheSwapPreloadSelfTest.java | 16 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 104 ++- ...heValueConsistencyTransactionalSelfTest.java | 2 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 19 +- .../cache/IgniteCacheInvokeAbstractTest.java | 11 - .../IgniteClientAffinityAssignmentSelfTest.java | 103 ++- .../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 20 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- .../GridCacheClientModesAbstractSelfTest.java | 6 +- .../distributed/GridCacheEventAbstractTest.java | 279 +++--- .../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 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 8 - .../distributed/dht/GridCacheDhtTestUtils.java | 10 - ...itionedTxOriginatingNodeFailureSelfTest.java | 17 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 52 ++ ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 + ...idCacheAtomicReplicatedFailoverSelfTest.java | 32 + ...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 + ...GridCacheValueConsistencyAtomicSelfTest.java | 103 +-- .../near/GridCacheNearEvictionSelfTest.java | 2 +- .../near/GridCacheNearMetricsSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 2 +- .../near/GridCacheNearOneNodeSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 26 +- .../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 | 2 +- .../eviction/GridCacheEvictionAbstractTest.java | 6 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 22 +- .../DataStreamProcessorSelfTest.java | 8 +- .../processors/igfs/IgfsAbstractSelfTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsDualAbstractSelfTest.java | 2 +- .../processors/igfs/IgfsProcessorSelfTest.java | 8 +- .../processors/igfs/IgfsSizeSelfTest.java | 10 +- .../processors/igfs/IgfsStreamsSelfTest.java | 7 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 5 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 17 + .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../OptimizedMarshallerNodeFailoverTest.java | 71 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../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 | 83 +- .../junits/spi/GridSpiAbstractTest.java | 13 +- .../IgniteCacheFailoverTestSuite.java | 17 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/extdata/p2p/pom.xml | 6 +- modules/extdata/uri/pom.xml | 6 +- modules/geospatial/README.txt | 15 + modules/geospatial/pom.xml | 6 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 14 +- modules/hadoop/pom.xml | 10 +- .../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 | 8 +- modules/indexing/pom.xml | 6 +- .../processors/query/h2/IgniteH2Indexing.java | 50 +- .../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 +- .../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 | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 16 +- ...CacheOffheapTieredMultithreadedSelfTest.java | 319 +++++++ .../cache/IgniteCacheQueryLoadSelfTest.java | 26 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 79 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 7 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 16 +- .../query/h2/GridH2IndexRebuildTest.java | 66 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 8 +- .../query/h2/sql/IgniteVsH2QueryTest.java | 853 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 5 +- modules/jcl/pom.xml | 6 +- modules/jta/pom.xml | 6 +- .../processors/cache/jta/CacheJtaManager.java | 1 - modules/log4j/pom.xml | 6 +- modules/rest-http/pom.xml | 4 +- modules/scalar/pom.xml | 12 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 - modules/schedule/README.txt | 15 + modules/schedule/pom.xml | 6 +- modules/schema-import/pom.xml | 4 +- modules/slf4j/pom.xml | 4 +- modules/spring/pom.xml | 10 +- modules/ssh/pom.xml | 10 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 8 +- modules/visor-console/pom.xml | 10 +- .../ignite/visor/commands/VisorConsole.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 +- modules/visor-plugins/pom.xml | 4 +- modules/web/pom.xml | 10 +- modules/yardstick/pom.xml | 8 +- parent/pom.xml | 41 +- pom.xml | 30 +- 308 files changed, 5698 insertions(+), 5074 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677d8d8a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677d8d8a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677d8d8a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/677d8d8a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ----------------------------------------------------------------------
