IGNTIE-1786: Refactored according to review findings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73127efb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73127efb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73127efb Branch: refs/heads/ignite-1786 Commit: 73127efb6af2f27d75193d1a911e806ab356db94 Parents: 2a75631 Author: isapego <[email protected]> Authored: Mon Jan 25 20:46:37 2016 +0300 Committer: isapego <[email protected]> Committed: Mon Jan 25 20:46:37 2016 +0300 ---------------------------------------------------------------------- .../processors/odbc/OdbcColumnMeta.java | 21 +++-- .../processors/odbc/OdbcCommandHandler.java | 36 ++++---- .../internal/processors/odbc/OdbcParser.java | 87 ++++++++++++-------- .../internal/processors/odbc/OdbcProcessor.java | 10 ++- .../processors/odbc/OdbcProtocolHandler.java | 8 +- .../processors/odbc/OdbcQueryCloseRequest.java | 8 +- .../processors/odbc/OdbcQueryCloseResult.java | 4 +- .../odbc/OdbcQueryExecuteRequest.java | 28 +------ .../processors/odbc/OdbcQueryExecuteResult.java | 8 +- .../processors/odbc/OdbcQueryFetchRequest.java | 19 +---- .../processors/odbc/OdbcQueryFetchResult.java | 32 +++---- .../odbc/OdbcQueryGetColumnsMetaRequest.java | 29 ++----- .../odbc/OdbcQueryGetColumnsMetaResult.java | 6 +- .../odbc/OdbcQueryGetTablesMetaRequest.java | 36 +------- .../odbc/OdbcQueryGetTablesMetaResult.java | 6 +- .../internal/processors/odbc/OdbcRequest.java | 9 +- .../internal/processors/odbc/OdbcResponse.java | 38 +++------ .../internal/processors/odbc/OdbcTableMeta.java | 14 ++-- .../processors/odbc/OdbcTcpNioListener.java | 36 ++++---- .../internal/processors/odbc/OdbcTcpServer.java | 64 ++++++-------- 20 files changed, 203 insertions(+), 296 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java index 0c2eed2..8b47a06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcColumnMeta.java @@ -30,19 +30,20 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERE */ public class OdbcColumnMeta { /** Cache name. */ - private String schemaName; + private final String schemaName; /** Table name. */ - private String tableName; + private final String tableName; /** Column name. */ - private String columnName; + private final String columnName; /** Data type. */ - private Class<?> dataType; + private final Class<?> dataType; /** * Add quotation marks at the beginning and end of the string. + * * @param str Input string. * @return String surrounded with quotation marks. */ @@ -74,16 +75,19 @@ public class OdbcColumnMeta { this.tableName = info.typeName(); this.columnName = info.fieldName(); + Class<?> type; try { - this.dataType = Class.forName(info.fieldTypeName()); + type = Class.forName(info.fieldTypeName()); } catch (Exception ignored) { - this.dataType = Object.class; + type = Object.class; } + + this.dataType = type; } - @Override - public boolean equals(Object o) + /** {@inheritDoc} */ + @Override public boolean equals(Object o) { if (!(o instanceof OdbcColumnMeta)) return false; @@ -98,6 +102,7 @@ public class OdbcColumnMeta { /** * Write in a binary format. + * * @param writer Binary writer. * @param ctx Portable context. * @throws IOException http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java index 9e56888..73858d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java @@ -90,32 +90,27 @@ public class OdbcCommandHandler { } /** - * @param qryCurs Query cursors. * @param cur Current cursor. * @param req Sql fetch request. * @param qryId Query id. * @return Query result with items. */ - private static OdbcQueryFetchResult createQueryResult( - ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs, - Iterator cur, OdbcQueryFetchRequest req, Long qryId) { - OdbcQueryFetchResult res = new OdbcQueryFetchResult(qryId); + private static OdbcQueryFetchResult createQueryResult(Iterator cur, OdbcQueryFetchRequest req, Long qryId) { List<Object> items = new ArrayList<>(); for (int i = 0; i < req.pageSize() && cur.hasNext(); ++i) items.add(cur.next()); - res.setItems(items); - - res.setLast(!cur.hasNext()); - - return res; + return new OdbcQueryFetchResult(qryId, items, !cur.hasNext()); } /** + * Convert metadata in collection from {@link GridQueryFieldMetadata} to + * {@link OdbcColumnMeta}. + * * @param meta Internal query field metadata. - * @return Rest query field metadata. + * @return Odbc query field metadata. */ private static Collection<OdbcColumnMeta> convertMetadata(Collection<GridQueryFieldMetadata> meta) { List<OdbcColumnMeta> res = new ArrayList<>(); @@ -142,6 +137,7 @@ public class OdbcCommandHandler { /** * Remove quotation marks at the beginning and end of the string if present. + * * @param str Input string. * @return String without leading and trailing quotation marks. */ @@ -153,12 +149,14 @@ public class OdbcCommandHandler { } /** + * {@link OdbcQueryExecuteRequest} command handler. + * * @param req Execute query request. * @param qryCurs Queries cursors. * @return Response. */ private OdbcResponse executeQuery(OdbcQueryExecuteRequest req, - ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { + ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { long qryId = qryIdGen.getAndIncrement(); try { @@ -194,12 +192,14 @@ public class OdbcCommandHandler { } /** + * {@link OdbcQueryCloseRequest} command handler. + * * @param req Execute query request. * @param qryCurs Queries cursors. * @return Response. */ private OdbcResponse closeQuery(OdbcQueryCloseRequest req, - ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { + ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { try { QueryCursor cur = qryCurs.get(req.queryId()).get1(); @@ -223,12 +223,14 @@ public class OdbcCommandHandler { } /** + * {@link OdbcQueryFetchRequest} command handler. + * * @param req Execute query request. * @param qryCurs Queries cursors. * @return Response. */ private OdbcResponse fetchQuery(OdbcQueryFetchRequest req, - ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { + ConcurrentHashMap<Long, IgniteBiTuple<QueryCursor, Iterator>> qryCurs) { try { Iterator cur = qryCurs.get(req.queryId()).get2(); @@ -236,7 +238,7 @@ public class OdbcCommandHandler { return new OdbcResponse(OdbcResponse.STATUS_FAILED, "Failed to find query with ID: " + req.queryId()); - OdbcQueryFetchResult res = createQueryResult(qryCurs, cur, req, req.queryId()); + OdbcQueryFetchResult res = createQueryResult(cur, req, req.queryId()); return new OdbcResponse(res); } @@ -248,6 +250,8 @@ public class OdbcCommandHandler { } /** + * {@link OdbcQueryGetColumnsMetaRequest} command handler. + * * @param req Get columns metadata request. * @return Response. */ @@ -299,6 +303,8 @@ public class OdbcCommandHandler { } /** + * {@link OdbcQueryGetTablesMetaRequest} command handler. + * * @param req Get tables metadata request. * @return Response. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java index ead6d3b..222293a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java @@ -31,7 +31,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collection; - /** * ODBC protocol parser. */ @@ -40,30 +39,30 @@ public class OdbcParser implements GridNioParser { private static final int INIT_CAP = 1024; /** Length in bytes of the remaining message part. */ - int leftToReceive = 0; + private int leftToReceive = 0; /** Already received bytes of current message. */ - ByteBuffer currentMessage = null; - - /** Context. */ - protected final GridKernalContext ctx; + private ByteBuffer currentMessage = null; /** Marshaller. */ private final GridBinaryMarshaller marsh; - OdbcParser(GridKernalContext context) { - ctx = context; - - CacheObjectBinaryProcessorImpl cacheObjProc = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects(); + /** + * @param context Kernel context. + */ + public OdbcParser(GridKernalContext context) { + CacheObjectBinaryProcessorImpl cacheObjProc = (CacheObjectBinaryProcessorImpl)context.cacheObjects(); marsh = cacheObjProc.marshaller(); } /** - * Process data chunk and try to construct new message using stored and freshly received data. + * Process data chunk and try to construct new message using stored and + * freshly received data. + * * @param buf Fresh data buffer. - * @return Instance of the {@link BinaryReaderExImpl} positioned to read from the beginning of the message on - * success and null otherwise. + * @return Instance of the {@link BinaryReaderExImpl} positioned to read + * from the beginning of the message on success and null otherwise. */ private BinaryRawReaderEx tryConstructMessage(ByteBuffer buf) { if (leftToReceive != 0) { @@ -88,16 +87,19 @@ public class OdbcParser implements GridNioParser { } // Receiving new message - // Getting message length. It's in the first four bytes of the message. BinaryInputStream stream = new BinaryHeapInputStream(buf.array()); BinaryReaderExImpl reader = new BinaryReaderExImpl(null, stream, null); + // Getting message length. It's in the first four bytes of the message. int messageLen = reader.readInt(); + + // Just skipping int here to sync position. buf.getInt(); int remaining = buf.remaining(); + // Checking if we have not entire message in buffer. if (messageLen > remaining) { leftToReceive = messageLen - remaining; @@ -151,6 +153,7 @@ public class OdbcParser implements GridNioParser { /** * Read ODBC request from the raw data using provided {@link BinaryReaderExImpl} instance. + * * @param ses Current session. * @param reader Reader positioned to read the request. * @return Instance of the {@link OdbcRequest}. @@ -163,6 +166,7 @@ public class OdbcParser implements GridNioParser { switch (cmd) { case OdbcRequest.EXECUTE_SQL_QUERY: { + String cache = reader.readString(); String sql = reader.readString(); int argsNum = reader.readInt(); @@ -178,10 +182,12 @@ public class OdbcParser implements GridNioParser { params[i] = reader.readObjectDetached(); res = new OdbcQueryExecuteRequest(cache, sql, params); + break; } case OdbcRequest.FETCH_SQL_QUERY: { + long queryId = reader.readLong(); int pageSize = reader.readInt(); @@ -190,20 +196,24 @@ public class OdbcParser implements GridNioParser { System.out.println("pageSize: " + pageSize); res = new OdbcQueryFetchRequest(queryId, pageSize); + break; } case OdbcRequest.CLOSE_SQL_QUERY: { + long queryId = reader.readLong(); System.out.println("Message CLOSE_SQL_QUERY:"); System.out.println("queryId: " + queryId); res = new OdbcQueryCloseRequest(queryId); + break; } case OdbcRequest.GET_COLUMNS_META: { + String cache = reader.readString(); String table = reader.readString(); String column = reader.readString(); @@ -214,10 +224,12 @@ public class OdbcParser implements GridNioParser { System.out.println("column: " + column); res = new OdbcQueryGetColumnsMetaRequest(cache, table, column); + break; } case OdbcRequest.GET_TABLES_META: { + String catalog = reader.readString(); String schema = reader.readString(); String table = reader.readString(); @@ -230,6 +242,7 @@ public class OdbcParser implements GridNioParser { System.out.println("tableType: " + tableType); res = new OdbcQueryGetTablesMetaRequest(catalog, schema, table, tableType); + break; } @@ -243,6 +256,7 @@ public class OdbcParser implements GridNioParser { /** * Write ODBC response using provided {@link BinaryRawWriterEx} instance. + * * @param ses Current session. * @param writer Writer. * @param rsp ODBC response that should be written. @@ -250,15 +264,15 @@ public class OdbcParser implements GridNioParser { */ private void writeResponse(GridNioSession ses, BinaryRawWriterEx writer, OdbcResponse rsp) throws IOException { // Writing status - writer.writeByte((byte)rsp.getSuccessStatus()); + writer.writeByte((byte)rsp.status()); - if (rsp.getSuccessStatus() != OdbcResponse.STATUS_SUCCESS) { - writer.writeString(rsp.getError()); + if (rsp.status() != OdbcResponse.STATUS_SUCCESS) { + writer.writeString(rsp.error()); return; } - Object res0 = rsp.getResponse(); + Object res0 = rsp.response(); if (res0 instanceof OdbcQueryExecuteResult) { OdbcQueryExecuteResult res = (OdbcQueryExecuteResult) res0; @@ -276,25 +290,27 @@ public class OdbcParser implements GridNioParser { for (OdbcColumnMeta meta : metas) meta.writeBinary(writer, marsh.context()); - } else if (res0 instanceof OdbcQueryFetchResult) { + } + else if (res0 instanceof OdbcQueryFetchResult) { OdbcQueryFetchResult res = (OdbcQueryFetchResult) res0; - System.out.println("Resulting query ID: " + res.getQueryId()); + System.out.println("Resulting query ID: " + res.queryId()); - writer.writeLong(res.getQueryId()); + writer.writeLong(res.queryId()); - Collection<?> items0 = res.getItems(); + Collection<?> items0 = res.items(); assert items0 != null; - Collection<Collection<Object>> items = (Collection<Collection<Object>>)items0; + writer.writeBoolean(res.last()); - writer.writeBoolean(res.getLast()); + writer.writeInt(items0.size()); - writer.writeInt(items.size()); + for (Object row0 : items0) { + if (row0 != null) { + + Collection<?> row = (Collection<?>)row0; - for (Collection<Object> row : items) { - if (row != null) { writer.writeInt(row.size()); for (Object obj : row) { @@ -303,17 +319,19 @@ public class OdbcParser implements GridNioParser { } } } - } else if (res0 instanceof OdbcQueryCloseResult) { + } + else if (res0 instanceof OdbcQueryCloseResult) { OdbcQueryCloseResult res = (OdbcQueryCloseResult) res0; System.out.println("Resulting query ID: " + res.getQueryId()); writer.writeLong(res.getQueryId()); - } else if (res0 instanceof OdbcQueryGetColumnsMetaResult) { + } + else if (res0 instanceof OdbcQueryGetColumnsMetaResult) { OdbcQueryGetColumnsMetaResult res = (OdbcQueryGetColumnsMetaResult) res0; - Collection<OdbcColumnMeta> columnsMeta = res.getMeta(); + Collection<OdbcColumnMeta> columnsMeta = res.meta(); assert columnsMeta != null; @@ -322,10 +340,11 @@ public class OdbcParser implements GridNioParser { for (OdbcColumnMeta columnMeta : columnsMeta) columnMeta.writeBinary(writer, marsh.context()); - } else if (res0 instanceof OdbcQueryGetTablesMetaResult) { + } + else if (res0 instanceof OdbcQueryGetTablesMetaResult) { OdbcQueryGetTablesMetaResult res = (OdbcQueryGetTablesMetaResult) res0; - Collection<OdbcTableMeta> tablesMeta = res.getMeta(); + Collection<OdbcTableMeta> tablesMeta = res.meta(); assert tablesMeta != null; @@ -334,8 +353,8 @@ public class OdbcParser implements GridNioParser { for (OdbcTableMeta tableMeta : tablesMeta) tableMeta.writeBinary(writer); - } else { - throw new IOException("Failed to serialize response packet (unknown response type) [ses=" + ses + "]"); } + else + throw new IOException("Failed to serialize response packet (unknown response type) [ses=" + ses + "]"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java index 91b24a4..39652c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java @@ -40,10 +40,12 @@ public class OdbcProcessor extends GridProcessorAdapter { /** Protocol handler. */ private final OdbcProtocolHandler protoHnd = new OdbcProtocolHandler() { + /** {@inheritDoc} */ @Override public OdbcResponse handle(OdbcRequest req) throws IgniteCheckedException { return handle0(req); } + /** {@inheritDoc} */ @Override public IgniteInternalFuture<OdbcResponse> handleAsync(OdbcRequest req) { return new GridFinishedFuture<>( new IgniteCheckedException("Failed to handle request (asynchronous handling is not implemented).")); @@ -51,6 +53,8 @@ public class OdbcProcessor extends GridProcessorAdapter { }; /** + * Handle request. + * * @param req Request. * @return Response. */ @@ -71,8 +75,10 @@ public class OdbcProcessor extends GridProcessorAdapter { } /** + * Handle request. + * * @param req Request. - * @return Future. + * @return Response. */ private OdbcResponse handleRequest(final OdbcRequest req) throws IgniteCheckedException { if (log.isDebugEnabled()) @@ -149,6 +155,8 @@ public class OdbcProcessor extends GridProcessorAdapter { } /** + * Check if the ODBC is enabled. + * * @return Whether or not ODBC is enabled. */ public boolean isOdbcEnabled() { http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProtocolHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProtocolHandler.java index e1957d7..2b80e95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProtocolHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProtocolHandler.java @@ -24,15 +24,19 @@ import org.apache.ignite.internal.IgniteInternalFuture; */ public interface OdbcProtocolHandler { /** + * Handle request. + * * @param req Request. * @return Response. * @throws IgniteCheckedException In case of error. */ - public OdbcResponse handle(OdbcRequest req) throws IgniteCheckedException; + OdbcResponse handle(OdbcRequest req) throws IgniteCheckedException; /** + * Handle request asynchronously. + * * @param req Request. * @return Future. */ - public IgniteInternalFuture<OdbcResponse> handleAsync(OdbcRequest req); + IgniteInternalFuture<OdbcResponse> handleAsync(OdbcRequest req); } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseRequest.java index e9b5698..eb644e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseRequest.java @@ -21,20 +21,14 @@ package org.apache.ignite.internal.processors.odbc; */ public class OdbcQueryCloseRequest extends OdbcRequest { /** Query ID. */ - private long queryId; + private final long queryId; /** * @param queryId Query ID. */ public OdbcQueryCloseRequest(long queryId) { super(CLOSE_SQL_QUERY); - this.queryId = queryId; - } - /** - * @param queryId Query ID. - */ - public void cacheName(long queryId) { this.queryId = queryId; } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseResult.java index cbc23c8..92c433a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryCloseResult.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.odbc; /** - * Query result. + * ODBC query result. */ public class OdbcQueryCloseResult { /** Query ID. */ - private long queryId; + private final long queryId; /** * @param queryId Query ID. http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteRequest.java index 4628b52..d01a0c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteRequest.java @@ -21,13 +21,13 @@ package org.apache.ignite.internal.processors.odbc; */ public class OdbcQueryExecuteRequest extends OdbcRequest { /** Cache name. */ - private String cacheName; + private final String cacheName; /** Sql query. */ - private String sqlQry; + private final String sqlQry; /** Sql query arguments. */ - private Object[] args; + private final Object[] args; /** * @param cacheName Cache name. @@ -36,19 +36,13 @@ public class OdbcQueryExecuteRequest extends OdbcRequest { */ public OdbcQueryExecuteRequest(String cacheName, String sqlQry, Object[] args) { super(EXECUTE_SQL_QUERY); + this.cacheName = cacheName; this.sqlQry = sqlQry; this.args = args; } /** - * @param sqlQry Sql query. - */ - public void sqlQuery(String sqlQry) { - this.sqlQry = sqlQry; - } - - /** * @return Sql query. */ public String sqlQuery() { @@ -56,13 +50,6 @@ public class OdbcQueryExecuteRequest extends OdbcRequest { } /** - * @param args Sql query arguments. - */ - public void arguments(Object[] args) { - this.args = args; - } - - /** * @return Sql query arguments. */ public Object[] arguments() { @@ -70,13 +57,6 @@ public class OdbcQueryExecuteRequest extends OdbcRequest { } /** - * @param cacheName Cache name. - */ - public void cacheName(String cacheName) { - this.cacheName = cacheName; - } - - /** * @return Cache name. */ public String cacheName() { http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteResult.java index a4dec54..be8da07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryExecuteResult.java @@ -16,8 +16,6 @@ */ package org.apache.ignite.internal.processors.odbc; -import org.apache.ignite.internal.processors.odbc.OdbcColumnMeta; - import java.util.Collection; /** @@ -25,16 +23,16 @@ import java.util.Collection; */ public class OdbcQueryExecuteResult { /** Query ID. */ - private long queryId; + private final long queryId; /** Fields metadata. */ - private Collection<OdbcColumnMeta> columnsMeta; + private final Collection<OdbcColumnMeta> columnsMeta; /** * @param queryId Query ID. * @param columnsMeta Columns metadata. */ - public OdbcQueryExecuteResult(long queryId, Collection<OdbcColumnMeta> columnsMeta){ + public OdbcQueryExecuteResult(long queryId, Collection<OdbcColumnMeta> columnsMeta) { this.queryId = queryId; this.columnsMeta = columnsMeta; } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchRequest.java index 7609649..3da0824 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchRequest.java @@ -21,10 +21,10 @@ package org.apache.ignite.internal.processors.odbc; */ public class OdbcQueryFetchRequest extends OdbcRequest { /** Query ID. */ - private long queryId; + private final long queryId; /** Page size - maximum number of rows to return. */ - private Integer pageSize; + private final int pageSize; /** * @param queryId Query ID. @@ -32,14 +32,8 @@ public class OdbcQueryFetchRequest extends OdbcRequest { */ public OdbcQueryFetchRequest(long queryId, int pageSize) { super(FETCH_SQL_QUERY); - this.queryId = queryId; - this.pageSize = pageSize; - } - /** - * @param pageSize Page size. - */ - public void pageSize(Integer pageSize) { + this.queryId = queryId; this.pageSize = pageSize; } @@ -51,13 +45,6 @@ public class OdbcQueryFetchRequest extends OdbcRequest { } /** - * @param queryId Query ID. - */ - public void cacheName(long queryId) { - this.queryId = queryId; - } - - /** * @return Query ID. */ public long queryId() { http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchResult.java index b103914..9278a40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryFetchResult.java @@ -23,53 +23,43 @@ import java.util.Collection; */ public class OdbcQueryFetchResult { /** Query ID. */ - private long queryId; + private final long queryId; /** Query result rows. */ - private Collection<?> items = null; + private final Collection<?> items; /** Flag indicating the query has no unfetched results. */ - private boolean last = false; + private final boolean last; /** * @param queryId Query ID. + * @param items Query result rows. + * @param last Flag indicating the query has no unfetched results. */ - public OdbcQueryFetchResult(long queryId){ + public OdbcQueryFetchResult(long queryId, Collection<?> items, boolean last){ this.queryId = queryId; + this.items = items; + this.last = last; } /** * @return Query ID. */ - public long getQueryId() { + public long queryId() { return queryId; } /** - * @param items Query result rows. - */ - public void setItems(Collection<?> items) { - this.items = items; - } - - /** * @return Query result rows. */ - public Collection<?> getItems() { + public Collection<?> items() { return items; } /** - * @param last Flag indicating the query has no unfetched results. - */ - public void setLast(boolean last) { - this.last = last; - } - - /** * @return Flag indicating the query has no unfetched results. */ - public boolean getLast() { + public boolean last() { return last; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaRequest.java index b0f1ba6..00b1ab0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaRequest.java @@ -21,16 +21,18 @@ package org.apache.ignite.internal.processors.odbc; */ public class OdbcQueryGetColumnsMetaRequest extends OdbcRequest { /** Cache name. */ - private String cacheName; + private final String cacheName; /** Table name. */ - private String tableName; + private final String tableName; /** Column name. */ - private String columnName; + private final String columnName; /** * @param cacheName Cache name. + * @param tableName Table name. + * @param columnName Column name. */ public OdbcQueryGetColumnsMetaRequest(String cacheName, String tableName, String columnName) { super(GET_COLUMNS_META); @@ -41,13 +43,6 @@ public class OdbcQueryGetColumnsMetaRequest extends OdbcRequest { } /** - * @param cacheName Cache name. - */ - public void cacheName(String cacheName) { - this.cacheName = cacheName; - } - - /** * @return Cache name. */ public String cacheName() { @@ -55,13 +50,6 @@ public class OdbcQueryGetColumnsMetaRequest extends OdbcRequest { } /** - * @param tableName Table name. - */ - public void tableName(String tableName) { - this.tableName = tableName; - } - - /** * @return Table name. */ public String tableName() { @@ -69,13 +57,6 @@ public class OdbcQueryGetColumnsMetaRequest extends OdbcRequest { } /** - * @param columnName Column name. - */ - public void columnName(String columnName) { - this.columnName = columnName; - } - - /** * @return Column name. */ public String columnName() { http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaResult.java index f00176c..c4f63b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetColumnsMetaResult.java @@ -16,8 +16,6 @@ */ package org.apache.ignite.internal.processors.odbc; -import org.apache.ignite.internal.processors.odbc.OdbcColumnMeta; - import java.util.Collection; /** @@ -25,7 +23,7 @@ import java.util.Collection; */ public class OdbcQueryGetColumnsMetaResult { /** Query result rows. */ - private Collection<OdbcColumnMeta> meta; + private final Collection<OdbcColumnMeta> meta; /** * @param meta Column metadata. @@ -37,7 +35,7 @@ public class OdbcQueryGetColumnsMetaResult { /** * @return Query result rows. */ - public Collection<OdbcColumnMeta> getMeta() { + public Collection<OdbcColumnMeta> meta() { return meta; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaRequest.java index 7d8194c..097cfe2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaRequest.java @@ -21,16 +21,16 @@ package org.apache.ignite.internal.processors.odbc; */ public class OdbcQueryGetTablesMetaRequest extends OdbcRequest { /** Catalog search pattern. */ - private String catalog; + private final String catalog; /** Schema search pattern. */ - private String schema; + private final String schema; /** Table search pattern. */ - private String table; + private final String table; /** Table type search pattern. */ - private String tableType; + private final String tableType; /** * @param catalog Catalog search pattern. @@ -48,13 +48,6 @@ public class OdbcQueryGetTablesMetaRequest extends OdbcRequest { } /** - * @param catalog Catalog search pattern. - */ - public void catalog(String catalog) { - this.catalog = catalog; - } - - /** * @return catalog search pattern. */ public String catalog() { @@ -62,13 +55,6 @@ public class OdbcQueryGetTablesMetaRequest extends OdbcRequest { } /** - * @param schema Schema search pattern. - */ - public void schema(String schema) { - this.schema = schema; - } - - /** * @return Schema search pattern. */ public String schema() { @@ -76,13 +62,6 @@ public class OdbcQueryGetTablesMetaRequest extends OdbcRequest { } /** - * @param table Schema search pattern. - */ - public void table(String table) { - this.table = table; - } - - /** * @return Table search pattern. */ public String table() { @@ -90,13 +69,6 @@ public class OdbcQueryGetTablesMetaRequest extends OdbcRequest { } /** - * @param tableType Table type search pattern. - */ - public void tableType(String tableType) { - this.tableType = tableType; - } - - /** * @return Table type search pattern. */ public String tableType() { http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaResult.java index e737772..5a92759 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcQueryGetTablesMetaResult.java @@ -16,8 +16,6 @@ */ package org.apache.ignite.internal.processors.odbc; -import org.apache.ignite.internal.processors.odbc.OdbcTableMeta; - import java.util.Collection; /** @@ -25,7 +23,7 @@ import java.util.Collection; */ public class OdbcQueryGetTablesMetaResult { /** Query result rows. */ - private Collection<OdbcTableMeta> meta; + private final Collection<OdbcTableMeta> meta; /** * @param meta Column metadata. @@ -37,7 +35,7 @@ public class OdbcQueryGetTablesMetaResult { /** * @return Query result rows. */ - public Collection<OdbcTableMeta> getMeta() { + public Collection<OdbcTableMeta> meta() { return meta; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequest.java index 1e8aecc..5d74843 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequest.java @@ -36,7 +36,7 @@ public class OdbcRequest { public static final int GET_TABLES_META = 5; /** Command. */ - private int cmd; + private final int cmd; /** * @param cmd Command type. @@ -51,11 +51,4 @@ public class OdbcRequest { public int command() { return cmd; } - - /** - * @param cmd Command. - */ - public void command(int cmd) { - this.cmd = cmd; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcResponse.java index 653e3f4..e532499 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcResponse.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; * ODBC protocol response. */ public class OdbcResponse { - /** Command succeeded. */ public static final int STATUS_SUCCESS = 0; @@ -32,15 +31,14 @@ public class OdbcResponse { public static final int STATUS_FAILED = 1; /** Success status. */ - @SuppressWarnings("RedundantFieldInitialization") - private int successStatus = STATUS_SUCCESS; + private final int status; /** Error. */ - private String err; + private final String err; /** Response object. */ @GridToStringInclude - private Object obj; + private final Object obj; /** * Constructs successful rest response. @@ -48,8 +46,10 @@ public class OdbcResponse { * @param obj Response object. */ public OdbcResponse(Object obj) { - successStatus = STATUS_SUCCESS; + this.status = STATUS_SUCCESS; + this.obj = obj; + this.err = null; } /** @@ -61,45 +61,33 @@ public class OdbcResponse { public OdbcResponse(int status, @Nullable String err) { assert status != STATUS_SUCCESS; - successStatus = status; + this.status = status; + + this.obj = null; this.err = err; } /** * @return Success flag. */ - public int getSuccessStatus() { - return successStatus; + public int status() { + return status; } /** * @return Response object. */ - public Object getResponse() { + public Object response() { return obj; } /** - * @param obj Response object. - */ - public void setResponse(@Nullable Object obj) { - this.obj = obj; - } - - /** * @return Error. */ - public String getError() { + public String error() { return err; } - /** - * @param err Error. - */ - public void setError(String err) { - this.err = err; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(OdbcResponse.class, this); http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTableMeta.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTableMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTableMeta.java index b1eea71..4b8bf23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTableMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTableMeta.java @@ -25,19 +25,20 @@ import java.io.IOException; */ public class OdbcTableMeta { /** Catalog name. */ - private String catalog; + private final String catalog; /** Schema name. */ - private String schema; + private final String schema; /** Table name. */ - private String table; + private final String table; /** Table type. */ - private String tableType; + private final String tableType; /** * Add quotation marks at the beginning and end of the string. + * * @param str Input string. * @return String surrounded with quotation marks. */ @@ -61,8 +62,8 @@ public class OdbcTableMeta { this.tableType = tableType; } - @Override - public boolean equals(Object o) + /** {@inheritDoc} */ + @Override public boolean equals(Object o) { if (!(o instanceof OdbcTableMeta)) return false; @@ -77,6 +78,7 @@ public class OdbcTableMeta { /** * Write in a binary format. + * * @param writer Binary writer. * @throws IOException */ http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpNioListener.java index c30daff..ffd425a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpNioListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcTcpNioListener.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.odbc; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.util.nio.GridNioFuture; import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter; import org.apache.ignite.internal.util.nio.GridNioSession; @@ -29,32 +28,28 @@ import org.jetbrains.annotations.Nullable; * Listener for ODBC driver connection. */ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest> { - /** Server. */ - private OdbcTcpServer srv; - /** Logger. */ - protected final IgniteLogger log; - - /** Context. */ - protected final GridKernalContext ctx; + private final IgniteLogger log; /** Protocol handler. */ - private OdbcProtocolHandler hnd; + private final OdbcProtocolHandler hnd; - OdbcTcpNioListener(IgniteLogger log, OdbcTcpServer srv, GridKernalContext ctx, OdbcProtocolHandler hnd) { + /** + * @param log Logger. + * @param hnd Protocol handler. + */ + OdbcTcpNioListener(IgniteLogger log, OdbcProtocolHandler hnd) { this.log = log; - this.srv = srv; - this.ctx = ctx; this.hnd = hnd; } - @Override - public void onConnected(GridNioSession ses) { + /** {@inheritDoc} */ + @Override public void onConnected(GridNioSession ses) { System.out.println("Driver connected"); } - @Override - public void onDisconnected(GridNioSession ses, @Nullable Exception e) { + /** {@inheritDoc} */ + @Override public void onDisconnected(GridNioSession ses, @Nullable Exception e) { System.out.println("Driver disconnected"); if (e != null) { @@ -65,8 +60,8 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest } } - @Override - public void onMessage(GridNioSession ses, OdbcRequest msg) { + /** {@inheritDoc} */ + @Override public void onMessage(GridNioSession ses, OdbcRequest msg) { assert msg != null; System.out.println("Query: " + msg.command()); @@ -83,7 +78,7 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest "Failed to process client request: " + e.getMessage()); } - System.out.println("Resulting success status: " + res.getSuccessStatus()); + System.out.println("Resulting success status: " + res.status()); GridNioFuture<?> sf = ses.send(res); @@ -91,7 +86,8 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest if (sf.isDone()) { try { sf.get(); - } catch (Exception e) { + } + catch (Exception e) { U.error(log, "Failed to process client request [ses=" + ses + ", msg=" + msg + ']', e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73127efb/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 83adb1b..8c69e3a 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 @@ -34,30 +34,18 @@ import java.nio.ByteOrder; * TCP server that handles communication with ODBC driver. */ public class OdbcTcpServer { - /** Server. */ private GridNioServer<OdbcRequest> srv; - /** NIO server listener. */ - private GridNioServerListener<OdbcRequest> lsnr; - /** Logger. */ - protected final IgniteLogger log; + private final IgniteLogger log; /** Context. */ - protected final GridKernalContext ctx; - - /** Host used by this protocol. */ - protected InetAddress host; - - /** Port used by this protocol. */ - protected int port; - - /** */ - public String name() { - return "ODBC server"; - } + private final GridKernalContext ctx; + /** + * @param ctx Kernel context. + */ public OdbcTcpServer(GridKernalContext ctx) { assert ctx != null; assert ctx.config().getConnectorConfiguration() != null; @@ -67,44 +55,44 @@ public class OdbcTcpServer { log = ctx.log(getClass()); } - @SuppressWarnings("BusyWait") + /** + * Start ODBC TCP server. + * + * @param hnd ODBC protocol handler. + * @throws IgniteCheckedException + */ public void start(final OdbcProtocolHandler hnd) throws IgniteCheckedException { OdbcConfiguration cfg = ctx.config().getOdbcConfiguration(); assert cfg != null; - lsnr = new OdbcTcpNioListener(log, this, ctx, hnd); + GridNioServerListener<OdbcRequest> listener = new OdbcTcpNioListener(log, hnd); GridNioParser parser = new OdbcParser(ctx); try { - host = resolveOdbcTcpHost(ctx.config()); - - int odbcPort = cfg.getPort(); + InetAddress host = resolveOdbcTcpHost(ctx.config()); - if (startTcpServer(host, odbcPort, lsnr, parser, cfg)) { - port = odbcPort; + int port = cfg.getPort(); + if (startTcpServer(host, port, listener, parser, cfg)) { System.out.println("ODBC Server has started on TCP port " + port); return; } - U.warn(log, "Failed to start " + name() + " (possibly all ports in range are in use) " + - "[odbcPort=" + odbcPort + ", host=" + host + ']'); + U.warn(log, "Failed to start ODBC server (possibly all ports in range are in use) " + + "[port=" + port + ", host=" + host + ']'); } catch (IOException e) { - U.warn(log, "Failed to start " + name() + " on port " + port + ": " + e.getMessage(), - "Failed to start " + name() + " on port " + port + ". " + - "Check restTcpHost configuration property."); + U.warn(log, "Failed to start ODBC server: " + e.getMessage(), + "Failed to start ODBC server. Check odbcTcpHost configuration property."); } } - /** */ - public void onKernalStart() { - } - - /** */ + /** + * Stop ODBC TCP server. + */ public void stop() { if (srv != null) { ctx.ports().deregisterPorts(getClass()); @@ -139,13 +127,13 @@ public class OdbcTcpServer { * * @param hostAddr Host on which server should be bound. * @param port Port on which server should be bound. - * @param lsnr Server message listener. + * @param listener Server message listener. * @param parser Server message parser. * @param cfg Configuration for other parameters. * @return {@code True} if server successfully started, {@code false} if port is used and * server was unable to start. */ - private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerListener<OdbcRequest> lsnr, + private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerListener<OdbcRequest> listener, GridNioParser parser, OdbcConfiguration cfg) { try { GridNioFilter codec = new GridNioCodecFilter(parser, log, false); @@ -157,7 +145,7 @@ public class OdbcTcpServer { srv = GridNioServer.<OdbcRequest>builder() .address(hostAddr) .port(port) - .listener(lsnr) + .listener(listener) .logger(log) .selectorCount(cfg.getSelectorCount()) .gridName(ctx.gridName()) @@ -181,7 +169,7 @@ public class OdbcTcpServer { } catch (IgniteCheckedException e) { if (log.isDebugEnabled()) - log.debug("Failed to start " + name() + " on port " + port + ": " + e.getMessage()); + log.debug("Failed to start ODBC server on port " + port + ": " + e.getMessage()); return false; }
