From commits-return-117197-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Tue Mar 13 10:37:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1149F18067B for ; Tue, 13 Mar 2018 10:37:49 +0100 (CET) Received: (qmail 63767 invoked by uid 500); 13 Mar 2018 09:37:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 63754 invoked by uid 99); 13 Mar 2018 09:37:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2018 09:37:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5738F217C; Tue, 13 Mar 2018 09:37:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-7860: JDBC thin: changed default socket buffer size to 64Kb. This closes #3600. Date: Tue, 13 Mar 2018 09:37:48 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 3cb9e2582 -> 1142a3681 IGNITE-7860: JDBC thin: changed default socket buffer size to 64Kb. This closes #3600. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1142a368 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1142a368 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1142a368 Branch: refs/heads/master Commit: 1142a368187a07fe91993edebb40bd027c7cb72a Parents: 3cb9e25 Author: tledkov-gridgain Authored: Tue Mar 13 12:37:29 2018 +0300 Committer: devozerov Committed: Tue Mar 13 12:37:29 2018 +0300 ---------------------------------------------------------------------- .../ignite/jdbc/thin/JdbcThinConnectionSelfTest.java | 10 ++++++---- .../internal/jdbc/thin/ConnectionPropertiesImpl.java | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1142a368/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java index ad98683..bdaa107 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java @@ -155,6 +155,8 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest { * @throws Exception If failed. */ public void testSocketBuffers() throws Exception { + final int dfltDufSize = 64 * 1024; + assertInvalid("jdbc:ignite:thin://127.0.0.1?socketSendBuffer=-1", "Property cannot be lower than 0 [name=socketSendBuffer, value=-1]"); @@ -162,18 +164,18 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest { "Property cannot be lower than 0 [name=socketReceiveBuffer, value=-1]"); try (Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1")) { - assertEquals(0, io(conn).connectionProperties().getSocketSendBuffer()); - assertEquals(0, io(conn).connectionProperties().getSocketReceiveBuffer()); + assertEquals(dfltDufSize, io(conn).connectionProperties().getSocketSendBuffer()); + assertEquals(dfltDufSize, io(conn).connectionProperties().getSocketReceiveBuffer()); } // Note that SO_* options are hints, so we check that value is equals to either what we set or to default. try (Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1?socketSendBuffer=1024")) { assertEquals(1024, io(conn).connectionProperties().getSocketSendBuffer()); - assertEquals(0, io(conn).connectionProperties().getSocketReceiveBuffer()); + assertEquals(dfltDufSize, io(conn).connectionProperties().getSocketReceiveBuffer()); } try (Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1?socketReceiveBuffer=1024")) { - assertEquals(0, io(conn).connectionProperties().getSocketSendBuffer()); + assertEquals(dfltDufSize, io(conn).connectionProperties().getSocketSendBuffer()); assertEquals(1024, io(conn).connectionProperties().getSocketReceiveBuffer()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1142a368/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java index 471381b..060c5bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java @@ -38,6 +38,9 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa /** Prefix for property names. */ public static final String PROP_PREFIX = "ignite.jdbc."; + /** Default socket buffer size. */ + private static final int DFLT_SOCK_BUFFER_SIZE = 64 * 1024; + /** Host name property. */ private StringProperty host = new StringProperty( "host", "Ignite node IP to connect", null, null, true, @@ -80,12 +83,12 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa /** Socket send buffer size property. */ private IntegerProperty socketSendBuffer = new IntegerProperty( "socketSendBuffer", "Socket send buffer size", - 0, false, 0, Integer.MAX_VALUE); + DFLT_SOCK_BUFFER_SIZE, false, 0, Integer.MAX_VALUE); /** Socket receive buffer size property. */ private IntegerProperty socketReceiveBuffer = new IntegerProperty( "socketReceiveBuffer", "Socket send buffer size", - 0, false, 0, Integer.MAX_VALUE); + DFLT_SOCK_BUFFER_SIZE, false, 0, Integer.MAX_VALUE); /** Executes update queries on ignite server nodes flag. */ private BooleanProperty skipReducerOnUpdate = new BooleanProperty(