Merge branches 'ignite-329' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-329
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/011d925a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/011d925a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/011d925a Branch: refs/heads/ignite-329 Commit: 011d925a976b47278eb3d531e1834c6ae321c142 Parents: 4ca6b06 697d199 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 11 13:20:03 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 11 13:20:03 2015 +0700 ---------------------------------------------------------------------- .../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 +- modules/core/pom.xml | 56 +- .../cache/CachePartialUpdateException.java | 3 + .../CacheRendezvousAffinityFunction.java | 13 +- .../configuration/CacheConfiguration.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 + .../GridClientOptimizedMarshaller.java | 42 +- .../managers/communication/GridIoManager.java | 102 +- .../managers/communication/GridIoPolicy.java | 5 +- .../affinity/GridAffinityMessage.java | 13 +- .../processors/cache/CacheInvokeResult.java | 12 +- .../processors/cache/GridCacheAdapter.java | 16 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheProcessor.java | 19 +- .../processors/cache/GridCacheReturn.java | 12 +- .../cache/GridCacheSharedContext.java | 6 + .../processors/cache/GridCacheUtils.java | 18 +- .../GridDistributedTxFinishRequest.java | 56 +- .../GridDistributedTxPrepareRequest.java | 60 +- .../GridDistributedTxRemoteAdapter.java | 4 + .../IgniteExternalizableExpiryPolicy.java | 12 +- .../dht/GridDhtTransactionalCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 + .../distributed/dht/GridDhtTxFinishRequest.java | 42 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 6 +- .../dht/GridDhtTxPrepareRequest.java | 50 +- .../cache/distributed/dht/GridDhtTxRemote.java | 11 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 19 + .../near/GridNearTransactionalCache.java | 5 +- .../near/GridNearTxFinishFuture.java | 1 + .../near/GridNearTxFinishRequest.java | 32 +- .../cache/distributed/near/GridNearTxLocal.java | 3 + .../near/GridNearTxPrepareRequest.java | 42 +- .../distributed/near/GridNearTxRemote.java | 11 +- .../processors/cache/local/GridLocalTx.java | 206 --- .../cache/local/GridLocalTxFuture.java | 305 ---- .../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 +- .../transactions/IgniteTransactionsImpl.java | 36 +- .../cache/transactions/IgniteTxAdapter.java | 12 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../cache/transactions/IgniteTxHandler.java | 14 +- .../transactions/IgniteTxLocalAdapter.java | 7 +- .../cache/transactions/IgniteTxManager.java | 127 +- .../cache/version/GridCacheVersion.java | 12 +- .../cache/version/GridCacheVersionEx.java | 9 - .../closure/GridClosureProcessor.java | 126 +- .../continuous/GridContinuousHandler.java | 9 +- .../continuous/GridContinuousProcessor.java | 8 +- .../datastructures/DataStructuresProcessor.java | 6 + .../message/GridClientAbstractMessage.java | 1 - .../streamer/GridStreamerExecutionBatch.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 51 +- .../visor/cache/VisorCacheClearTask.java | 6 + .../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 | 1645 ------------------ .../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 +- .../continuous/GridEventConsumeSelfTest.java | 3 +- .../dataload/GridDataLoaderImplSelfTest.java | 7 - .../processors/igfs/IgfsFileInfoSelfTest.java | 2 + .../processors/igfs/IgfsSizeSelfTest.java | 17 - .../streamer/GridStreamerEvictionSelfTest.java | 1 - .../streamer/GridStreamerFailoverSelfTest.java | 2 +- .../internal/util/nio/GridNioSelfTest.java | 18 +- .../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 + .../IgniteHadoopClientProtocolProvider.java | 4 +- .../child/HadoopExternalProcessStarter.java | 4 +- .../hadoop/HadoopSortingExternalTest.java | 10 + .../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 - 141 files changed, 4405 insertions(+), 4772 deletions(-) ----------------------------------------------------------------------
