Merge remote-tracking branch 'remotes/origin/ignite-315' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12ee896b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12ee896b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12ee896b Branch: refs/heads/ignite-sql-tests Commit: 12ee896b343115d0d10dd7f8f1deda14f93d945a Parents: 0fe6bb4 87c1a7d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Feb 25 16:15:58 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Feb 25 16:15:58 2015 +0300 ---------------------------------------------------------------------- .../processors/rest/TestBinaryClient.java | 7 +- .../processors/rest/TestMemcacheClient.java | 45 +- .../protocols/tcp/TcpRestParserSelfTest.java | 14 +- .../CacheRendezvousAffinityFunction.java | 3 +- .../IgfsByteDelimiterRecordResolver.java | 5 +- .../ignite/internal/ClusterMetricsSnapshot.java | 205 +++--- .../internal/GridEventConsumeHandler.java | 9 +- .../internal/GridMessageListenHandler.java | 9 +- .../router/impl/GridTcpRouterNioParser.java | 10 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../igfs/common/IgfsControlResponse.java | 7 +- .../internal/igfs/common/IgfsMarshaller.java | 17 +- .../affinity/GridAffinityMessage.java | 5 +- .../processors/cache/GridCacheEntryInfo.java | 13 +- .../processors/cache/GridCacheUtils.java | 8 +- .../continuous/CacheContinuousQueryEntry.java | 13 +- .../continuous/CacheContinuousQueryHandler.java | 5 +- .../cache/transactions/IgniteTxEntry.java | 21 +- .../version/GridCacheRawVersionedEntry.java | 9 +- .../processors/clock/GridClockMessage.java | 25 +- .../continuous/GridContinuousProcessor.java | 4 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../internal/processors/igfs/IgfsServer.java | 5 +- .../processors/rest/GridRestResponse.java | 5 +- .../message/GridClientAbstractMessage.java | 5 +- .../message/GridClientHandshakeRequest.java | 5 +- .../protocols/tcp/GridMemcachedMessage.java | 5 +- .../rest/protocols/tcp/GridTcpRestParser.java | 44 +- .../ignite/internal/util/GridByteArrayList.java | 14 +- .../ignite/internal/util/IgniteByteUtils.java | 705 +++++++++++++++++++ .../ignite/internal/util/IgniteUtils.java | 685 +----------------- .../nio/GridConnectionBytesVerifyFilter.java | 3 +- .../util/nio/GridTcpCommunicationClient.java | 3 +- .../internal/visor/util/VisorTaskUtils.java | 3 +- .../ignite/lang/IgniteProductVersion.java | 7 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../messages/TcpDiscoveryAuthFailedMessage.java | 5 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 15 +- .../igfs/IgfsDataManagerSelfTest.java | 4 +- .../internal/util/IgniteUtilsSelfTest.java | 18 +- .../internal/util/nio/GridNioSelfTest.java | 6 +- .../internal/util/nio/GridRoundTripTest.java | 5 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 4 +- .../ignite/lang/GridByteArrayListSelfTest.java | 6 +- .../communication/GridTestMessage.java | 5 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 6 +- .../internal/igfs/hadoop/IgfsHadoopIpcIo.java | 10 +- .../shuffle/GridHadoopShuffleMessage.java | 5 +- .../hadoop/v2/GridHadoopSplitWrapper.java | 6 +- .../http/jetty/GridJettyRestHandler.java | 3 +- 53 files changed, 1060 insertions(+), 995 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12ee896b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12ee896b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12ee896b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------