#ignite-410: merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cbbd866 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cbbd866 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cbbd866 Branch: refs/heads/ignite-410 Commit: 1cbbd8660405cadd55111bff2b5d5c0f854b6661 Parents: ba7253c 9d78a08 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 11 12:55:59 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Mar 11 12:55:59 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 7 + .../apache/ignite/gridify/AbstractAopTest.java | 4 +- .../spi/checkpoint/s3/S3CheckpointData.java | 62 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 8 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../rest/protocols/tcp/MockNioSession.java | 7 +- modules/core/pom.xml | 56 +- .../cache/CachePartialUpdateException.java | 3 + .../CacheRendezvousAffinityFunction.java | 13 +- .../configuration/CacheConfiguration.java | 3 + .../IgfsConcurrentModificationException.java | 29 +- .../ignite/igfs/IgfsCorruptedFileException.java | 16 +- .../igfs/IgfsDirectoryNotEmptyException.java | 20 +- .../org/apache/ignite/igfs/IgfsException.java | 16 +- .../igfs/IgfsInvalidHdfsVersionException.java | 23 +- .../ignite/igfs/IgfsInvalidPathException.java | 16 +- .../ignite/igfs/IgfsOutOfSpaceException.java | 16 +- .../igfs/IgfsParentNotDirectoryException.java | 20 +- .../igfs/IgfsPathAlreadyExistsException.java | 19 +- .../igfs/IgfsPathIsDirectoryException.java | 56 + .../igfs/IgfsPathIsNotDirectoryException.java | 56 + .../ignite/igfs/IgfsPathNotFoundException.java | 22 +- .../internal/ComputeTaskInternalFuture.java | 3 + .../internal/GridEventConsumeHandler.java | 11 +- .../ignite/internal/GridKernalContext.java | 16 +- .../ignite/internal/GridKernalContextImpl.java | 42 +- .../internal/GridMessageListenHandler.java | 11 +- .../org/apache/ignite/internal/GridTopic.java | 89 +- .../ignite/internal/GridUpdateNotifier.java | 15 - .../apache/ignite/internal/IgniteKernal.java | 4 + .../ignite/internal/IgniteTransactionsEx.java | 16 - .../org/apache/ignite/internal/IgnitionEx.java | 74 +- .../internal/MarshallerContextAdapter.java | 130 ++ .../ignite/internal/MarshallerContextImpl.java | 81 + .../client/impl/GridClientFutureAdapter.java | 3 + .../GridClientOptimizedMarshaller.java | 42 +- .../managers/communication/GridIoManager.java | 102 +- .../managers/communication/GridIoPolicy.java | 5 +- .../affinity/GridAffinityAssignmentCache.java | 4 +- .../affinity/GridAffinityMessage.java | 13 +- .../processors/cache/CacheInvokeResult.java | 12 +- .../processors/cache/EvictableEntryImpl.java | 4 +- .../processors/cache/GridCacheAdapter.java | 18 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheEntryEx.java | 28 +- .../cache/GridCacheEvictionManager.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 50 +- .../cache/GridCacheMultiTxFuture.java | 3 + .../processors/cache/GridCacheMvccManager.java | 3 + .../processors/cache/GridCacheProcessor.java | 19 +- .../processors/cache/GridCacheReturn.java | 12 +- .../cache/GridCacheSharedContext.java | 6 + .../processors/cache/GridCacheStoreManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 28 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 6 + .../GridDistributedTxFinishRequest.java | 56 +- .../GridDistributedTxPrepareRequest.java | 60 +- .../GridDistributedTxRemoteAdapter.java | 4 + .../IgniteExternalizableExpiryPolicy.java | 12 +- .../dht/GridDhtAssignmentFetchFuture.java | 3 + .../distributed/dht/GridDhtCacheAdapter.java | 3 + .../distributed/dht/GridDhtEmbeddedFuture.java | 3 + .../cache/distributed/dht/GridDhtGetFuture.java | 3 + .../distributed/dht/GridDhtLockFuture.java | 6 + .../dht/GridDhtTransactionalCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxFinishFuture.java | 8 + .../distributed/dht/GridDhtTxFinishRequest.java | 42 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../dht/GridDhtTxPrepareRequest.java | 50 +- .../cache/distributed/dht/GridDhtTxRemote.java | 11 +- .../dht/GridPartitionedGetFuture.java | 6 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 3 + .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 6 + .../dht/preloader/GridDhtForceKeysFuture.java | 6 + .../preloader/GridDhtPartitionDemandPool.java | 22 + .../GridDhtPartitionsExchangeFuture.java | 3 + .../distributed/near/GridNearGetFuture.java | 6 + .../distributed/near/GridNearLockFuture.java | 6 + .../near/GridNearTransactionalCache.java | 5 +- .../near/GridNearTxFinishFuture.java | 7 + .../near/GridNearTxFinishRequest.java | 32 +- .../cache/distributed/near/GridNearTxLocal.java | 3 + .../near/GridNearTxPrepareFuture.java | 16 +- .../near/GridNearTxPrepareRequest.java | 42 +- .../distributed/near/GridNearTxRemote.java | 11 +- .../extras/GridCacheAttributesEntryExtras.java | 10 +- .../GridCacheAttributesMvccEntryExtras.java | 10 +- ...dCacheAttributesMvccObsoleteEntryExtras.java | 10 +- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 10 +- .../GridCacheAttributesMvccTtlEntryExtras.java | 10 +- .../GridCacheAttributesObsoleteEntryExtras.java | 10 +- ...idCacheAttributesObsoleteTtlEntryExtras.java | 10 +- .../GridCacheAttributesTtlEntryExtras.java | 10 +- .../cache/extras/GridCacheEntryExtras.java | 6 +- .../extras/GridCacheEntryExtrasAdapter.java | 4 +- .../cache/extras/GridCacheMvccEntryExtras.java | 4 +- .../GridCacheMvccObsoleteEntryExtras.java | 4 +- .../GridCacheMvccObsoleteTtlEntryExtras.java | 4 +- .../extras/GridCacheMvccTtlEntryExtras.java | 4 +- .../extras/GridCacheObsoleteEntryExtras.java | 4 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 4 +- .../cache/extras/GridCacheTtlEntryExtras.java | 4 +- .../cache/local/GridLocalLockFuture.java | 3 + .../processors/cache/local/GridLocalTx.java | 206 --- .../cache/local/GridLocalTxFuture.java | 302 ---- .../GridCacheDistributedFieldsQueryFuture.java | 3 + .../query/GridCacheDistributedQueryFuture.java | 3 + .../query/GridCacheLocalFieldsQueryFuture.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../cache/query/GridCacheQueryManager.java | 3 +- .../continuous/CacheContinuousQueryEvent.java | 3 + .../continuous/CacheContinuousQueryHandler.java | 11 +- .../continuous/CacheContinuousQueryManager.java | 3 + .../jdbc/GridCacheQueryJdbcMetadataTask.java | 12 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 12 +- .../cache/transactions/IgniteInternalTx.java | 6 +- .../transactions/IgniteTransactionsImpl.java | 36 +- .../cache/transactions/IgniteTxAdapter.java | 18 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../cache/transactions/IgniteTxHandler.java | 14 +- .../transactions/IgniteTxLocalAdapter.java | 7 +- .../cache/transactions/IgniteTxManager.java | 127 +- .../transactions/TransactionProxyImpl.java | 6 +- .../cache/version/GridCacheVersion.java | 12 +- .../cache/version/GridCacheVersionEx.java | 9 - .../closure/GridClosureProcessor.java | 128 +- .../continuous/GridContinuousHandler.java | 9 +- .../continuous/GridContinuousProcessor.java | 14 +- .../dataload/GridDataLoaderFuture.java | 3 + .../datastructures/DataStructuresProcessor.java | 6 + .../processors/igfs/IgfsDataManager.java | 3 + .../internal/processors/igfs/IgfsFileImpl.java | 7 + .../internal/processors/igfs/IgfsFileInfo.java | 3 +- .../internal/processors/igfs/IgfsImpl.java | 583 +++---- .../processors/igfs/IgfsMetaManager.java | 25 +- .../internal/processors/igfs/IgfsServer.java | 3 +- .../internal/processors/igfs/IgfsUtils.java | 86 + .../message/GridClientAbstractMessage.java | 1 - .../service/GridServiceDeploymentFuture.java | 3 + .../streamer/GridStreamerExecutionBatch.java | 12 +- .../GridStreamerStageExecutionFuture.java | 3 + .../ignite/internal/util/IgniteUtils.java | 55 +- .../util/future/GridCompoundFuture.java | 3 + .../util/future/GridCompoundIdentityFuture.java | 3 + .../util/future/GridEmbeddedFuture.java | 3 + .../internal/util/future/GridFutureAdapter.java | 9 + .../util/lang/GridMetadataAwareAdapter.java | 71 +- .../util/nio/GridNioEmbeddedFuture.java | 3 + .../internal/util/nio/GridNioFutureImpl.java | 3 + .../ignite/internal/util/nio/GridNioServer.java | 3 + .../internal/util/worker/GridWorkerFuture.java | 3 + .../visor/cache/VisorCacheClearTask.java | 6 + .../lang/IgniteFutureCancelledException.java | 3 + .../lang/IgniteFutureTimeoutException.java | 3 + .../java/org/apache/ignite/lang/IgniteUuid.java | 13 +- .../ignite/marshaller/AbstractMarshaller.java | 8 + .../apache/ignite/marshaller/Marshaller.java | 7 + .../ignite/marshaller/MarshallerContext.java | 42 + .../optimized/OptimizedClassDescriptor.java | 463 ++--- .../optimized/OptimizedClassResolver.java | 477 ------ .../optimized/OptimizedMarshallable.java | 65 - .../optimized/OptimizedMarshaller.java | 148 +- .../optimized/OptimizedMarshallerIdMapper.java | 33 + .../optimized/OptimizedMarshallerUtils.java | 298 ++-- .../optimized/OptimizedObjectInputStream.java | 152 +- .../optimized/OptimizedObjectOutputStream.java | 99 +- .../optimized-classnames.previous.properties | 15 - .../optimized/optimized-classnames.properties | 116 -- .../communication/tcp/TcpCommunicationSpi.java | 3 + .../apache/ignite/transactions/Transaction.java | 6 +- .../META-INF/classnames-jdk.properties | 371 ++++ .../resources/META-INF/classnames.properties | 1607 ++++++++++++++++++ .../src/test/config/io-manager-benchmark.xml | 12 - modules/core/src/test/config/jobs-load-base.xml | 11 - .../core/src/test/config/load/dsi-load-base.xml | 16 - .../IgniteExternalizableAbstractTest.java | 9 +- .../ignite/internal/GridAffinitySelfTest.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 6 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 10 + .../GridCacheExAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheVersionSelfTest.java | 3 + .../IgniteCacheSystemTransactionsSelfTest.java | 188 ++ ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 5 +- .../continuous/GridEventConsumeSelfTest.java | 3 +- .../dataload/GridDataLoaderImplSelfTest.java | 7 - .../processors/igfs/IgfsAbstractSelfTest.java | 31 +- .../processors/igfs/IgfsFileInfoSelfTest.java | 2 + .../processors/igfs/IgfsSizeSelfTest.java | 17 - .../streamer/GridStreamerEvictionSelfTest.java | 1 - .../streamer/GridStreamerFailoverSelfTest.java | 2 +- .../internal/util/nio/GridNioSelfTest.java | 18 +- .../nio/impl/GridNioFilterChainSelfTest.java | 7 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 80 +- .../marshaller/GridMarshallerAbstractTest.java | 15 +- .../GridMarshallerPerformanceTest.java | 2 - .../marshaller/MarshallerContextTestImpl.java | 43 + .../jdk/GridJdkMarshallerSelfTest.java | 2 +- .../OptimizedMarshallerEnumSelfTest.java | 4 +- .../optimized/OptimizedMarshallerSelfTest.java | 186 +- .../optimized/OptimizedMarshallerTest.java | 102 +- .../OptimizedObjectStreamSelfTest.java | 43 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 + .../discovery/AbstractDiscoverySelfTest.java | 1 - .../ignite/testframework/GridTestUtils.java | 4 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/GridTestKernalContext.java | 14 +- .../junits/IgniteTestResources.java | 46 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 5 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 14 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 8 +- .../IgniteHadoopClientProtocolProvider.java | 7 +- .../internal/processors/hadoop/HadoopSetup.java | 2 +- .../hadoop/igfs/HadoopIgfsFuture.java | 3 + .../hadoop/proto/HadoopClientProtocol.java | 3 - .../external/HadoopExternalTaskExecutor.java | 3 + .../child/HadoopExternalProcessStarter.java | 4 +- .../hadoop/HadoopClientProtocolSelfTest.java | 2 +- .../hadoop/HadoopSortingExternalTest.java | 10 + .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../HadoopExternalTaskExecutionSelfTest.java | 10 + .../HadoopExternalCommunicationSelfTest.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../processors/cache/jta/CacheJtaManager.java | 4 +- modules/scalar/pom.xml | 8 + .../scalar/testsuites/ScalarSelfTestSuite.scala | 6 + .../GridSpringBeanSerializationSelfTest.java | 2 + ...gniteProjectionStartStopRestartSelfTest.java | 42 +- .../ignite/tools/classgen/ClassesGenerator.java | 214 +++ .../optimized/OptimizedClassNamesGenerator.java | 325 ---- .../commands/tasks/VisorTasksCommandSpec.scala | 5 +- .../IgniteWebSessionSelfTestSuite.java | 6 + modules/yardstick/config/ignite-base-config.xml | 17 - .../yardstick/config/ignite-store-config.xml | 18 - pom.xml | 2 +- 242 files changed, 5428 insertions(+), 3928 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cbbd866/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index fede656,392aa39..8e2506d --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@@ -562,8 -588,8 +585,6 @@@ public class GridIoManager extends Grid lsnr.onMessage(nodeId, obj); } finally { - workersCnt.decrement(); - threadProcessingMessage(false); -- msgC.run(); } } @@@ -601,8 -625,10 +620,6 @@@ processRegularMessage0(msg, nodeId); } finally { - workersCnt.decrement(); - threadProcessingMessage(false); -- msgC.run(); } } @@@ -796,8 -819,10 +810,6 @@@ unwindMessageSet(msgSet0, lsnr); } finally { - workersCnt.decrement(); - threadProcessingMessage(false); -- msgC.run(); } }
