Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-709
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e14cc876 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e14cc876 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e14cc876 Branch: refs/heads/ignite-709 Commit: e14cc876d6bfddc29fbbd0e40f56ba05e9d09e68 Parents: eda676b dc455be Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Apr 21 19:41:17 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Apr 21 19:41:17 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 49 + examples/README.txt | 2 +- .../hibernate/CacheHibernateStoreExample.java | 3 - .../store/jdbc/CacheJdbcStoreExample.java | 3 - .../examples/ScalarContinuationExample.scala | 10 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../apache/ignite/IgniteSystemProperties.java | 6 - .../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +- .../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +- .../cache/eviction/lru/LruEvictionPolicy.java | 5 +- .../eviction/sorted/SortedEvictionPolicy.java | 431 +++++ .../sorted/SortedEvictionPolicyMBean.java | 66 + .../cache/eviction/sorted/package-info.java | 21 + .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../ignite/compute/ComputeJobContinuation.java | 2 + .../configuration/CacheConfiguration.java | 13 +- .../ignite/internal/GridJobContextImpl.java | 100 +- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 62 +- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../processors/cache/CacheEntryImpl.java | 29 +- .../processors/cache/CacheLockImpl.java | 20 +- .../processors/cache/CacheOperationContext.java | 170 ++ .../processors/cache/CacheProjection.java | 1614 ---------------- .../cache/CacheVersionedEntryImpl.java | 29 +- .../internal/processors/cache/GridCache.java | 224 --- .../processors/cache/GridCacheAdapter.java | 740 +++---- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../cache/GridCacheConcurrentMap.java | 26 +- .../processors/cache/GridCacheContext.java | 66 +- .../cache/GridCacheEvictionManager.java | 11 +- .../processors/cache/GridCacheGateway.java | 119 +- .../processors/cache/GridCacheMapAdapter.java | 238 --- .../processors/cache/GridCacheProcessor.java | 21 +- .../processors/cache/GridCacheProjectionEx.java | 480 ----- .../cache/GridCacheProjectionImpl.java | 932 --------- .../processors/cache/GridCacheProxy.java | 27 - .../processors/cache/GridCacheProxyImpl.java | 845 ++------ .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 34 +- .../processors/cache/IgniteCacheProxy.java | 469 ++--- .../processors/cache/IgniteInternalCache.java | 1816 ++++++++++++++++++ .../cache/affinity/GridCacheAffinityProxy.java | 30 +- .../CacheDataStructuresManager.java | 12 +- .../GridDistributedCacheAdapter.java | 15 +- .../dht/GridDhtAffinityAssignmentResponse.java | 21 +- .../distributed/dht/GridDhtCacheAdapter.java | 27 +- .../dht/GridDhtTransactionalCacheAdapter.java | 5 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 20 +- .../dht/atomic/GridDhtAtomicCache.java | 188 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../dht/colocated/GridDhtColocatedCache.java | 28 +- .../GridDhtPartitionsExchangeFuture.java | 5 + .../distributed/near/GridNearAtomicCache.java | 136 +- .../distributed/near/GridNearCacheAdapter.java | 57 +- .../distributed/near/GridNearCacheEntry.java | 16 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../near/GridNearTransactionalCache.java | 15 +- .../processors/cache/local/GridLocalCache.java | 16 +- .../local/atomic/GridLocalAtomicCache.java | 141 +- .../processors/cache/query/CacheQueries.java | 143 -- .../processors/cache/query/CacheQuery.java | 12 +- .../CacheQueryCloseableScanBiPredicate.java | 30 + .../cache/query/GridCacheQueriesEx.java | 68 - .../cache/query/GridCacheQueriesImpl.java | 217 --- .../cache/query/GridCacheQueriesProxy.java | 285 --- .../cache/query/GridCacheQueryManager.java | 118 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 2 - .../transactions/IgniteTxLocalAdapter.java | 28 +- .../cache/transactions/IgniteTxManager.java | 44 - .../datastreamer/DataStreamerCacheUpdaters.java | 15 +- .../datastreamer/DataStreamerImpl.java | 81 +- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../datastructures/DataStructuresProcessor.java | 40 +- .../GridAtomicCacheQueueImpl.java | 12 +- .../datastructures/GridCacheAtomicLongImpl.java | 20 +- .../GridCacheAtomicReferenceImpl.java | 8 +- .../GridCacheAtomicSequenceImpl.java | 6 +- .../GridCacheAtomicStampedImpl.java | 8 +- .../GridCacheCountDownLatchImpl.java | 6 +- .../datastructures/GridCacheSetImpl.java | 6 +- .../GridTransactionalCacheQueueImpl.java | 8 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - .../processors/igfs/IgfsDataManager.java | 12 +- .../processors/igfs/IgfsMetaManager.java | 47 +- .../processors/job/GridJobHoldListener.java | 6 +- .../processors/job/GridJobProcessor.java | 22 +- .../internal/processors/job/GridJobWorker.java | 23 +- .../processors/rest/GridRestCommand.java | 11 +- .../processors/rest/GridRestProcessor.java | 9 - .../message/GridClientCacheQueryRequest.java | 366 ---- .../cache/GridCacheClientQueryResult.java | 97 - .../handlers/cache/GridCacheCommandHandler.java | 78 +- .../cache/GridCacheQueryCommandHandler.java | 480 ----- .../protocols/tcp/GridTcpRestNioListener.java | 24 - .../rest/request/GridRestCacheQueryRequest.java | 143 -- .../service/GridServiceProcessor.java | 15 +- .../processors/task/GridTaskProcessor.java | 8 +- .../util/future/GridCompoundFuture.java | 9 +- .../visor/cache/VisorCacheMetadataTask.java | 9 +- .../internal/visor/cache/VisorCacheMetrics.java | 4 +- .../visor/cache/VisorCacheRebalanceTask.java | 4 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 70 +- .../tcp/TcpCommunicationSpiMBean.java | 9 - .../ignite/spi/discovery/DiscoverySpi.java | 7 + .../discovery/tcp/TcpClientDiscoverySpi.java | 12 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +- .../ignite/startup/BasicWarmupClosure.java | 32 +- .../TransactionSynchronization.java | 45 - .../internal/GridCacheProjectionRemoveTest.java | 41 - .../internal/GridContinuousTaskSelfTest.java | 114 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 117 ++ .../internal/GridLifecycleBeanSelfTest.java | 36 + .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- .../GridCacheAbstractFailoverSelfTest.java | 44 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 50 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 6 +- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../cache/GridCachePutAllFailoverSelfTest.java | 14 +- .../processors/cache/GridCachePutAllTask.java | 56 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 + .../cache/IgniteDynamicCacheStartSelfTest.java | 4 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 35 +- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- ...GridCachePartitionedNodeRestartSelfTest.java | 67 - .../GridCacheAbstractNodeRestartSelfTest.java | 23 +- .../GridCacheAtomicTimeoutSelfTest.java | 314 --- .../GridCacheMultiNodeLockAbstractTest.java | 14 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 22 +- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 + .../IgniteCacheAtomicNodeRestartTest.java | 33 + .../IgniteCacheMessageRecoveryAbstractTest.java | 175 ++ .../IgniteCachePutGetRestartAbstractTest.java | 234 +++ .../IgniteCacheSystemTransactionsSelfTest.java | 4 +- .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 + .../IgniteCacheTxMessageRecoveryTest.java | 32 + ...iteCacheTxNearDisabledPutGetRestartTest.java | 30 + ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +- .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 + .../GridCachePartitionedFullApiSelfTest.java | 2 +- .../GridCachePartitionedNodeRestartTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 + ...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 + .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheReplicatedPreloadSelfTest.java | 4 +- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++++ ...acheSortedEvictionPolicyPerformanceTest.java | 136 ++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 38 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 3 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../testframework/GridSpiTestContext.java | 5 + .../junits/common/GridCommonAbstractTest.java | 36 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 5 +- .../IgniteCacheFullApiSelfTestSuite.java | 9 +- .../testsuites/IgniteCacheRestartTestSuite.java | 20 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../ignite/util/TestTcpCommunicationSpi.java | 54 + .../query/h2/GridH2IndexingGeoSelfTest.java | 70 +- .../hadoop/jobtracker/HadoopJobTracker.java | 16 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../HibernateAccessStrategyAdapter.java | 14 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 4 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 6 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 4 +- .../HibernateReadWriteAccessStrategy.java | 10 +- .../ignite/cache/hibernate/HibernateRegion.java | 6 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 12 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 7 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 + .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 78 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 74 +- .../cache/GridCacheQueryMetricsSelfTest.java | 32 +- .../GridCacheQuerySerializationSelfTest.java | 144 ++ ...idCacheReduceQueryMultithreadedSelfTest.java | 12 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 19 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 + ...GridCachePartitionedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 8 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java | 18 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 +- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 + .../processors/query/h2/sql/bigQuery.sql | 2 +- modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- 238 files changed, 7395 insertions(+), 8743 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e14cc876/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index 5931972,e3182c4..4cd5118 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@@ -378,14 -377,21 +378,26 @@@ public class TcpClientDiscoverySpi exte /** {@inheritDoc} */ @Override public void sendCustomEvent(Serializable evt) { - throw new UnsupportedOperationException(); + try { + sockRdr.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(evt))); + } + catch (IgniteCheckedException e) { + throw new IgniteSpiException("Failed to marshal custom event: " + evt, e); + } } + /** {@inheritDoc} */ + @Override public void failNode(UUID nodeId) { + ClusterNode node = rmtNodes.get(nodeId); + + if (node != null) { + TcpDiscoveryNodeFailedMessage msg = new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), + node.id(), node.order()); + + sockRdr.addMessage(msg); + } + } + /** * @param recon Reconnect flag. * @return Whether joined successfully. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e14cc876/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e14cc876/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
