Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-290
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d6f0945 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d6f0945 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d6f0945 Branch: refs/heads/ignite-141-2 Commit: 7d6f0945f1ca99e618c1f8d8ae00e34f187a6774 Parents: beb3e47 0e7a7ef Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Feb 27 17:11:43 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Feb 27 17:11:43 2015 +0300 ---------------------------------------------------------------------- README.md | 2 - bin/setup-hadoop.sh | 2 +- config/hadoop/default-config.xml | 12 + .../hibernate/example-hibernate-L2-cache.xml | 2 +- examples/pom-standalone.xml | 2 +- .../ComputeFibonacciContinuationExample.java | 17 +- .../examples/datagrid/CacheApiExample.java | 4 +- .../datagrid/CacheContinuousQueryExample.java | 6 +- .../examples/datagrid/CacheQueryExample.java | 2 +- .../IgniteCountDownLatchExample.java | 3 +- .../MessagingPingPongListenActorExample.java | 3 +- .../examples/ScalarContinuationExample.scala | 20 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 10 +- .../internal/client/ClientStartNodeTask.java | 5 +- .../ClientAbstractMultiNodeSelfTest.java | 8 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../processors/rest/RestProcessorTest.java | 8 +- .../processors/rest/TestBinaryClient.java | 1 - .../processors/rest/TestMemcacheClient.java | 13 +- .../protocols/tcp/TcpRestParserSelfTest.java | 2 +- .../CommunicationMessageCodeGenerator.java | 788 ------ .../ignite/codegen/MessageCodeGenerator.java | 832 ++++++ .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../java/org/apache/ignite/IgniteCache.java | 69 + .../java/org/apache/ignite/IgniteCluster.java | 3 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../apache/ignite/IgniteSystemProperties.java | 5 + .../java/org/apache/ignite/cache/GridCache.java | 48 - .../ignite/cache/IgniteEntryProcessor.java | 28 + .../CacheRendezvousAffinityFunction.java | 1 + .../cache/store/jdbc/CacheJdbcPojoStore.java | 28 +- .../ignite/cluster/ClusterNodeLocalMap.java | 60 - .../configuration/QueryConfiguration.java | 37 +- .../org/apache/ignite/events/EventType.java | 8 + .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../IgfsByteDelimiterRecordResolver.java | 1 + .../java/org/apache/ignite/igfs/package.html | 2 +- .../ignite/internal/ClusterGroupAdapter.java | 889 ------ .../apache/ignite/internal/ClusterGroupEx.java | 44 - .../ignite/internal/ClusterMetricsSnapshot.java | 9 +- .../internal/ClusterNodeLocalMapImpl.java | 103 - .../apache/ignite/internal/GridComponent.java | 4 +- .../internal/GridEventConsumeHandler.java | 1 + .../ignite/internal/GridJobCancelRequest.java | 26 +- .../ignite/internal/GridJobExecuteRequest.java | 70 +- .../ignite/internal/GridJobExecuteResponse.java | 34 +- .../ignite/internal/GridJobSiblingsRequest.java | 24 +- .../internal/GridJobSiblingsResponse.java | 22 +- .../ignite/internal/GridKernalContext.java | 16 +- .../ignite/internal/GridKernalContextImpl.java | 23 +- .../apache/ignite/internal/GridKillTask.java | 103 - .../internal/GridMessageListenHandler.java | 1 + .../ignite/internal/GridPluginComponent.java | 2 +- .../ignite/internal/GridTaskCancelRequest.java | 22 +- .../ignite/internal/GridTaskSessionRequest.java | 26 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 261 -- .../ignite/internal/IgniteComputeImpl.java | 1 + .../ignite/internal/IgniteEventsImpl.java | 1 + .../org/apache/ignite/internal/IgniteEx.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 624 +---- .../ignite/internal/IgniteMessagingImpl.java | 1 + .../ignite/internal/IgniteServicesImpl.java | 1 + .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../internal/cluster/ClusterGroupAdapter.java | 866 ++++++ .../ignite/internal/cluster/ClusterGroupEx.java | 44 + .../cluster/ClusterNodeLocalMapImpl.java | 101 + .../cluster/IgniteClusterAsyncImpl.java | 293 ++ .../internal/cluster/IgniteClusterEx.java | 27 + .../internal/cluster/IgniteClusterImpl.java | 527 ++++ .../ignite/internal/cluster/IgniteKillTask.java | 103 + .../internal/direct/DirectByteBufferStream.java | 44 +- .../internal/direct/DirectMessageReader.java | 33 +- .../internal/direct/DirectMessageWriter.java | 23 +- .../direct/DirectMessageWriterState.java | 13 +- .../internal/events/DiscoveryCustomEvent.java | 68 + .../internal/executor/GridExecutorService.java | 1 + .../igfs/common/IgfsControlResponse.java | 1 + .../internal/igfs/common/IgfsMarshaller.java | 1 + .../internal/managers/GridManagerAdapter.java | 11 +- .../checkpoint/GridCheckpointRequest.java | 26 +- .../managers/communication/GridIoManager.java | 30 +- .../managers/communication/GridIoMessage.java | 38 +- .../communication/GridIoMessageFactory.java | 33 +- .../communication/GridIoUserMessage.java | 38 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../deployment/GridDeploymentInfoBean.java | 35 +- .../deployment/GridDeploymentRequest.java | 34 +- .../deployment/GridDeploymentResponse.java | 26 +- .../discovery/GridDiscoveryManager.java | 109 +- .../eventstorage/GridEventStorageMessage.java | 42 +- .../processors/GridProcessorAdapter.java | 2 +- .../affinity/GridAffinityMessage.java | 1 + .../processors/cache/CacheProjection.java | 24 +- .../processors/cache/GridCacheAdapter.java | 229 +- .../processors/cache/GridCacheContext.java | 19 +- .../processors/cache/GridCacheEntryEx.java | 16 +- .../processors/cache/GridCacheEntryInfo.java | 5 +- .../cache/GridCacheEvictionManager.java | 21 +- .../cache/GridCacheEvictionRequest.java | 26 +- .../cache/GridCacheEvictionResponse.java | 30 +- .../processors/cache/GridCacheMapEntry.java | 642 +++-- .../processors/cache/GridCacheMessage.java | 21 +- .../processors/cache/GridCacheProcessor.java | 4 + .../processors/cache/GridCacheProjectionEx.java | 55 +- .../cache/GridCacheProjectionImpl.java | 45 +- .../processors/cache/GridCacheProxyImpl.java | 28 +- .../processors/cache/GridCacheSwapManager.java | 88 +- .../cache/GridCacheUpdateAtomicResult.java | 29 +- .../processors/cache/GridCacheUtils.java | 80 +- .../processors/cache/GridCacheValueBytes.java | 24 +- .../processors/cache/IgniteCacheProxy.java | 77 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 30 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 26 +- .../distributed/GridCacheTtlUpdateRequest.java | 58 +- .../distributed/GridDistributedBaseMessage.java | 33 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 52 +- .../GridDistributedLockResponse.java | 30 +- .../GridDistributedTxFinishRequest.java | 42 +- .../GridDistributedTxFinishResponse.java | 24 +- .../GridDistributedTxPrepareRequest.java | 58 +- .../GridDistributedTxPrepareResponse.java | 24 +- .../GridDistributedTxRemoteAdapter.java | 78 +- .../GridDistributedUnlockRequest.java | 26 +- .../dht/GridDhtAffinityAssignmentRequest.java | 22 +- .../dht/GridDhtAffinityAssignmentResponse.java | 24 +- .../distributed/dht/GridDhtCacheAdapter.java | 25 +- .../distributed/dht/GridDhtCacheEntry.java | 112 +- .../distributed/dht/GridDhtLockRequest.java | 42 +- .../distributed/dht/GridDhtLockResponse.java | 40 +- .../distributed/dht/GridDhtTxFinishRequest.java | 42 +- .../dht/GridDhtTxFinishResponse.java | 22 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 5 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 13 +- .../dht/GridDhtTxPrepareRequest.java | 48 +- .../dht/GridDhtTxPrepareResponse.java | 42 +- .../distributed/dht/GridDhtUnlockRequest.java | 26 +- .../dht/GridPartitionedGetFuture.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 182 +- .../GridDhtAtomicDeferredUpdateResponse.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 188 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 32 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 126 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 202 +- .../atomic/GridNearAtomicUpdateResponse.java | 54 +- .../dht/preloader/GridDhtForceKeysRequest.java | 32 +- .../dht/preloader/GridDhtForceKeysResponse.java | 32 +- .../GridDhtPartitionDemandMessage.java | 36 +- .../preloader/GridDhtPartitionExchangeId.java | 27 +- .../GridDhtPartitionSupplyMessage.java | 40 +- .../GridDhtPartitionsAbstractMessage.java | 19 +- .../preloader/GridDhtPartitionsFullMessage.java | 24 +- .../GridDhtPartitionsSingleMessage.java | 22 +- .../GridDhtPartitionsSingleRequest.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 32 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../distributed/near/GridNearGetFuture.java | 15 +- .../distributed/near/GridNearGetRequest.java | 47 +- .../distributed/near/GridNearGetResponse.java | 38 +- .../distributed/near/GridNearLockRequest.java | 52 +- .../distributed/near/GridNearLockResponse.java | 42 +- .../near/GridNearTxFinishRequest.java | 32 +- .../near/GridNearTxFinishResponse.java | 26 +- .../near/GridNearTxPrepareFuture.java | 5 +- .../near/GridNearTxPrepareRequest.java | 44 +- .../near/GridNearTxPrepareResponse.java | 48 +- .../distributed/near/GridNearUnlockRequest.java | 18 +- .../processors/cache/dr/GridCacheDrInfo.java | 5 +- .../local/atomic/GridLocalAtomicCache.java | 83 +- .../query/GridCacheDistributedQueryManager.java | 4 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 58 +- .../cache/query/GridCacheQueryResponse.java | 40 +- .../continuous/CacheContinuousQueryEntry.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 1 + .../continuous/CacheContinuousQueryManager.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 74 +- .../cache/transactions/IgniteTxEntry.java | 79 +- .../transactions/IgniteTxLocalAdapter.java | 105 +- .../version/GridCacheRawVersionedEntry.java | 1 + .../cache/version/GridCacheVersion.java | 34 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../clock/GridClockDeltaSnapshotMessage.java | 28 +- .../processors/clock/GridClockDeltaVersion.java | 24 +- .../processors/clock/GridClockMessage.java | 1 + .../closure/GridClosureProcessor.java | 82 +- .../continuous/GridContinuousMessage.java | 28 +- .../continuous/GridContinuousProcessor.java | 2 +- .../dataload/GridDataLoadRequest.java | 50 +- .../dataload/GridDataLoadResponse.java | 26 +- .../dataload/GridDataLoaderProcessor.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 7 +- .../datastructures/DataStructuresProcessor.java | 2 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../dr/GridDrDataLoadCacheUpdater.java | 10 +- .../processors/igfs/IgfsAckMessage.java | 26 +- .../internal/processors/igfs/IgfsBlockKey.java | 28 +- .../processors/igfs/IgfsBlocksMessage.java | 30 +- .../igfs/IgfsCommunicationMessage.java | 18 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../processors/igfs/IgfsDeleteMessage.java | 24 +- .../processors/igfs/IgfsFileAffinityRange.java | 30 +- .../igfs/IgfsFragmentizerRequest.java | 28 +- .../igfs/IgfsFragmentizerResponse.java | 22 +- .../internal/processors/igfs/IgfsImpl.java | 6 +- .../processors/igfs/IgfsOutputStreamImpl.java | 4 +- .../internal/processors/igfs/IgfsServer.java | 1 + .../processors/igfs/IgfsSyncMessage.java | 24 +- .../internal/processors/job/GridJobWorker.java | 2 +- .../plugin/IgnitePluginProcessor.java | 30 +- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/rest/GridRestProcessor.java | 85 +- .../processors/rest/GridRestResponse.java | 1 + .../message/GridClientAbstractMessage.java | 1 + .../message/GridClientHandshakeRequest.java | 1 + .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 11 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../handlers/task/GridTaskResultRequest.java | 24 +- .../handlers/task/GridTaskResultResponse.java | 28 +- .../top/GridTopologyCommandHandler.java | 2 +- .../protocols/tcp/GridMemcachedMessage.java | 3 +- .../rest/protocols/tcp/GridTcpRestParser.java | 10 +- .../securesession/GridSecureSession.java | 60 - .../GridSecureSessionProcessor.java | 59 - .../os/GridOsSecureSessionProcessor.java | 61 - .../security/GridSecurityContext.java | 251 -- .../security/GridSecurityProcessor.java | 6 +- .../processors/security/SecurityContext.java | 56 + .../security/os/GridOsSecurityProcessor.java | 146 +- .../streamer/GridStreamerCancelRequest.java | 22 +- .../streamer/GridStreamerContextImpl.java | 2 +- .../streamer/GridStreamerExecutionRequest.java | 38 +- .../streamer/GridStreamerResponse.java | 24 +- .../processors/streamer/IgniteStreamerImpl.java | 4 +- .../processors/task/GridTaskWorker.java | 4 +- .../ignite/internal/util/GridByteArrayList.java | 24 +- .../ignite/internal/util/GridLongList.java | 24 +- .../internal/util/IgniteExceptionRegistry.java | 259 ++ .../ignite/internal/util/IgniteUtils.java | 2607 ++++++++---------- .../internal/util/future/GridFutureAdapter.java | 8 +- .../util/future/GridFutureAdapterEx.java | 3 +- .../internal/util/ipc/IpcToNioAdapter.java | 4 +- .../util/nio/GridCommunicationClient.java | 2 +- .../nio/GridConnectionBytesVerifyFilter.java | 1 + .../internal/util/nio/GridDirectParser.java | 33 +- .../internal/util/nio/GridNioMessageReader.java | 2 +- .../internal/util/nio/GridNioMessageWriter.java | 4 +- .../ignite/internal/util/nio/GridNioServer.java | 59 +- .../util/nio/GridShmemCommunicationClient.java | 2 +- .../util/nio/GridTcpCommunicationClient.java | 3 +- .../util/nio/GridTcpNioCommunicationClient.java | 2 +- .../apache/ignite/internal/util/typedef/X.java | 3 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 40 +- .../visor/cache/VisorCacheLoadTask.java | 18 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 3 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/cache/VisorCachePreloadTask.java | 4 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../cache/VisorCacheTypeFieldMetadata.java | 1 - .../visor/cache/VisorCacheTypeMetadata.java | 12 +- .../compute/VisorComputeCancelSessionsTask.java | 2 +- .../compute/VisorComputeMonitoringHolder.java | 6 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 6 +- .../internal/visor/debug/VisorThreadInfo.java | 14 +- .../event/VisorGridAuthenticationEvent.java | 106 - .../event/VisorGridAuthorizationEvent.java | 89 - .../visor/event/VisorGridEventsLost.java | 2 +- .../event/VisorGridSecuritySessionEvent.java | 2 +- .../internal/visor/igfs/VisorIgfsEndpoint.java | 5 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 6 +- .../visor/igfs/VisorIgfsProfilerTask.java | 34 +- .../VisorIgfsProfilerUniformityCounters.java | 15 +- .../visor/igfs/VisorIgfsResetMetricsTask.java | 2 +- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 18 +- .../visor/misc/VisorResolveHostNameTask.java | 6 +- .../visor/node/VisorBasicConfiguration.java | 17 - .../node/VisorCacheQueryConfiguration.java | 141 + .../node/VisorExecutorServiceConfiguration.java | 1 - .../visor/node/VisorGridConfiguration.java | 18 + .../visor/node/VisorNodeDataCollectorJob.java | 8 +- .../node/VisorNodeEventsCollectorTask.java | 17 +- .../internal/visor/node/VisorNodeGcTask.java | 12 +- .../internal/visor/node/VisorNodePingTask.java | 12 +- .../visor/node/VisorQueryConfiguration.java | 183 ++ .../visor/node/VisorSpisConfiguration.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 3 +- .../visor/query/VisorQueryNextPageTask.java | 10 +- .../visor/query/VisorQueryResultEx.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 12 +- .../internal/visor/query/VisorQueryUtils.java | 18 +- .../internal/visor/util/VisorEventMapper.java | 3 + .../internal/visor/util/VisorTaskUtils.java | 68 +- .../ignite/lang/IgniteProductVersion.java | 1 + .../optimized/optimized-classnames.properties | 73 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 6 + .../apache/ignite/plugin/ExtensionRegistry.java | 2 +- .../apache/ignite/plugin/PluginProvider.java | 3 +- .../extensions/communication/Message.java | 58 + .../communication/MessageAdapter.java | 143 - .../MessageCollectionItemType.java | 101 + .../communication/MessageFactory.java | 4 +- .../communication/MessageFormatter.java | 3 +- .../extensions/communication/MessageReader.java | 24 +- .../extensions/communication/MessageWriter.java | 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 + .../org/apache/ignite/spi/IgniteSpiContext.java | 8 + .../ignite/spi/IgniteSpiThreadFactory.java | 2 +- .../jobstealing/JobStealingRequest.java | 22 +- .../communication/tcp/TcpCommunicationSpi.java | 134 +- .../ignite/spi/discovery/DiscoverySpi.java | 7 + .../spi/discovery/DiscoverySpiDataExchange.java | 3 +- .../spi/discovery/DiscoverySpiListener.java | 11 +- .../DiscoverySpiNodeAuthenticator.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 284 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 5 +- .../tcp/internal/TcpDiscoveryNode.java | 1 + .../TcpDiscoveryMulticastIpFinder.java | 1 + .../messages/TcpDiscoveryAuthFailedMessage.java | 1 + .../TcpDiscoveryCustomEventMessage.java | 66 + .../messages/TcpDiscoveryHeartbeatMessage.java | 1 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../core/src/main/resources/ignite.properties | 3 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 239 ++ .../ignite/internal/ClusterMetricsSelfTest.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 44 + .../internal/GridEventStorageSelfTest.java | 3 +- .../GridJobMasterLeaveAwareSelfTest.java | 36 +- .../internal/GridMultipleJobsSelfTest.java | 4 +- .../ignite/internal/GridNodeLocalSelfTest.java | 4 +- .../internal/GridProjectionAbstractTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 2 +- .../apache/ignite/internal/GridSelfTest.java | 15 +- .../GridTaskContinuousMapperSelfTest.java | 3 +- .../GridTaskExecutionContextSelfTest.java | 2 +- .../GridCheckpointManagerAbstractSelfTest.java | 20 +- .../GridCommunicationSendMessageSelfTest.java | 13 +- .../communication/GridIoManagerSelfTest.java | 18 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 7 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 129 +- .../cache/GridCacheAffinityApiSelfTest.java | 18 +- .../GridCacheAtomicMessageCountSelfTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 13 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 5 +- .../cache/GridCacheQueryIndexSelfTest.java | 4 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../cache/GridCacheVersionMultinodeTest.java | 65 +- .../IgniteCacheAbstractStopBusySelfTest.java | 5 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 33 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 2 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 12 +- .../GridCacheMultiNodeDataStructureTest.java | 3 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 6 +- ...titionedAtomicSequenceMultiThreadedTest.java | 16 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 4 +- .../GridCacheAbstractJobExecutionTest.java | 15 +- .../GridCacheAtomicTimeoutSelfTest.java | 3 +- .../distributed/GridCacheEventAbstractTest.java | 4 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 8 +- .../dht/GridCacheDhtMultiBackupTest.java | 2 +- .../GridCacheDhtPreloadMessageCountTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 18 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 12 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 3 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../near/IgniteCacheNearReadCommittedTest.java | 3 + .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheRandomEvictionPolicySelfTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + .../IgniteCacheLoaderWriterAbstractTest.java | 47 + ...ridCacheContinuousQueryAbstractSelfTest.java | 14 +- .../closure/GridClosureProcessorRemoteTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 28 +- .../continuous/GridEventConsumeSelfTest.java | 18 +- .../continuous/GridMessageListenSelfTest.java | 14 +- .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- .../igfs/IgfsDataManagerSelfTest.java | 1 + .../processors/igfs/IgfsProcessorSelfTest.java | 3 +- .../processors/igfs/IgfsSizeSelfTest.java | 7 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../streamer/GridStreamerEvictionSelfTest.java | 2 +- .../streamer/GridStreamerSelfTest.java | 2 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 + .../util/IgniteExceptionRegistrySelfTest.java | 89 + .../internal/util/IgniteUtilsSelfTest.java | 6 +- .../internal/util/nio/GridRoundTripTest.java | 1 + .../offheap/GridOffHeapMapAbstractSelfTest.java | 1 + .../cache/GridCacheDataStructuresLoadTest.java | 36 +- .../loadtests/cache/GridCacheLoadTest.java | 6 +- .../loadtests/cache/GridCacheSwapLoadTest.java | 5 +- .../loadtests/colocation/GridTestMain.java | 3 +- .../communication/GridIoManagerBenchmark.java | 3 +- .../communication/GridIoManagerBenchmark0.java | 6 +- .../communication/GridTestMessage.java | 9 +- .../GridMultiSplitsRedeployLoadTest.java | 5 +- .../loadtests/discovery/GridGcTimeoutTest.java | 3 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 16 +- .../job/GridJobExecutionSingleNodeLoadTest.java | 2 +- .../mapper/GridContinuousMapperLoadTest1.java | 3 +- .../loadtests/mapper/GridNodeStartup.java | 3 +- .../mergesort/GridMergeSortLoadTest.java | 3 +- .../streamer/GridStreamerIndexLoadTest.java | 4 +- .../swap/GridSwapEvictAllBenchmark.java | 3 +- .../marshaller/GridMarshallerAbstractTest.java | 18 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 3 +- .../GridSessionSetTaskAttributeSelfTest.java | 3 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 3 +- .../spi/GridTcpSpiForwardingSelfTest.java | 4 +- .../GridAbstractCommunicationSelfTest.java | 22 +- .../spi/communication/GridTestMessage.java | 25 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 16 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 22 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 10 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 10 +- .../discovery/AbstractDiscoverySelfTest.java | 26 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 25 +- .../tcp/TcpDiscoverySpiWildcardSelfTest.java | 2 +- .../roundrobin/GridRoundRobinTestUtils.java | 6 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 1 + .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../index/GridStreamerIndexSelfTest.java | 17 +- .../window/GridStreamerWindowSelfTest.java | 3 +- .../testframework/GridSpiTestContext.java | 12 +- .../config/GridTestProperties.java | 10 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/GridTestKernalContext.java | 2 + .../ignite/testframework/junits/IgniteMock.java | 1 - .../cache/GridAbstractCacheStoreSelfTest.java | 3 +- .../junits/common/GridCommonAbstractTest.java | 2 + .../junits/spi/GridSpiAbstractTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../testsuites/IgniteUtilSelfTestSuite.java | 1 + modules/extdata/p2p/pom.xml | 6 - .../tests/p2p/GridP2PAwareTestUserResource.java | 5 +- .../tests/p2p/GridTestMessageListener.java | 4 +- modules/hadoop/pom.xml | 16 - .../client/hadoop/GridHadoopClientProtocol.java | 9 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 +++ .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +- .../java/org/apache/ignite/igfs/package.html | 2 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 --- .../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +- .../internal/igfs/hadoop/IgfsHadoopWrapper.java | 2 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../hadoop/GridHadoopDefaultJobInfo.java | 5 +- .../processors/hadoop/GridHadoopSetup.java | 11 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../GridHadoopDefaultMapReducePlanner.java | 3 +- .../shuffle/GridHadoopShuffleMessage.java | 1 + .../collections/GridHadoopHashMultimapBase.java | 2 +- .../taskexecutor/GridHadoopExecutorService.java | 2 +- .../GridHadoopExternalCommunication.java | 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../hadoop/v2/GridHadoopSplitWrapper.java | 3 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 4 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 227 +- .../hadoop/GridHadoopGroupingTest.java | 14 +- .../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +- .../hadoop/GridHadoopSortingTest.java | 9 +- .../processors/hadoop/GridHadoopStartup.java | 2 +- .../ignite/loadtests/igfs/IgfsNodeStartup.java | 3 +- .../igfs/IgfsPerformanceBenchmark.java | 9 +- .../testsuites/IgniteHadoopTestSuite.java | 7 +- modules/hibernate/pom.xml | 6 - ...idHibernateAbstractRegionAccessStrategy.java | 97 - .../GridHibernateAccessStrategyAdapter.java | 369 --- .../GridHibernateCollectionRegion.java | 99 - .../hibernate/GridHibernateEntityRegion.java | 110 - .../GridHibernateGeneralDataRegion.java | 69 - .../hibernate/GridHibernateNaturalIdRegion.java | 98 - .../GridHibernateNonStrictAccessStrategy.java | 220 -- .../GridHibernateQueryResultsRegion.java | 71 - .../GridHibernateReadOnlyAccessStrategy.java | 106 - .../GridHibernateReadWriteAccessStrategy.java | 282 -- .../cache/hibernate/GridHibernateRegion.java | 101 - .../hibernate/GridHibernateRegionFactory.java | 231 -- .../GridHibernateTimestampsRegion.java | 40 - ...ridHibernateTransactionalAccessStrategy.java | 139 - .../GridHibernateTransactionalDataRegion.java | 96 - .../HibernateAbstractRegionAccessStrategy.java | 97 + .../HibernateAccessStrategyAdapter.java | 369 +++ .../hibernate/HibernateCollectionRegion.java | 99 + .../cache/hibernate/HibernateEntityRegion.java | 110 + .../hibernate/HibernateGeneralDataRegion.java | 69 + .../hibernate/HibernateNaturalIdRegion.java | 98 + .../HibernateNonStrictAccessStrategy.java | 220 ++ .../hibernate/HibernateQueryResultsRegion.java | 71 + .../HibernateReadOnlyAccessStrategy.java | 106 + .../HibernateReadWriteAccessStrategy.java | 282 ++ .../ignite/cache/hibernate/HibernateRegion.java | 101 + .../cache/hibernate/HibernateRegionFactory.java | 231 ++ .../hibernate/HibernateTimestampsRegion.java | 40 + .../HibernateTransactionalAccessStrategy.java | 139 + .../HibernateTransactionalDataRegion.java | 96 + .../apache/ignite/cache/hibernate/package.html | 2 +- ...idHibernateL2CacheConfigurationSelfTest.java | 393 --- .../hibernate/GridHibernateL2CacheSelfTest.java | 1923 ------------- ...idHibernateL2CacheTransactionalSelfTest.java | 135 - .../HibernateL2CacheConfigurationSelfTest.java | 393 +++ .../hibernate/HibernateL2CacheSelfTest.java | 1925 +++++++++++++ .../HibernateL2CacheTransactionalSelfTest.java | 135 + .../testsuites/IgniteHibernateTestSuite.java | 6 +- modules/indexing/pom.xml | 6 - .../GridCacheAbstractFieldsQuerySelfTest.java | 7 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 2 +- .../cache/GridCacheQueryLoadSelfTest.java | 30 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 6 +- modules/jta/pom.xml | 6 - .../http/jetty/GridJettyRestHandler.java | 1 + modules/scalar/pom.xml | 6 - modules/spring/pom.xml | 6 - .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../resource/GridServiceInjectionSelfTest.java | 4 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +- ...gniteProjectionStartStopRestartSelfTest.java | 3 +- modules/visor-console/pom.xml | 7 - .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 19 +- .../commands/cache/VisorCacheClearCommand.scala | 4 +- .../commands/cache/VisorCacheCommand.scala | 88 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 4 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 144 +- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 4 +- .../visor/commands/kill/VisorKillCommand.scala | 12 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 12 +- .../commands/top/VisorTopologyCommand.scala | 4 +- .../visor/commands/vvm/VisorVvmCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 92 +- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- modules/web/pom.xml | 6 - pom.xml | 4 +- readme.md | 2 - 586 files changed, 16199 insertions(+), 14209 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index bad1084,1e67907..9690b41 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@@ -74,16 -75,28 +75,28 @@@ public class GridCacheUtils /** Peek flags. */ private static final GridCachePeekMode[] PEEK_FLAGS = new GridCachePeekMode[] { GLOBAL, SWAP }; - /** */ + /** TTL: minimum positive value. */ + public static final long TTL_MINIMUM = 1L; + + /** TTL: eternal. */ + public static final long TTL_ETERNAL = 0L; + + /** TTL: not changed. */ public static final long TTL_NOT_CHANGED = -1L; - /** */ + /** TTL: zero (immediate expiration). */ public static final long TTL_ZERO = -2L; + /** Expire time: eternal. */ + public static final long EXPIRE_TIME_ETERNAL = 0L; + + /** Expire time: must be calculated based on TTL value. */ + public static final long EXPIRE_TIME_CALCULATE = -1L; + /** Per-thread generated UID store. */ - private static final ThreadLocal<String> UUIDS = new ThreadLocal<String>() { - @Override protected String initialValue() { - return UUID.randomUUID().toString(); + private static final ThreadLocal<UUID> UUIDS = new ThreadLocal<UUID>() { + @Override protected UUID initialValue() { + return UUID.randomUUID(); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d6f0945/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ----------------------------------------------------------------------
