IGNITE-51 - Merge branch sprint-1 into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9564b451 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9564b451 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9564b451 Branch: refs/heads/ignite-211 Commit: 9564b451bd30104fac510ede9b29b05019e2d999 Parents: df777c3 2d1dcc6 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Feb 9 21:55:08 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Feb 9 21:55:08 2015 -0800 ---------------------------------------------------------------------- .../MemcacheRestExampleNodeStartup.java | 2 + .../ignite/client/ClientTestRestServer.java | 6 + .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../integration/ClientAbstractSelfTest.java | 2 +- .../processors/rest/TestBinaryClient.java | 10 +- .../protocols/tcp/TcpRestParserSelfTest.java | 12 +- modules/codegen/pom.xml | 50 + .../CommunicationMessageCodeGenerator.java | 782 +++++++++ .../apache/ignite/client/GridClientFactory.java | 2 +- .../ignite/client/impl/GridClientImpl.java | 17 +- .../GridClientConnectionManagerAdapter.java | 149 +- .../GridClientConnectionManagerOsImpl.java | 5 +- .../connection/GridClientNioTcpConnection.java | 128 +- .../router/impl/GridRouterClientImpl.java | 4 +- .../router/impl/GridTcpRouterNioParser.java | 6 + .../ignite/internal/GridDirectVersion.java | 32 - .../ignite/internal/GridJobCancelRequest.java | 58 +- .../ignite/internal/GridJobExecuteRequest.java | 390 ++--- .../ignite/internal/GridJobExecuteResponse.java | 106 +- .../ignite/internal/GridJobSiblingsRequest.java | 46 +- .../internal/GridJobSiblingsResponse.java | 34 +- .../ignite/internal/GridKernalContext.java | 12 - .../ignite/internal/GridKernalContextImpl.java | 69 - .../ignite/internal/GridPluginContext.java | 6 - .../ignite/internal/GridTaskCancelRequest.java | 34 +- .../ignite/internal/GridTaskSessionRequest.java | 58 +- .../apache/ignite/internal/IgniteKernal.java | 2 - .../internal/direct/DirectByteBufferStream.java | 1613 ++++++++++++++++++ .../internal/direct/DirectMessageReader.java | 279 +++ .../internal/direct/DirectMessageWriter.java | 216 +++ .../internal/managers/GridManagerAdapter.java | 32 +- .../checkpoint/GridCheckpointRequest.java | 58 +- .../managers/communication/GridIoManager.java | 91 +- .../managers/communication/GridIoMessage.java | 114 +- .../communication/GridIoMessageFactory.java | 543 ++++++ .../communication/GridIoUserMessage.java | 176 +- .../deployment/GridDeploymentCommunication.java | 6 +- .../deployment/GridDeploymentInfoBean.java | 152 +- .../deployment/GridDeploymentRequest.java | 126 +- .../deployment/GridDeploymentResponse.java | 60 +- .../discovery/GridDiscoveryManager.java | 17 - .../eventstorage/GridEventStorageMessage.java | 200 +-- .../cache/GridCacheEvictionRequest.java | 58 +- .../cache/GridCacheEvictionResponse.java | 102 +- .../processors/cache/GridCacheIoManager.java | 26 +- .../processors/cache/GridCacheMessage.java | 56 +- .../processors/cache/GridCacheValueBytes.java | 86 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 72 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 58 +- ...CachePessimisticCheckCommittedTxRequest.java | 98 +- ...achePessimisticCheckCommittedTxResponse.java | 58 +- .../distributed/GridCacheTtlUpdateRequest.java | 270 +-- .../distributed/GridDistributedBaseMessage.java | 168 +- .../GridDistributedCacheAdapter.java | 3 +- .../distributed/GridDistributedLockRequest.java | 306 ++-- .../GridDistributedLockResponse.java | 102 +- .../GridDistributedTxFinishRequest.java | 272 +-- .../GridDistributedTxFinishResponse.java | 48 +- .../GridDistributedTxPrepareRequest.java | 284 ++- .../GridDistributedTxPrepareResponse.java | 46 +- .../GridDistributedUnlockRequest.java | 78 +- .../dht/GridDhtAffinityAssignmentRequest.java | 34 +- .../dht/GridDhtAffinityAssignmentResponse.java | 46 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 176 +- .../distributed/dht/GridDhtLockResponse.java | 207 +-- .../distributed/dht/GridDhtTxFinishRequest.java | 276 +-- .../dht/GridDhtTxFinishResponse.java | 34 +- .../dht/GridDhtTxPrepareRequest.java | 215 +-- .../dht/GridDhtTxPrepareResponse.java | 215 +-- .../distributed/dht/GridDhtUnlockRequest.java | 78 +- .../GridDhtAtomicDeferredUpdateResponse.java | 78 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 635 ++----- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 117 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 485 ++---- .../atomic/GridNearAtomicUpdateResponse.java | 299 +--- .../dht/preloader/GridDhtForceKeysRequest.java | 114 +- .../dht/preloader/GridDhtForceKeysResponse.java | 114 +- .../GridDhtPartitionDemandMessage.java | 142 +- .../preloader/GridDhtPartitionExchangeId.java | 98 +- .../GridDhtPartitionSupplyMessage.java | 190 +-- .../GridDhtPartitionsAbstractMessage.java | 46 +- .../preloader/GridDhtPartitionsFullMessage.java | 58 +- .../GridDhtPartitionsSingleMessage.java | 34 +- .../GridDhtPartitionsSingleRequest.java | 18 +- .../distributed/near/GridNearGetRequest.java | 270 +-- .../distributed/near/GridNearGetResponse.java | 152 +- .../distributed/near/GridNearLockRequest.java | 256 +-- .../distributed/near/GridNearLockResponse.java | 214 +-- .../near/GridNearTxFinishRequest.java | 97 +- .../near/GridNearTxFinishResponse.java | 58 +- .../near/GridNearTxPrepareRequest.java | 165 +- .../near/GridNearTxPrepareResponse.java | 228 +-- .../distributed/near/GridNearUnlockRequest.java | 18 +- .../cache/query/GridCacheQueryRequest.java | 255 ++- .../cache/query/GridCacheQueryResponse.java | 182 +- .../cache/version/GridCacheVersion.java | 113 +- .../clock/GridClockDeltaSnapshotMessage.java | 118 +- .../processors/clock/GridClockDeltaVersion.java | 82 +- .../continuous/GridContinuousMessage.java | 88 +- .../continuous/GridContinuousProcessor.java | 6 - .../dataload/GridDataLoadRequest.java | 250 +-- .../dataload/GridDataLoadResponse.java | 60 +- .../processors/fs/GridGgfsAckMessage.java | 58 +- .../processors/fs/GridGgfsBlockKey.java | 72 +- .../processors/fs/GridGgfsBlocksMessage.java | 127 +- .../fs/GridGgfsCommunicationMessage.java | 16 +- .../processors/fs/GridGgfsDeleteMessage.java | 46 +- .../processors/fs/GridGgfsDeleteWorker.java | 8 +- .../fs/GridGgfsFileAffinityRange.java | 84 +- .../fs/GridGgfsFragmentizerRequest.java | 90 +- .../fs/GridGgfsFragmentizerResponse.java | 34 +- .../processors/fs/GridGgfsSyncMessage.java | 46 +- .../processors/fs/IgniteFsProcessor.java | 38 - .../plugin/IgnitePluginProcessor.java | 4 +- .../portable/GridPortableOutputStream.java | 7 - .../GridClientHandshakeRequestWrapper.java | 129 -- .../GridClientHandshakeResponseWrapper.java | 96 -- .../message/GridClientMessageWrapper.java | 266 --- .../client/message/GridClientPingPacket.java | 4 +- .../message/GridClientPingPacketWrapper.java | 89 - .../rest/client/message/GridRouterRequest.java | 1 + .../rest/client/message/GridRouterResponse.java | 2 +- .../handlers/task/GridTaskResultRequest.java | 48 +- .../handlers/task/GridTaskResultResponse.java | 72 +- .../protocols/tcp/GridClientPacketType.java | 3 + .../protocols/tcp/GridMemcachedMessage.java | 3 + .../tcp/GridMemcachedMessageWrapper.java | 269 --- .../tcp/GridTcpMemcachedNioListener.java | 13 +- .../protocols/tcp/GridTcpRestDirectParser.java | 519 ------ .../protocols/tcp/GridTcpRestNioListener.java | 31 +- .../rest/protocols/tcp/GridTcpRestParser.java | 75 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 63 +- .../streamer/GridStreamerCancelRequest.java | 36 +- .../streamer/GridStreamerExecutionRequest.java | 178 +- .../streamer/GridStreamerResponse.java | 48 +- .../processors/streamer/IgniteStreamerImpl.java | 6 +- .../version/GridVersionConverter.java | 46 - .../ignite/internal/util/GridByteArrayList.java | 81 +- .../internal/util/GridClientByteUtils.java | 3 +- .../ignite/internal/util/GridLongList.java | 92 +- .../ignite/internal/util/GridUuidCache.java | 59 - .../ignite/internal/util/IgniteUtils.java | 61 +- .../ignite/internal/util/IgniteUuidCache.java | 59 + .../GridTcpCommunicationMessageAdapter.java | 218 --- .../GridTcpCommunicationMessageFactory.java | 359 ---- .../GridTcpCommunicationMessageProducer.java | 31 - .../GridTcpCommunicationMessageState.java | 1599 ----------------- .../util/direct/GridTcpMessageFactory.java | 29 - .../internal/util/ipc/IpcToNioAdapter.java | 23 +- .../util/nio/GridCommunicationClient.java | 4 +- .../internal/util/nio/GridDirectParser.java | 30 +- .../internal/util/nio/GridNioMessageReader.java | 6 +- .../internal/util/nio/GridNioMessageWriter.java | 6 +- .../ignite/internal/util/nio/GridNioServer.java | 84 +- .../util/nio/GridShmemCommunicationClient.java | 24 +- .../util/nio/GridTcpCommunicationClient.java | 21 +- .../util/nio/GridTcpNioCommunicationClient.java | 4 +- .../optimized/optimized-classnames.properties | 152 +- .../org/apache/ignite/plugin/PluginContext.java | 7 - .../apache/ignite/plugin/PluginProvider.java | 2 - .../communication/MessageAdapter.java | 97 ++ .../communication/MessageCallback.java | 48 - .../communication/MessageFactory.java | 41 + .../communication/MessageFormatter.java | 46 + .../extensions/communication/MessageReader.java | 252 +++ .../extensions/communication/MessageWriter.java | 266 +++ .../extensions/communication/package.html | 24 + .../extensions/discovery/DiscoveryCallback.java | 51 - .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 34 +- .../jobstealing/JobStealingRequest.java | 36 +- .../communication/tcp/TcpCommunicationSpi.java | 209 +-- .../GridJobMasterLeaveAwareSelfTest.java | 6 +- .../GridCommunicationSendMessageSelfTest.java | 21 +- .../communication/GridIoManagerSelfTest.java | 10 +- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 1 - .../GridCacheAtomicMessageCountSelfTest.java | 4 +- ...ridCacheReplicatedSynchronousCommitTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 4 +- .../GridCacheAtomicTimeoutSelfTest.java | 4 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 4 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 4 +- .../GridCacheDhtPreloadMessageCountTest.java | 4 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +- .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- .../communication/GridIoManagerBenchmark0.java | 8 +- .../communication/GridTestMessage.java | 8 +- .../GridAbstractCommunicationSelfTest.java | 27 +- .../spi/communication/GridTestMessage.java | 66 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 6 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 23 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 6 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 27 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 17 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 16 +- .../testframework/GridSpiTestContext.java | 48 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../yardstick/config/benchmark-store.properties | 33 +- .../yardstick/config/ignite-store-config.xml | 50 +- .../yardstick/IgniteBenchmarkArguments.java | 22 + .../org/apache/ignite/yardstick/IgniteNode.java | 5 + pom.xml | 8 +- 204 files changed, 9078 insertions(+), 12301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 72b9142,5ac464b..d2dced1 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@@ -771,10 -775,9 +771,8 @@@ public class IgniteKernal extends Clust provider.start(ctx.plugins().pluginContextForProvider(provider), attrs); } - ctx.createMessageFactory(); - if (ctx.isEnterprise()) { security = new GridSecurityImpl(ctx); - portables = new GridPortablesImpl(ctx); } gw.writeLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index f584a94,b04234c..b887c52 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@@ -31,6 -31,11 +31,10 @@@ import org.apache.ignite.internal.manag import org.apache.ignite.internal.mxbean.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; + import org.apache.ignite.lang.*; + import org.apache.ignite.lifecycle.*; + import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.portables.*; + import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.streamer.*; import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9564b451/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java ----------------------------------------------------------------------
