Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/238e124b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/238e124b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/238e124b Branch: refs/heads/ignite-639 Commit: 238e124b8d304588d08613c8612022cf859e6ad0 Parents: a397712 ddb8e91 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 2 17:23:12 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 2 17:23:12 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 + examples/pom.xml | 19 +- examples/schema-import/pom.xml | 10 +- .../examples/datagrid/CacheQueryExample.java | 12 +- ipc/shmem/README.txt | 2 +- modules/aop/pom.xml | 6 +- modules/aws/pom.xml | 4 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +- modules/clients/pom.xml | 10 +- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- modules/codegen/pom.xml | 4 +- modules/core/pom.xml | 8 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +- .../configuration/CacheConfiguration.java | 23 ++ .../configuration/FileSystemConfiguration.java | 6 + .../ignite/internal/GridCachePluginContext.java | 72 ++++ .../ignite/internal/GridKernalContextImpl.java | 17 +- .../org/apache/ignite/internal/IgniteEx.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 17 +- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++++- .../internal/client/GridClientCacheFlag.java | 13 - .../impl/connection/GridClientConnection.java | 9 - .../internal/managers/GridManagerAdapter.java | 4 + .../cache/CacheConflictResolutionManager.java | 30 ++ .../internal/processors/cache/CacheFlag.java | 108 ------ .../processors/cache/CacheFlagException.java | 67 ---- .../cache/CacheObjectByteArrayImpl.java | 2 +- .../processors/cache/CacheObjectContext.java | 14 +- .../processors/cache/CacheObjectImpl.java | 10 +- .../cache/CacheOsConflictResolutionManager.java | 58 +++ .../processors/cache/CacheProjection.java | 233 +----------- .../cache/DynamicCacheDescriptor.java | 2 +- .../internal/processors/cache/GridCache.java | 3 - .../processors/cache/GridCacheAdapter.java | 275 +++----------- .../cache/GridCacheConcurrentMap.java | 44 +-- .../processors/cache/GridCacheContext.java | 256 ++----------- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 29 +- .../processors/cache/GridCacheProcessor.java | 132 ++++--- .../processors/cache/GridCacheProjectionEx.java | 29 -- .../cache/GridCacheProjectionImpl.java | 357 +++---------------- .../processors/cache/GridCacheProxyImpl.java | 55 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/GridCacheUtils.java | 39 ++ .../processors/cache/IgniteCacheProxy.java | 31 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../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 +- .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 9 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java | 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../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 | 16 +- .../continuous/CacheContinuousQueryHandler.java | 5 - .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 30 +- .../transactions/IgniteTransactionsImpl.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 19 +- .../cache/transactions/IgniteTxManager.java | 2 - .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 --- .../GridCacheVersionConflictResolver.java | 59 --- .../IgniteCacheObjectProcessorImpl.java | 173 +++++---- .../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/igfs/IgfsDataManager.java | 11 +- .../processors/igfs/IgfsFileAffinityRange.java | 23 +- .../processors/igfs/IgfsHelperImpl.java | 3 +- .../processors/plugin/CachePluginManager.java | 107 ++++++ .../handlers/cache/GridCacheCommandHandler.java | 66 ++-- .../ignite/internal/util/IgniteUtils.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 81 ++--- .../cache/VisorCacheNearConfiguration.java | 11 +- .../visor/node/VisorGridConfiguration.java | 28 +- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../ignite/marshaller/MarshallerContext.java | 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 36 ++ .../ignite/plugin/CachePluginContext.java | 54 +++ .../ignite/plugin/CachePluginProvider.java | 84 +++++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 5 + .../communication/tcp/TcpCommunicationSpi.java | 13 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 21 +- .../ignite/startup/BasicWarmupClosure.java | 2 +- .../resources/META-INF/classnames.properties | 79 ++-- .../ignite/IgniteCacheAffinitySelfTest.java | 2 + ...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +- .../GridProjectionForCachesSelfTest.java | 12 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 9 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../cache/GridCacheAbstractFlagsTest.java | 97 ----- .../cache/GridCacheAbstractFullApiSelfTest.java | 61 +++- .../cache/GridCacheMemoryModeSelfTest.java | 12 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +- .../cache/GridCachePutAllFailoverSelfTest.java | 26 +- .../GridCacheReturnValueTransferSelfTest.java | 36 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++ ...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++ ...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++ ...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++ .../cache/IgniteCacheAtomicStoreValueTest.java | 55 +++ .../cache/IgniteCacheInvokeAbstractTest.java | 11 - .../IgniteCacheStoreValueAbstractTest.java | 311 ++++++++++++++++ .../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++ .../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++ .../cache/IgniteCacheTxStoreValueTest.java | 49 +++ ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- .../IgniteCacheSystemTransactionsSelfTest.java | 38 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 101 ------ .../near/GridCachePartitionedFlagsTest.java | 41 --- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridCacheReplicatedFlagsTest.java | 28 -- ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++ ...IgniteCacheStoreNodeRestartAbstractTest.java | 116 ++++++ ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 5 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../OptimizedMarshallerNodeFailoverTest.java | 71 +++- .../OptimizedObjectStreamSelfTest.java | 4 - .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/GridSpiTestContext.java | 18 +- .../testframework/junits/GridAbstractTest.java | 28 +- .../junits/GridTestKernalContext.java | 2 +- .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 2 +- .../junits/spi/GridSpiAbstractTest.java | 13 +- .../IgniteCacheFailoverTestSuite.java | 8 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 12 +- modules/extdata/p2p/pom.xml | 4 +- modules/extdata/uri/pom.xml | 4 +- modules/geospatial/pom.xml | 4 +- modules/hadoop/pom.xml | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- modules/hibernate/pom.xml | 6 +- .../hibernate/CacheHibernateBlobStore.java | 9 +- .../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++ .../testsuites/IgniteHibernateTestSuite.java | 2 + modules/indexing/pom.xml | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- modules/jcl/pom.xml | 4 +- modules/jta/pom.xml | 4 +- .../processors/cache/jta/CacheJtaManager.java | 1 - modules/log4j/pom.xml | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 10 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 -- modules/schedule/pom.xml | 4 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 8 +- modules/ssh/pom.xml | 8 +- .../ant/beautifier/GridJavadocAntTask.java | 8 +- modules/urideploy/pom.xml | 6 +- .../GridUriDeploymentFileResourceLoader.java | 2 +- modules/visor-console/pom.xml | 8 +- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala | 24 +- .../commands/tasks/VisorTasksCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- modules/yardstick/pom.xml | 6 +- parent/pom.xml | 48 +-- pom.xml | 56 +-- 200 files changed, 2794 insertions(+), 2894 deletions(-) ----------------------------------------------------------------------
