You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/04/14 12:54:16 UTC
ignite git commit: IGNITE-4915: Removed deprecated getters/setters
from TcpCommunicationSpi. This closes #1734.
Repository: ignite
Updated Branches:
refs/heads/master 0f9eefb41 -> e96682f3e
IGNITE-4915: Removed deprecated getters/setters from TcpCommunicationSpi. This closes #1734.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e96682f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e96682f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e96682f3
Branch: refs/heads/master
Commit: e96682f3ef88d904885699f13a32d03b40810a39
Parents: 0f9eefb
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Fri Apr 14 15:53:59 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Apr 14 15:53:59 2017 +0300
----------------------------------------------------------------------
.../communication/tcp/TcpCommunicationSpi.java | 109 -------------------
.../tcp/TcpCommunicationSpiMBean.java | 54 ---------
.../GridCommunicationSendMessageSelfTest.java | 2 -
.../communication/GridIoManagerBenchmark0.java | 1 -
4 files changed, 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e96682f3/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 0c50b50..1fedf83 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -184,15 +184,12 @@ import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_META
* <li>Node local port number (see {@link #setLocalPort(int)})</li>
* <li>Local port range (see {@link #setLocalPortRange(int)}</li>
* <li>Connections per node (see {@link #setConnectionsPerNode(int)})</li>
- * <li>Connection buffer flush frequency (see {@link #setConnectionBufferFlushFrequency(long)})</li>
- * <li>Connection buffer size (see {@link #setConnectionBufferSize(int)})</li>
* <li>Idle connection timeout (see {@link #setIdleConnectionTimeout(long)})</li>
* <li>Direct or heap buffer allocation (see {@link #setDirectBuffer(boolean)})</li>
* <li>Direct or heap buffer allocation for sending (see {@link #setDirectSendBuffer(boolean)})</li>
* <li>Count of selectors and selector threads for NIO server (see {@link #setSelectorsCount(int)})</li>
* <li>{@code TCP_NODELAY} socket option for sockets (see {@link #setTcpNoDelay(boolean)})</li>
* <li>Message queue limit (see {@link #setMessageQueueLimit(int)})</li>
- * <li>Minimum buffered message count (see {@link #setMinimumBufferedMessageCount(int)})</li>
* <li>Connect timeout (see {@link #setConnectTimeout(long)})</li>
* <li>Maximum connect timeout (see {@link #setMaxConnectTimeout(long)})</li>
* <li>Reconnect attempts count (see {@link #setReconnectCount(int)})</li>
@@ -1394,63 +1391,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
/**
- * Sets connection buffer size. If set to {@code 0} connection buffer is disabled.
- *
- * @param connBufSize Connection buffer size.
- * @deprecated Not used any more.
- */
- @Deprecated
- @IgniteSpiConfiguration(optional = true)
- public void setConnectionBufferSize(int connBufSize) {
- // No-op.
- }
-
- /**
- * Gets connection buffer size.
- * <p>
- * If set to {@code 0} connection buffer is disabled.
- *
- * @return Connection buffer size.
- * @deprecated Not used anymore.
- */
- @Deprecated
- public int getConnectionBufferSize() {
- return 0;
- }
-
- /**
- * Sets connection buffer flush frequency.
- * <p>
- * Client connections to other nodes in topology use buffered output.
- * This frequency defines how often system will advice to flush
- * connection buffer.
- * <p>
- * This property is used only if {@link #getConnectionBufferSize()} is greater than {@code 0}.
- *
- * @param connBufFlushFreq Flush frequency.
- * @see #getConnectionBufferSize()
- * @deprecated Not used anymore.
- */
- @Deprecated
- @IgniteSpiConfiguration(optional = true)
- public void setConnectionBufferFlushFrequency(long connBufFlushFreq) {
- // No-op.
- }
-
- /**
- * Gets connection buffer size.
- * <p>
- * If set to {@code 0} connection buffer is disabled.
- *
- * @return Connection buffer size.
- * @deprecated Not used anymore.
- */
- @Deprecated
- public long getConnectionBufferFlushFrequency() {
- return 0;
- }
-
- /**
* Sets connect timeout used when establishing connection
* with remote nodes.
* <p>
@@ -1774,31 +1714,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
return this;
}
- /**
- * Sets the minimum number of messages for this SPI, that are buffered
- * prior to sending.
- *
- * @param minBufferedMsgCnt Minimum buffered message count.
- * @deprecated Not used any more.
- */
- @IgniteSpiConfiguration(optional = true)
- @Deprecated
- public void setMinimumBufferedMessageCount(int minBufferedMsgCnt) {
- // No-op.
- }
-
- /**
- * Gets the minimum number of messages for this SPI, that are buffered
- * prior to sending.
- *
- * @return Minimum buffered message count.
- * @deprecated Not used anymore.
- */
- @Deprecated
- public int getMinimumBufferedMessageCount() {
- return 0;
- }
-
/** {@inheritDoc} */
@Override public void setListener(CommunicationListener<Message> lsnr) {
this.lsnr = lsnr;
@@ -4883,24 +4798,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
/** {@inheritDoc} */
- @Deprecated
- @Override public int getConnectionBufferSize() {
- return TcpCommunicationSpi.this.getConnectionBufferSize();
- }
-
- /** {@inheritDoc} */
- @Deprecated
- @Override public void setConnectionBufferFlushFrequency(long connBufFlushFreq) {
- TcpCommunicationSpi.this.setConnectionBufferFlushFrequency(connBufFlushFreq);
- }
-
- /** {@inheritDoc} */
- @Deprecated
- @Override public long getConnectionBufferFlushFrequency() {
- return TcpCommunicationSpi.this.getConnectionBufferFlushFrequency();
- }
-
- /** {@inheritDoc} */
@Override public boolean isDirectBuffer() {
return TcpCommunicationSpi.this.isDirectBuffer();
}
@@ -4946,12 +4843,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
/** {@inheritDoc} */
- @Deprecated
- @Override public int getMinimumBufferedMessageCount() {
- return TcpCommunicationSpi.this.getMinimumBufferedMessageCount();
- }
-
- /** {@inheritDoc} */
@Override public void dumpStats() {
TcpCommunicationSpi.this.dumpStats();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e96682f3/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
index 9271314..953245a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
@@ -199,49 +199,6 @@ public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean {
public boolean isTcpNoDelay();
/**
- * Gets connection buffer flush frequency.
- * <p>
- * Client connections to other nodes in topology use buffered output.
- * This frequency defines how often system will advice to flush
- * connection buffer.
- *
- * @return Flush frequency.
- * @deprecated Not used anymore.
- */
- @Deprecated
- @MXBeanDescription("Connection buffer flush frequency.")
- public long getConnectionBufferFlushFrequency();
-
- /**
- * Sets connection buffer flush frequency.
- * <p>
- * Client connections to other nodes in topology use buffered output.
- * This frequency defines how often system will advice to flush
- * connection buffer.
- * <p>
- * This property is used only if {@link #getConnectionBufferSize()} is greater than {@code 0}.
- *
- * @param connBufFlushFreq Flush frequency.
- * @see #getConnectionBufferSize()
- * @deprecated Not used anymore.
- */
- @Deprecated
- @MXBeanDescription("Sets connection buffer flush frequency.")
- public void setConnectionBufferFlushFrequency(long connBufFlushFreq);
-
- /**
- * Gets connection buffer size.
- * <p>
- * If set to {@code 0} connection buffer is disabled.
- *
- * @return Connection buffer size.
- * @deprecated Not used anymore.
- */
- @Deprecated
- @MXBeanDescription("Connection buffer size.")
- public int getConnectionBufferSize();
-
- /**
* Gets flag defining whether direct send buffer should be used.
*
* @return {@code True} if direct buffers should be used.
@@ -278,17 +235,6 @@ public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean {
public int getMessageQueueLimit();
/**
- * Gets the minimum number of messages for this SPI, that are buffered
- * prior to sending.
- *
- * @return Minimum buffered message count.
- * @deprecated Not used anymore.
- */
- @Deprecated
- @MXBeanDescription("Minimum buffered message count.")
- public int getMinimumBufferedMessageCount();
-
- /**
* Gets socket write timeout for TCP connections. If message can not be written to
* socket within this time then connection is closed and reconnect is attempted.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/e96682f3/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 796210e..29b7847 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -79,8 +79,6 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
- commSpi.setConnectionBufferSize(bufSize);
-
c.setCommunicationSpi(commSpi);
return c;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e96682f3/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
index f6a0b03..0f0332f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
@@ -463,7 +463,6 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
TcpCommunicationSpi spi = new TcpCommunicationSpi();
spi.setTcpNoDelay(true);
- spi.setConnectionBufferSize(0);
spi.setSharedMemoryPort(-1);
info("Comm SPI: " + spi);