# IGNITE-55 Merge branches 'ignite-55' and 'sprint-1'.
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/visor/portable/VisorPortableMetadataCollectorTask.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cfda9bfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cfda9bfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cfda9bfd
Branch: refs/heads/ignite-55
Commit: cfda9bfdd6827aa741398e6664b660bcc885d455
Parents: 9505557 57268b6
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Wed Feb 11 07:23:55 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Wed Feb 11 07:23:55 2015 +0700
----------------------------------------------------------------------
assembly/release-base.xml | 5 +
config/router/default-router.xml | 2 +-
.../HibernateL2CacheExampleNodeStartup.java | 1 +
.../MemcacheRestExampleNodeStartup.java | 2 +
.../config/grid-client-spring-config.xml | 6 +-
.../ClientAbstractMultiThreadedSelfTest.java | 615 -------
.../client/ClientDefaultCacheSelfTest.java | 220 ---
.../ignite/client/ClientGetAffinityTask.java | 64 -
.../apache/ignite/client/ClientHttpTask.java | 58 -
.../apache/ignite/client/ClientNodeStartup.java | 57 -
.../client/ClientPortableArgumentTask.java | 52 -
.../ignite/client/ClientPutPortableTask.java | 43 -
.../client/ClientReconnectionSelfTest.java | 235 ---
.../ignite/client/ClientSslNodeStartup.java | 59 -
.../ignite/client/ClientStartNodeTask.java | 179 --
.../ignite/client/ClientStopNodeTask.java | 127 --
.../ignite/client/ClientStringLengthTask.java | 71 -
.../client/ClientTcpMultiThreadedSelfTest.java | 45 -
.../ClientTcpSslAuthenticationSelfTest.java | 265 ---
.../ClientTcpSslMultiThreadedSelfTest.java | 46 -
.../org/apache/ignite/client/ClientTcpTask.java | 71 -
...skExecutionAfterTopologyRestartSelfTest.java | 75 -
.../ignite/client/ClientTestPortable.java | 490 ------
.../ClientTestPortableAffinityKeyTask.java | 85 -
.../ignite/client/ClientTestRestServer.java | 275 ---
.../client/ClientTopologyCacheSelfTest.java | 288 ----
.../org/apache/ignite/client/HashMapStore.java | 53 -
.../org/apache/ignite/client/SleepTestTask.java | 66 -
.../client/TaskSingleJobSplitAdapter.java | 70 -
.../client/impl/ClientCacheFlagsCodecTest.java | 83 -
.../client/impl/ClientComputeImplSelfTest.java | 167 --
.../client/impl/ClientDataImplSelfTest.java | 268 ---
.../impl/ClientFutureAdapterSelfTest.java | 115 --
.../impl/ClientPartitionAffinitySelfTest.java | 406 -----
.../ClientPropertiesConfigurationSelfTest.java | 232 ---
.../ClientAbstractConnectivitySelfTest.java | 303 ----
.../ClientAbstractMultiNodeSelfTest.java | 834 ---------
.../integration/ClientAbstractSelfTest.java | 1601 -----------------
.../integration/ClientPreferDirectSelfTest.java | 192 ---
.../ClientTcpConnectivitySelfTest.java | 75 -
.../ClientTcpDirectMultiNodeSelfTest.java | 55 -
.../integration/ClientTcpDirectSelfTest.java | 58 -
.../integration/ClientTcpMultiNodeSelfTest.java | 35 -
.../client/integration/ClientTcpSelfTest.java | 46 -
.../ClientTcpSslDirectMultiNodeSelfTest.java | 62 -
.../integration/ClientTcpSslDirectSelfTest.java | 59 -
.../ClientTcpSslMultiNodeSelfTest.java | 42 -
.../integration/ClientTcpSslSelfTest.java | 47 -
.../ClientTcpUnreachableMultiNodeSelfTest.java | 134 --
.../ignite/client/integration/package.html | 24 -
.../client/router/ClientFailedInitSelfTest.java | 275 ---
.../client/router/RouterFactorySelfTest.java | 107 --
.../router/TcpRouterAbstractSelfTest.java | 125 --
.../router/TcpRouterMultiNodeSelfTest.java | 110 --
.../ignite/client/router/TcpRouterSelfTest.java | 35 -
.../client/router/TcpSslRouterSelfTest.java | 48 -
.../apache/ignite/client/router/package.html | 24 -
.../testsuites/IgniteRouterTestSuite.java | 41 -
.../client/suite/IgniteClientTestSuite.java | 118 --
.../ignite/client/util/ClientByteUtilsTest.java | 172 --
.../util/ClientConsistentHashSelfTest.java | 281 ---
.../client/util/ClientJavaHasherSelfTest.java | 84 -
.../internal/TaskEventSubjectIdSelfTest.java | 4 +-
.../ClientAbstractMultiThreadedSelfTest.java | 615 +++++++
.../client/ClientDefaultCacheSelfTest.java | 220 +++
.../internal/client/ClientGetAffinityTask.java | 64 +
.../ignite/internal/client/ClientHttpTask.java | 58 +
.../internal/client/ClientNodeStartup.java | 57 +
.../client/ClientReconnectionSelfTest.java | 233 +++
.../internal/client/ClientSslNodeStartup.java | 59 +
.../internal/client/ClientStartNodeTask.java | 179 ++
.../internal/client/ClientStopNodeTask.java | 127 ++
.../internal/client/ClientStringLengthTask.java | 71 +
.../client/ClientTcpMultiThreadedSelfTest.java | 45 +
.../ClientTcpSslAuthenticationSelfTest.java | 265 +++
.../ClientTcpSslMultiThreadedSelfTest.java | 46 +
.../ignite/internal/client/ClientTcpTask.java | 71 +
...skExecutionAfterTopologyRestartSelfTest.java | 75 +
.../internal/client/ClientTestRestServer.java | 281 +++
.../client/ClientTopologyCacheSelfTest.java | 288 ++++
.../ignite/internal/client/HashMapStore.java | 53 +
.../ignite/internal/client/SleepTestTask.java | 66 +
.../client/TaskSingleJobSplitAdapter.java | 70 +
.../client/impl/ClientCacheFlagsCodecTest.java | 83 +
.../client/impl/ClientComputeImplSelfTest.java | 167 ++
.../client/impl/ClientDataImplSelfTest.java | 268 +++
.../impl/ClientFutureAdapterSelfTest.java | 115 ++
.../impl/ClientPartitionAffinitySelfTest.java | 406 +++++
.../ClientPropertiesConfigurationSelfTest.java | 232 +++
.../ClientAbstractConnectivitySelfTest.java | 303 ++++
.../ClientAbstractMultiNodeSelfTest.java | 828 +++++++++
.../integration/ClientAbstractSelfTest.java | 1480 ++++++++++++++++
.../integration/ClientPreferDirectSelfTest.java | 192 +++
.../ClientTcpConnectivitySelfTest.java | 75 +
.../ClientTcpDirectMultiNodeSelfTest.java | 55 +
.../integration/ClientTcpDirectSelfTest.java | 58 +
.../integration/ClientTcpMultiNodeSelfTest.java | 35 +
.../client/integration/ClientTcpSelfTest.java | 46 +
.../ClientTcpSslDirectMultiNodeSelfTest.java | 62 +
.../integration/ClientTcpSslDirectSelfTest.java | 59 +
.../ClientTcpSslMultiNodeSelfTest.java | 42 +
.../integration/ClientTcpSslSelfTest.java | 47 +
.../ClientTcpUnreachableMultiNodeSelfTest.java | 134 ++
.../client/router/ClientFailedInitSelfTest.java | 275 +++
.../client/router/RouterFactorySelfTest.java | 107 ++
.../router/TcpRouterAbstractSelfTest.java | 125 ++
.../router/TcpRouterMultiNodeSelfTest.java | 110 ++
.../client/router/TcpRouterSelfTest.java | 35 +
.../client/router/TcpSslRouterSelfTest.java | 48 +
.../client/suite/IgniteClientTestSuite.java | 118 ++
.../client/util/ClientByteUtilsTest.java | 172 ++
.../util/ClientConsistentHashSelfTest.java | 281 +++
.../client/util/ClientJavaHasherSelfTest.java | 84 +
.../rest/AbstractRestProcessorSelfTest.java | 6 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 54 +-
.../rest/RestMemcacheProtocolSelfTest.java | 8 +-
.../rest/RestProcessorMultiStartSelfTest.java | 2 +-
.../rest/RestProcessorStartSelfTest.java | 10 +-
.../processors/rest/RestProcessorTest.java | 8 +-
.../rest/TaskCommandHandlerSelfTest.java | 12 +-
.../processors/rest/TestBinaryClient.java | 33 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 16 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 8 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../loadtests/client/ClientCacheBenchmark.java | 2 +-
.../client/ClientMarshallerBenchmarkTest.java | 6 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 4 +-
.../clients/src/test/resources/spring-cache.xml | 11 +-
.../src/test/resources/spring-router-ssl.xml | 4 +-
.../src/test/resources/spring-router.xml | 2 +-
.../src/test/resources/spring-server-node.xml | 22 +-
.../test/resources/spring-server-ssl-node.xml | 22 +-
modules/codegen/pom.xml | 50 +
.../CommunicationMessageCodeGenerator.java | 782 +++++++++
.../src/main/java/org/apache/ignite/Ignite.java | 7 -
.../java/org/apache/ignite/IgniteCache.java | 2 +-
.../java/org/apache/ignite/IgnitePortables.java | 364 ----
.../apache/ignite/cache/CacheProjection.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 10 +-
.../org/apache/ignite/client/GridClient.java | 148 --
.../GridClientAuthenticationException.java | 35 -
.../ignite/client/GridClientCacheFlag.java | 65 -
.../ignite/client/GridClientCacheMode.java | 32 -
.../client/GridClientClosedException.java | 35 -
.../apache/ignite/client/GridClientCompute.java | 476 ------
.../ignite/client/GridClientConfiguration.java | 868 ----------
.../apache/ignite/client/GridClientData.java | 443 -----
.../ignite/client/GridClientDataAffinity.java | 39 -
.../client/GridClientDataConfiguration.java | 118 --
.../ignite/client/GridClientDataMetrics.java | 77 -
.../client/GridClientDisconnectedException.java | 36 -
.../ignite/client/GridClientException.java | 111 --
.../apache/ignite/client/GridClientFactory.java | 138 --
.../apache/ignite/client/GridClientFuture.java | 68 -
.../ignite/client/GridClientFutureListener.java | 30 -
.../GridClientFutureTimeoutException.java | 45 -
.../client/GridClientHandshakeException.java | 48 -
.../apache/ignite/client/GridClientNode.java | 128 --
.../ignite/client/GridClientNodeMetrics.java | 524 ------
.../client/GridClientPartitionAffinity.java | 369 ----
.../ignite/client/GridClientPredicate.java | 38 -
.../ignite/client/GridClientProtocol.java | 26 -
.../client/GridClientTopologyListener.java | 41 -
.../client/GridServerUnreachableException.java | 45 -
.../balancer/GridClientBalancerAdapter.java | 76 -
.../client/balancer/GridClientLoadBalancer.java | 44 -
.../balancer/GridClientRandomBalancer.java | 75 -
.../balancer/GridClientRoundRobinBalancer.java | 111 --
.../apache/ignite/client/balancer/package.html | 24 -
.../impl/GridClientAbstractProjection.java | 458 -----
.../client/impl/GridClientAndPredicate.java | 52 -
.../client/impl/GridClientComputeImpl.java | 293 ----
.../ignite/client/impl/GridClientDataImpl.java | 389 -----
.../impl/GridClientDataMetricsAdapter.java | 160 --
.../client/impl/GridClientFutureAdapter.java | 349 ----
.../client/impl/GridClientFutureCallback.java | 35 -
.../ignite/client/impl/GridClientImpl.java | 524 ------
.../ignite/client/impl/GridClientNodeImpl.java | 396 -----
.../impl/GridClientNodeMetricsAdapter.java | 990 -----------
.../client/impl/GridClientThreadFactory.java | 62 -
.../impl/connection/GridClientConnection.java | 531 ------
.../GridClientConnectionCloseReason.java | 32 -
.../connection/GridClientConnectionManager.java | 71 -
.../GridClientConnectionManagerAdapter.java | 763 ---------
.../GridClientConnectionManagerOsImpl.java | 47 -
.../GridClientConnectionResetException.java | 48 -
.../connection/GridClientNioTcpConnection.java | 1159 -------------
.../impl/connection/GridClientTopology.java | 450 -----
.../GridConnectionIdleClosedException.java | 36 -
.../org/apache/ignite/client/impl/package.html | 24 -
.../client/marshaller/GridClientMarshaller.java | 45 -
.../marshaller/jdk/GridClientJdkMarshaller.java | 68 -
.../ignite/client/marshaller/jdk/package.html | 24 -
.../GridClientOptimizedMarshaller.java | 103 --
.../client/marshaller/optimized/package.html | 24 -
.../ignite/client/marshaller/package.html | 24 -
.../java/org/apache/ignite/client/package.html | 24 -
.../ignite/client/router/GridRouterFactory.java | 126 --
.../ignite/client/router/GridTcpRouter.java | 76 -
.../router/GridTcpRouterConfiguration.java | 306 ----
.../client/router/GridTcpRouterMBean.java | 88 -
.../router/impl/GridRouterClientImpl.java | 200 ---
.../impl/GridRouterCommandLineStartup.java | 169 --
.../client/router/impl/GridTcpRouterImpl.java | 348 ----
.../impl/GridTcpRouterNioListenerAdapter.java | 203 ---
.../impl/GridTcpRouterNioListenerOsImpl.java | 38 -
.../router/impl/GridTcpRouterNioParser.java | 109 --
.../ignite/client/router/impl/package.html | 24 -
.../apache/ignite/client/router/package.html | 24 -
.../client/ssl/GridSslBasicContextFactory.java | 438 -----
.../client/ssl/GridSslContextFactory.java | 36 -
.../org/apache/ignite/client/ssl/package.html | 24 -
.../client/util/GridClientConsistentHash.java | 440 -----
.../client/util/GridClientStripedLock.java | 135 --
.../ignite/client/util/GridClientUtils.java | 171 --
.../client/util/GridConcurrentHashSet.java | 113 --
.../org/apache/ignite/client/util/package.html | 24 -
.../configuration/CacheConfiguration.java | 64 -
.../ClientConnectionConfiguration.java | 541 ------
.../configuration/ClientMessageInterceptor.java | 45 -
.../configuration/ConnectorConfiguration.java | 518 ++++++
.../ConnectorMessageInterceptor.java | 45 +
.../configuration/IgniteConfiguration.java | 580 +------
.../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 | 75 +-
.../ignite/internal/GridPluginComponent.java | 2 +
.../ignite/internal/GridPluginContext.java | 6 -
.../ignite/internal/GridPortablesImpl.java | 174 --
.../ignite/internal/GridTaskCancelRequest.java | 34 +-
.../ignite/internal/GridTaskSessionRequest.java | 58 +-
.../apache/ignite/internal/IgniteKernal.java | 33 +-
.../org/apache/ignite/internal/IgnitionEx.java | 18 +-
.../ignite/internal/client/GridClient.java | 146 ++
.../GridClientAuthenticationException.java | 35 +
.../internal/client/GridClientCacheFlag.java | 65 +
.../internal/client/GridClientCacheMode.java | 32 +
.../client/GridClientClosedException.java | 35 +
.../internal/client/GridClientCompute.java | 419 +++++
.../client/GridClientConfiguration.java | 844 +++++++++
.../ignite/internal/client/GridClientData.java | 443 +++++
.../internal/client/GridClientDataAffinity.java | 39 +
.../client/GridClientDataConfiguration.java | 118 ++
.../internal/client/GridClientDataMetrics.java | 77 +
.../client/GridClientDisconnectedException.java | 36 +
.../internal/client/GridClientException.java | 111 ++
.../internal/client/GridClientFactory.java | 138 ++
.../internal/client/GridClientFuture.java | 68 +
.../client/GridClientFutureListener.java | 30 +
.../GridClientFutureTimeoutException.java | 45 +
.../client/GridClientHandshakeException.java | 48 +
.../ignite/internal/client/GridClientNode.java | 128 ++
.../internal/client/GridClientNodeMetrics.java | 524 ++++++
.../client/GridClientPartitionAffinity.java | 369 ++++
.../internal/client/GridClientPredicate.java | 38 +
.../internal/client/GridClientProtocol.java | 26 +
.../client/GridClientTopologyListener.java | 41 +
.../client/GridServerUnreachableException.java | 45 +
.../balancer/GridClientBalancerAdapter.java | 76 +
.../client/balancer/GridClientLoadBalancer.java | 44 +
.../balancer/GridClientRandomBalancer.java | 75 +
.../balancer/GridClientRoundRobinBalancer.java | 111 ++
.../impl/GridClientAbstractProjection.java | 458 +++++
.../client/impl/GridClientAndPredicate.java | 52 +
.../client/impl/GridClientComputeImpl.java | 263 +++
.../client/impl/GridClientDataImpl.java | 389 +++++
.../impl/GridClientDataMetricsAdapter.java | 160 ++
.../client/impl/GridClientFutureAdapter.java | 349 ++++
.../client/impl/GridClientFutureCallback.java | 35 +
.../internal/client/impl/GridClientImpl.java | 527 ++++++
.../client/impl/GridClientNodeImpl.java | 396 +++++
.../impl/GridClientNodeMetricsAdapter.java | 990 +++++++++++
.../client/impl/GridClientThreadFactory.java | 62 +
.../impl/connection/GridClientConnection.java | 515 ++++++
.../GridClientConnectionCloseReason.java | 32 +
.../connection/GridClientConnectionManager.java | 71 +
.../GridClientConnectionManagerAdapter.java | 644 +++++++
.../GridClientConnectionManagerOsImpl.java | 48 +
.../GridClientConnectionResetException.java | 48 +
.../connection/GridClientNioTcpConnection.java | 1063 ++++++++++++
.../impl/connection/GridClientTopology.java | 450 +++++
.../GridConnectionIdleClosedException.java | 36 +
.../client/marshaller/GridClientMarshaller.java | 45 +
.../marshaller/jdk/GridClientJdkMarshaller.java | 68 +
.../GridClientOptimizedMarshaller.java | 103 ++
.../client/router/GridRouterFactory.java | 126 ++
.../internal/client/router/GridTcpRouter.java | 74 +
.../router/GridTcpRouterConfiguration.java | 306 ++++
.../client/router/GridTcpRouterMBean.java | 88 +
.../router/impl/GridRouterClientImpl.java | 200 +++
.../impl/GridRouterCommandLineStartup.java | 169 ++
.../client/router/impl/GridTcpRouterImpl.java | 348 ++++
.../impl/GridTcpRouterNioListenerAdapter.java | 203 +++
.../impl/GridTcpRouterNioListenerOsImpl.java | 38 +
.../router/impl/GridTcpRouterNioParser.java | 115 ++
.../client/ssl/GridSslBasicContextFactory.java | 438 +++++
.../client/ssl/GridSslContextFactory.java | 36 +
.../client/util/GridClientConsistentHash.java | 440 +++++
.../client/util/GridClientStripedLock.java | 135 ++
.../internal/client/util/GridClientUtils.java | 171 ++
.../client/util/GridConcurrentHashSet.java | 113 ++
.../internal/direct/DirectByteBufferStream.java | 1613 ++++++++++++++++++
.../internal/direct/DirectMessageReader.java | 279 +++
.../internal/direct/DirectMessageWriter.java | 216 +++
.../ignite/internal/jdbc/JdbcConnection.java | 2 +-
.../internal/jdbc/JdbcDatabaseMetadata.java | 2 +-
.../ignite/internal/jdbc/JdbcResultSet.java | 2 +-
.../ignite/internal/jdbc/JdbcStatement.java | 2 +-
.../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 +--
.../affinity/GridAffinityAssignmentCache.java | 3 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 21 +-
.../processors/cache/GridCacheAttributes.java | 11 -
.../processors/cache/GridCacheContext.java | 129 +-
.../GridCacheDefaultAffinityKeyMapper.java | 34 +-
.../cache/GridCacheEvictionRequest.java | 58 +-
.../cache/GridCacheEvictionResponse.java | 102 +-
.../processors/cache/GridCacheIoManager.java | 26 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheMessage.java | 56 +-
.../GridCachePartitionExchangeManager.java | 18 +-
.../processors/cache/GridCacheProcessor.java | 12 +-
.../cache/GridCacheProjectionImpl.java | 12 +-
.../processors/cache/GridCacheStoreManager.java | 4 +-
.../cache/GridCacheUpdateAtomicResult.java | 6 +-
.../processors/cache/GridCacheValueBytes.java | 86 +-
.../IgniteCacheOsSerializationManager.java | 48 +
.../cache/affinity/GridCacheAffinityImpl.java | 3 +-
...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 +-
.../GridDistributedTxRemoteAdapter.java | 4 +-
.../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 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../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 +-
.../IgniteCacheSerializationManager.java | 51 +
.../cache/transactions/IgniteTxAdapter.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +-
.../cache/version/GridCacheVersion.java | 113 +-
...ridCacheVersionAbstractConflictResolver.java | 6 +-
.../GridCacheVersionConflictContext.java | 166 +-
.../GridCacheVersionConflictContextImpl.java | 187 --
.../GridCacheVersionConflictResolver.java | 2 +-
.../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 +-
.../dataload/IgniteDataLoaderImpl.java | 6 +-
.../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 | 8 +-
.../portable/GridPortableOutputStream.java | 7 -
.../portable/GridPortableProcessor.java | 90 +-
.../portable/os/GridOsPortableProcessor.java | 50 +-
.../processors/query/GridQueryProcessor.java | 33 +-
.../processors/rest/GridRestProcessor.java | 25 +-
.../message/GridClientAbstractMessage.java | 17 +-
.../GridClientAuthenticationRequest.java | 19 -
.../message/GridClientCacheQueryRequest.java | 45 -
.../client/message/GridClientCacheRequest.java | 48 -
.../message/GridClientGetMetaDataRequest.java | 64 -
.../GridClientHandshakeRequestWrapper.java | 129 --
.../GridClientHandshakeResponseWrapper.java | 96 --
.../client/message/GridClientLogRequest.java | 141 --
.../message/GridClientMessageWrapper.java | 266 ---
.../message/GridClientMetaDataResponse.java | 57 -
.../rest/client/message/GridClientNodeBean.java | 40 +-
.../message/GridClientNodeMetricsBean.java | 120 +-
.../client/message/GridClientPingPacket.java | 4 +-
.../message/GridClientPingPacketWrapper.java | 89 -
.../message/GridClientPortableMetaData.java | 23 +-
.../message/GridClientPutMetaDataRequest.java | 64 -
.../rest/client/message/GridClientResponse.java | 23 -
.../client/message/GridClientTaskRequest.java | 28 -
.../message/GridClientTaskResultBean.java | 28 +-
.../message/GridClientTopologyRequest.java | 25 -
.../rest/client/message/GridRouterRequest.java | 1 +
.../rest/client/message/GridRouterResponse.java | 2 +-
.../cache/GridCacheClientQueryResult.java | 24 +-
.../handlers/log/GridLogCommandHandler.java | 306 ----
.../processors/rest/handlers/log/package.html | 24 -
.../metadata/GridPortableMetadataHandler.java | 103 --
.../handlers/task/GridTaskCommandHandler.java | 3 +-
.../handlers/task/GridTaskResultRequest.java | 48 +-
.../handlers/task/GridTaskResultResponse.java | 72 +-
.../rest/protocols/GridRestProtocolAdapter.java | 8 +-
.../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 | 60 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 83 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 103 +-
.../GridRestPortableGetMetaDataRequest.java | 44 -
.../GridRestPortablePutMetaDataRequest.java | 44 -
.../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 | 137 +-
.../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 | 88 +-
.../util/nio/GridShmemCommunicationClient.java | 24 +-
.../util/nio/GridTcpCommunicationClient.java | 21 +-
.../util/nio/GridTcpNioCommunicationClient.java | 4 +-
.../util/portable/PortableRawReaderEx.java | 32 -
.../util/portable/PortableRawWriterEx.java | 43 -
.../node/VisorExecutorServiceConfiguration.java | 4 +-
.../visor/node/VisorRestConfiguration.java | 13 +-
.../visor/portable/VisorPortableMetadata.java | 72 -
.../VisorPortableMetadataCollectorTask.java | 94 -
.../portable/VisorPortableMetadataField.java | 71 -
.../optimized/optimized-classnames.properties | 160 +-
.../org/apache/ignite/plugin/PluginContext.java | 7 -
.../apache/ignite/plugin/PluginProvider.java | 4 +-
.../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 -
.../security/GridSecurityCredentials.java | 20 +-
.../ignite/portables/PortableBuilder.java | 137 --
.../ignite/portables/PortableConfiguration.java | 189 --
.../ignite/portables/PortableException.java | 57 -
.../ignite/portables/PortableIdMapper.java | 55 -
.../PortableInvalidClassException.java | 58 -
.../ignite/portables/PortableMarshalAware.java | 48 -
.../ignite/portables/PortableMetadata.java | 61 -
.../apache/ignite/portables/PortableObject.java | 160 --
.../ignite/portables/PortableRawReader.java | 235 ---
.../ignite/portables/PortableRawWriter.java | 218 ---
.../apache/ignite/portables/PortableReader.java | 286 ----
.../ignite/portables/PortableSerializer.java | 47 -
.../portables/PortableTypeConfiguration.java | 195 ---
.../apache/ignite/portables/PortableWriter.java | 265 ---
.../org/apache/ignite/portables/package.html | 24 -
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 34 +-
.../jobstealing/JobStealingRequest.java | 36 +-
.../communication/tcp/TcpCommunicationSpi.java | 209 +--
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../test/config/default-spring-url-testing.xml | 2 +
modules/core/src/test/config/example-cache.xml | 2 +
.../src/test/config/io-manager-benchmark.xml | 1 +
.../src/test/config/job-loadtest/client.xml | 2 +
.../src/test/config/job-loadtest/server.xml | 2 +
modules/core/src/test/config/jobs-load-base.xml | 2 +
.../src/test/config/load/cache-benchmark.xml | 2 +
.../test/config/load/cache-client-benchmark.xml | 2 +
.../core/src/test/config/load/dsi-load-base.xml | 2 +
.../src/test/config/load/merge-sort-base.xml | 2 +
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +
.../core/src/test/config/loaders/grid-cfg.xml | 5 +
.../config/spring-cache-put-remove-load.xml | 2 +
.../src/test/config/spring-start-nodes-attr.xml | 2 +
.../core/src/test/config/spring-start-nodes.xml | 2 +
.../config/streamer/spring-streamer-base.xml | 2 +
.../test/config/websession/spring-cache-1.xml | 2 +
.../test/config/websession/spring-cache-2.xml | 2 +
.../test/config/websession/spring-cache-3.xml | 2 +
.../internal/GridDiscoveryEventSelfTest.java | 2 +
.../GridJobMasterLeaveAwareSelfTest.java | 6 +-
.../internal/GridLifecycleAwareSelfTest.java | 18 +-
.../ignite/internal/GridStartStopSelfTest.java | 6 +
.../GridCommunicationSendMessageSelfTest.java | 21 +-
.../communication/GridIoManagerSelfTest.java | 10 +-
.../GridDeploymentMessageCountSelfTest.java | 4 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 39 +-
.../cache/GridCacheAbstractSelfTest.java | 8 -
.../cache/GridCacheAffinityMapperSelfTest.java | 17 +
.../GridCacheAtomicMessageCountSelfTest.java | 4 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 2 +
.../cache/GridCacheDeploymentSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 1 +
.../cache/GridCacheMemoryModeSelfTest.java | 8 -
...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 -
.../GridCacheOffHeapTieredAbstractSelfTest.java | 15 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 78 +-
...ridCacheReplicatedSynchronousCommitTest.java | 4 +-
.../cache/IgniteCacheAbstractTest.java | 8 -
.../cache/IgniteTxReentryAbstractSelfTest.java | 4 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 1 +
...tractDistributedByteArrayValuesSelfTest.java | 10 -
...tractPartitionedByteArrayValuesSelfTest.java | 3 -
.../GridCacheAtomicTimeoutSelfTest.java | 4 +-
...dCacheMultithreadedFailoverAbstractTest.java | 1 +
.../GridCachePreloadLifecycleAbstractTest.java | 1 +
...xOriginatingNodeFailureAbstractSelfTest.java | 4 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 18 +
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 19 +-
.../GridCacheNearReaderPreloadSelfTest.java | 1 +
.../near/GridCachePartitionedLockSelfTest.java | 34 -
.../GridCacheReplicatedInvalidateSelfTest.java | 4 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 59 +-
.../query/GridCacheSwapScanQuerySelfTest.java | 4 -
.../dataload/GridDataLoaderPerformanceTest.java | 2 +
...heGgfsPerBlockLruEvictionPolicySelfTest.java | 2 +
.../processors/fs/GridGgfsAbstractSelfTest.java | 1 +
.../processors/fs/GridGgfsModesSelfTest.java | 2 +
.../cache/GridCacheCommandHandlerSelfTest.java | 6 +-
...dStartupWithUndefinedIgniteHomeSelfTest.java | 1 +
.../communication/GridIoManagerBenchmark0.java | 8 +-
.../GridTcpCommunicationBenchmark.java | 2 +-
.../communication/GridTestMessage.java | 8 +-
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../spi/GridTcpSpiForwardingSelfTest.java | 1 +
.../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 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 1 +
.../testframework/GridSpiTestContext.java | 48 +-
.../ignite/testframework/GridTestUtils.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../ignite/testframework/junits/IgniteMock.java | 5 -
.../client/hadoop/GridHadoopClientProtocol.java | 2 +-
.../GridHadoopClientProtocolProvider.java | 6 +-
.../GridGgfsHadoopDualAbstractSelfTest.java | 1 +
...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 +
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 1 +
.../hadoop/GridHadoopAbstractSelfTest.java | 6 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 1 +
.../http/jetty/GridJettyRestProtocol.java | 6 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 -
.../ignite/internal/GridFactorySelfTest.java | 9 +
.../GridSpringBeanSerializationSelfTest.java | 2 +
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
.../yardstick/config/benchmark-store.properties | 33 +-
modules/yardstick/config/ignite-base-config.xml | 2 +
.../yardstick/config/ignite-store-config.xml | 52 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +
.../org/apache/ignite/yardstick/IgniteNode.java | 13 +-
pom.xml | 99 +-
641 files changed, 33427 insertions(+), 43125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfda9bfd/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
