You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/24 15:03:26 UTC
[03/50] [abbrv] ignite git commit: IGNITE-3054 - Some optimizations
IGNITE-3054 - Some optimizations
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92870609
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92870609
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92870609
Branch: refs/heads/ignite-3054
Commit: 92870609fd59df25d1375e7894d24d45ab3b6f1d
Parents: ef1f288
Author: dkarachentsev <dk...@gridgain.com>
Authored: Mon Nov 7 16:10:28 2016 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Mon Nov 7 16:10:28 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 3 ++-
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 11 ++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/92870609/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 1136c97..70a9209 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -127,7 +127,8 @@ class ClientImpl extends TcpDiscoveryImpl {
private static final Object SPI_RECONNECT_FAILED = "SPI_RECONNECT_FAILED";
/** */
- private static int DFLT_BYTE_ARR_STREAM_SIZE = 512;
+ @SuppressWarnings("FieldCanBeLocal")
+ private static int DFLT_BYTE_ARR_STREAM_SIZE = 32 * 1024;
/** Remote nodes. */
private final ConcurrentMap<UUID, TcpDiscoveryNode> rmtNodes = new ConcurrentHashMap8<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/92870609/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 29f613a..66bc8f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -6162,13 +6162,14 @@ class ServerImpl extends TcpDiscoveryImpl {
}
if (in == null) {
- final int left = buf.remaining();
+ final int oldLim = buf.limit();
- buf.get(msgBuf.array(), msgBuf.position(), Math.min(left, msgBuf.remaining()));
+ if (buf.remaining() > msgBuf.remaining())
+ buf.limit(buf.position() + msgBuf.remaining());
- final int read = left - buf.remaining();
+ msgBuf.put(buf);
- msgBuf.position(msgBuf.position() + read);
+ buf.limit(oldLim);
if (!msgBuf.hasRemaining()) {
msgBuf.rewind();
@@ -6206,7 +6207,7 @@ class ServerImpl extends TcpDiscoveryImpl {
assert buf == null || buf.position() == 0 : buf;
if (buf == null || buf.capacity() < len)
- buf = ByteBuffer.allocate(len);
+ buf = ByteBuffer.allocateDirect(len);
buf.limit(len);