IGNITE-2446: Added host property for OdbcConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebc6b571 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebc6b571 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebc6b571 Branch: refs/heads/ignite-1786 Commit: ebc6b57161ca381eeb0ed2dd97c82b5ec09c0590 Parents: e200771 Author: isapego <[email protected]> Authored: Tue Jan 26 12:34:11 2016 +0300 Committer: isapego <[email protected]> Committed: Tue Jan 26 12:34:11 2016 +0300 ---------------------------------------------------------------------- .../ignite/configuration/OdbcConfiguration.java | 29 ++++++++++++++++++++ .../internal/processors/odbc/OdbcTcpServer.java | 6 ++-- 2 files changed, 32 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ebc6b571/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java index fbc064b..74fe29f 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java @@ -41,6 +41,9 @@ public class OdbcConfiguration { /** TCP port. */ private int port = DFLT_TCP_PORT; + /** TCP host. */ + private String host; + /** TCP no delay flag. */ private boolean noDelay = DFLT_TCP_NODELAY; @@ -82,6 +85,7 @@ public class OdbcConfiguration { idleTimeout = cfg.getIdleTimeout(); noDelay = cfg.isNoDelay(); port = cfg.getPort(); + host = cfg.getHost(); rcvBufSize = cfg.getReceiveBufferSize(); selectorCnt = cfg.getSelectorCount(); sndBufSize = cfg.getSendBufferSize(); @@ -109,6 +113,31 @@ public class OdbcConfiguration { } /** + * Gets host for TCP ODBC server. This can be either an + * IP address or a domain name. + * <p> + * If not defined, system-wide local address will be used + * (see {@link IgniteConfiguration#getLocalHost()}. + * <p> + * You can also use {@code 0.0.0.0} value to bind to all + * locally-available IP addresses. + * + * @return TCP host. + */ + public String getHost() { + return host; + } + + /** + * Sets host for TCP ODBC server. + * + * @param host TCP host. + */ + public void setHost(String host) { + this.host = host; + } + + /** * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections. * Setting this option reduces network latency and should be set to {@code true} in majority of cases. * For more information, see {@link Socket#setTcpNoDelay(boolean)} http://git-wip-us.apache.org/repos/asf/ignite/blob/ebc6b571/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpServer.java index 648be56..88e4bdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpServer.java @@ -111,10 +111,10 @@ public class OdbcTcpServer { private InetAddress resolveOdbcTcpHost(IgniteConfiguration cfg) throws IOException { String host = null; - ConnectorConfiguration connectionCfg = cfg.getConnectorConfiguration(); + OdbcConfiguration odbcCfg = cfg.getOdbcConfiguration(); - if (connectionCfg != null) - host = connectionCfg.getHost(); + if (odbcCfg != null) + host = odbcCfg.getHost(); if (host == null) host = cfg.getLocalHost();
