Merge branch 'ignite-sprint-3' into ignite-661
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ebce53f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebce53f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebce53f1 Branch: refs/heads/ignite-661 Commit: ebce53f192b24fab649bb4f629f4d0de39a7017a Parents: b0186fc 71439bc Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Apr 8 16:57:10 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Apr 8 16:57:10 2015 +0300 ---------------------------------------------------------------------- .gitignore | 2 +- DEVNOTES.txt | 27 +- assembly/release-fabric.xml | 5 - bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 +- examples/README.txt | 11 +- examples/config/example-ignite.xml | 2 +- examples/pom-standalone.xml | 17 +- examples/pom.xml | 105 +- examples/schema-import/bin/db-init.sql | 17 + examples/schema-import/pom.xml | 11 +- .../examples/datagrid/CacheQueryExample.java | 12 +- .../streaming/StreamTransformerExample.java | 100 + .../streaming/StreamVisitorExample.java | 171 + .../streaming/marketdata/CacheConfig.java | 44 - .../streaming/marketdata/Instrument.java | 106 - .../marketdata/QueryTopInstruments.java | 73 - .../streaming/marketdata/StreamMarketData.java | 103 - .../examples/streaming/numbers/CacheConfig.java | 46 - .../streaming/numbers/QueryPopularNumbers.java | 74 - .../streaming/numbers/StreamRandomNumbers.java | 78 - .../streaming/wordcount/CacheConfig.java | 48 + .../streaming/wordcount/QueryWords.java | 77 + .../streaming/wordcount/StreamWords.java | 68 + .../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++ .../streaming/wordcount/package-info.java | 22 + .../streaming/StreamTransformerExample.java | 97 + .../java8/streaming/StreamVisitorExample.java | 168 + .../java8/streaming/marketdata/CacheConfig.java | 44 - .../java8/streaming/marketdata/Instrument.java | 106 - .../marketdata/QueryTopInstruments.java | 73 - .../streaming/marketdata/StreamMarketData.java | 101 - .../java8/streaming/numbers/CacheConfig.java | 46 - .../streaming/numbers/QueryPopularNumbers.java | 74 - .../streaming/numbers/StreamRandomNumbers.java | 74 - 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 +- modules/clients/readme.md | 2 - .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../rest/AbstractRestProcessorSelfTest.java | 11 +- .../JettyRestProcessorAbstractSelfTest.java | 5 - modules/codegen/pom.xml | 15 +- modules/core/pom.xml | 94 +- .../src/main/java/org/apache/ignite/Ignite.java | 15 + .../java/org/apache/ignite/IgniteCache.java | 4 +- .../apache/ignite/cache/CacheTypeMetadata.java | 4 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../ignite/cache/affinity/AffinityUuid.java | 50 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 58 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 16 + .../store/jdbc/CacheAbstractJdbcStore.java | 106 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +- .../configuration/CacheConfiguration.java | 57 +- .../configuration/FileSystemConfiguration.java | 6 + .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../ignite/internal/GridCachePluginContext.java | 78 + .../apache/ignite/internal/GridComponent.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 20 +- .../ignite/internal/GridPluginComponent.java | 4 +- .../org/apache/ignite/internal/IgniteEx.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 88 +- .../ignite/internal/IgniteNodeAttributes.java | 3 - .../org/apache/ignite/internal/IgnitionEx.java | 177 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 +- .../internal/client/GridClientCacheFlag.java | 13 - .../impl/connection/GridClientConnection.java | 9 - .../internal/cluster/ClusterGroupAdapter.java | 3 +- .../internal/managers/GridManagerAdapter.java | 44 +- .../processors/GridProcessorAdapter.java | 2 +- .../cache/CacheConflictResolutionManager.java | 30 + .../processors/cache/CacheDistributionMode.java | 67 - .../cache/CacheEvictableEntryImpl.java | 11 +- .../internal/processors/cache/CacheFlag.java | 108 - .../processors/cache/CacheFlagException.java | 67 - .../processors/cache/CacheLazyEntry.java | 10 +- .../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 +- .../internal/processors/cache/CacheType.java | 77 + .../cache/DynamicCacheChangeRequest.java | 34 + .../cache/DynamicCacheDescriptor.java | 32 +- .../internal/processors/cache/GridCache.java | 3 - .../processors/cache/GridCacheAdapter.java | 567 +-- .../processors/cache/GridCacheAttributes.java | 8 - .../cache/GridCacheConcurrentMap.java | 78 +- .../processors/cache/GridCacheContext.java | 291 +- .../cache/GridCacheDeploymentManager.java | 9 +- .../processors/cache/GridCacheEntryEx.java | 58 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 317 +- .../cache/GridCacheMapEntryFactory.java | 2 - .../processors/cache/GridCachePeekMode.java | 81 - .../processors/cache/GridCacheProcessor.java | 640 ++- .../processors/cache/GridCacheProjectionEx.java | 29 - .../cache/GridCacheProjectionImpl.java | 370 +- .../processors/cache/GridCacheProxyImpl.java | 85 +- .../cache/GridCacheSharedContext.java | 25 +- .../processors/cache/GridCacheStoreManager.java | 1202 ------ .../processors/cache/GridCacheUtils.java | 55 +- .../cache/GridCacheWriteBehindStore.java | 1015 ----- .../processors/cache/IgniteCacheProxy.java | 35 +- .../processors/cache/KeyCacheObjectImpl.java | 13 +- .../CacheDataStructuresManager.java | 4 +- .../distributed/GridDistributedCacheEntry.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 33 +- .../distributed/dht/GridDhtCacheEntry.java | 8 +- .../distributed/dht/GridDhtLocalPartition.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 14 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 51 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../distributed/dht/GridNoStorageCacheMap.java | 11 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 72 +- .../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 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 91 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../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 | 34 +- .../continuous/CacheContinuousQueryHandler.java | 9 +- .../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 | 18 +- .../cache/transactions/IgniteTxAdapter.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 60 +- .../cache/transactions/IgniteTxManager.java | 20 +- .../version/CacheVersionConflictResolver.java | 40 + ...ridCacheVersionAbstractConflictResolver.java | 56 - .../GridCacheVersionConflictResolver.java | 59 - .../cacheobject/IgniteCacheObjectProcessor.java | 17 +- .../IgniteCacheObjectProcessorImpl.java | 199 +- .../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 +- .../DiscoveryNodeValidationProcessor.java | 27 + .../OsDiscoveryNodeValidationProcessor.java | 72 + .../processors/plugin/CachePluginManager.java | 142 + .../processors/query/GridQueryProcessor.java | 155 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../handlers/cache/GridCacheCommandHandler.java | 66 +- .../processors/task/GridTaskProcessor.java | 31 +- .../ignite/internal/util/IgniteUtils.java | 48 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +- .../ignite/internal/util/lang/GridFunc.java | 33 + .../ignite/internal/visor/cache/VisorCache.java | 21 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheConfiguration.java | 94 +- .../VisorCacheConfigurationCollectorJob.java | 76 + .../VisorCacheConfigurationCollectorTask.java | 39 + .../cache/VisorCacheDefaultConfiguration.java | 21 - .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheMetricsCollectorTask.java | 59 +- .../cache/VisorCacheNearConfiguration.java | 11 +- .../visor/cache/VisorCacheStopTask.java | 69 + .../cache/VisorCacheStoreConfiguration.java | 18 +- .../VisorIgfsProfilerUniformityCounters.java | 6 +- .../internal/visor/log/VisorLogSearchTask.java | 3 +- .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorIgfsConfiguration.java | 2 +- .../visor/node/VisorRestConfiguration.java | 1 + .../visor/query/VisorQueryNextPageTask.java | 5 +- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 21 +- .../org/apache/ignite/lang/IgniteImmutable.java | 49 - .../ignite/marshaller/MarshallerContext.java | 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 36 + .../ignite/plugin/CachePluginContext.java | 65 + .../ignite/plugin/CachePluginProvider.java | 84 + .../org/apache/ignite/plugin/PluginContext.java | 9 +- .../ignite/spi/IgniteNodeValidationResult.java | 66 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 49 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 7 +- .../spi/IgniteSpiNodeValidationResult.java | 66 - .../communication/tcp/TcpCommunicationSpi.java | 27 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 198 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 2 +- .../org/apache/ignite/stream/StreamVisitor.java | 2 +- .../resources/META-INF/classnames.properties | 97 +- .../ignite/IgniteCacheAffinitySelfTest.java | 52 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +- .../GridProjectionForCachesSelfTest.java | 12 +- .../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 +- .../cache/GridCacheOffHeapSelfTest.java | 662 ---- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 130 +- .../cache/GridCachePartitionedWritesTest.java | 3 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../cache/GridCachePutAllFailoverSelfTest.java | 26 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 19 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 37 +- .../cache/GridCacheSwapPreloadSelfTest.java | 16 +- .../processors/cache/GridCacheTestEntryEx.java | 42 +- ...idCacheValueConsistencyAbstractSelfTest.java | 59 +- ...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 + ...eCacheConfigurationTemplateNotFoundTest.java | 114 + .../IgniteCacheConfigurationTemplateTest.java | 364 ++ .../IgniteCacheContainsKeyAbstractSelfTest.java | 15 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 19 +- .../cache/IgniteCacheInvokeAbstractTest.java | 11 - .../IgniteCacheStoreValueAbstractTest.java | 495 +++ .../cache/IgniteCacheTxLocalStoreValueTest.java | 49 + .../IgniteCacheTxNearEnabledStoreValueTest.java | 30 + .../cache/IgniteCacheTxStoreValueTest.java | 49 + .../IgniteClientAffinityAssignmentSelfTest.java | 4 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 70 +- .../cache/IgniteInternalCacheTypesTest.java | 159 + .../cache/IgnitePutAllLargeBatchSelfTest.java | 16 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 5 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 20 +- .../IgniteCollectionAbstractTest.java | 23 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- .../GridCacheClientModesAbstractSelfTest.java | 6 +- .../distributed/GridCacheEventAbstractTest.java | 279 +- .../GridCacheNodeFailureAbstractTest.java | 8 - ...GridCachePreloadRestartAbstractSelfTest.java | 9 - .../IgniteCacheSystemTransactionsSelfTest.java | 37 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 4 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 4 +- .../IgniteTxTimeoutAbstractTest.java | 8 - ...heAbstractTransformWriteThroughSelfTest.java | 2 +- .../dht/GridCacheColocatedFailoverSelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 16 +- .../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 + ...GridCacheValueConsistencyAtomicSelfTest.java | 101 - .../near/GridCacheNearEvictionSelfTest.java | 4 +- .../near/GridCacheNearMetricsSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 105 +- .../near/GridCacheNearOneNodeSelfTest.java | 35 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 26 +- .../near/GridCacheNearReadersSelfTest.java | 154 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 118 +- .../GridCachePartitionedFailoverSelfTest.java | 2 +- ...GridCachePartitionedFilteredPutSelfTest.java | 5 +- .../near/GridCachePartitionedFlagsTest.java | 41 - .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 8 - ...achePartitionedMultiNodeFullApiSelfTest.java | 70 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +- ...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +- ...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 | 11 +- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ++ .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +- ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 + ...IgniteCacheStoreNodeRestartAbstractTest.java | 116 + .../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 26 +- ...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/IgfsStartCacheTest.java | 158 + .../processors/igfs/IgfsStreamsSelfTest.java | 7 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 5 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 17 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 2 +- .../OptimizedMarshallerNodeFailoverTest.java | 71 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../ignite/messaging/GridMessagingSelfTest.java | 50 + .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/GridSpiTestContext.java | 20 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../testframework/junits/GridAbstractTest.java | 28 +- .../junits/GridTestKernalContext.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 10 + .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 127 +- .../junits/spi/GridSpiAbstractTest.java | 13 +- .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 17 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 20 +- .../IgniteCacheWriteBehindTestSuite.java | 3 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 23 +- modules/extdata/uri/pom.xml | 25 +- 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 | 8 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +- 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 | 4 +- .../processors/query/h2/sql/GridSqlElement.java | 8 - .../processors/query/h2/sql/GridSqlQuery.java | 183 + .../query/h2/sql/GridSqlQueryParser.java | 97 +- .../query/h2/sql/GridSqlQuerySplitter.java | 133 +- .../processors/query/h2/sql/GridSqlSelect.java | 209 +- .../query/h2/sql/GridSqlSubquery.java | 8 +- .../processors/query/h2/sql/GridSqlUnion.java | 134 + .../query/h2/twostep/GridMapQueryExecutor.java | 88 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../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 | 30 +- .../cache/IgniteCacheQueryLoadSelfTest.java | 26 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 37 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 7 +- ...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +- .../near/IgniteCacheAtomicQuerySelfTest.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 +- .../query/h2/sql/GridQueryParsingTest.java | 27 +- .../query/h2/sql/IgniteVsH2QueryTest.java | 875 ++++ .../IgniteCacheQuerySelfTestSuite.java | 3 + .../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/pom.xml | 36 +- modules/schema-import/pom.xml | 14 +- modules/slf4j/pom.xml | 14 +- modules/spring/pom.xml | 20 +- .../org/apache/ignite/IgniteSpringBean.java | 14 + 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/VisorCacheClearCommand.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 433 +- .../commands/cache/VisorCacheStopCommand.scala | 145 + .../config/VisorConfigurationCommand.scala | 15 +- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala | 24 +- .../visor/commands/gc/VisorGcCommand.scala | 15 +- .../commands/start/VisorStartCommand.scala | 17 +- .../commands/tasks/VisorTasksCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 44 +- modules/visor-plugins/pom.xml | 14 +- modules/web/pom.xml | 26 +- modules/yardstick/README.md | 3 +- .../yardstick/config/benchmark-store.properties | 5 +- modules/yardstick/pom.xml | 22 +- .../yardstick/IgniteAbstractBenchmark.java | 5 +- .../yardstick/IgniteBenchmarkArguments.java | 22 +- .../org/apache/ignite/yardstick/IgniteNode.java | 11 +- parent/pom.xml | 709 ++++ pom.xml | 1337 ++----- scripts/git-apply-patch.sh | 94 + scripts/git-format-patch.sh | 87 + scripts/git-patch-functions.sh | 171 + scripts/git-patch-prop.sh | 24 + 506 files changed, 21461 insertions(+), 13829 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebce53f1/modules/urideploy/pom.xml ----------------------------------------------------------------------
