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 2016/01/27 11:39:40 UTC
[07/28] ignite git commit: IGNITE-1786: System output replaced with
logging.
IGNITE-1786: System output replaced with logging.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e200771d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e200771d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e200771d
Branch: refs/heads/ignite-1786
Commit: e200771d597eecf537356db47915cee13b2970aa
Parents: 73127ef
Author: isapego <is...@gridgain.com>
Authored: Mon Jan 25 20:58:53 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Mon Jan 25 20:58:53 2016 +0300
----------------------------------------------------------------------
.../processors/odbc/OdbcCommandHandler.java | 17 +++---
.../internal/processors/odbc/OdbcParser.java | 56 +++++++++++---------
.../processors/odbc/OdbcTcpNioListener.java | 8 +--
.../internal/processors/odbc/OdbcTcpServer.java | 2 +-
4 files changed, 46 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e200771d/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 73858d7..5fc2727 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
@@ -36,10 +36,10 @@ import static org.apache.ignite.internal.processors.odbc.OdbcRequest.*;
* SQL query handler.
*/
public class OdbcCommandHandler {
- /** Kernal context. */
+ /** Kernel context. */
protected final GridKernalContext ctx;
- /** Log. */
+ /** Logger. */
protected final IgniteLogger log;
/** Query ID sequence. */
@@ -112,12 +112,15 @@ public class OdbcCommandHandler {
* @param meta Internal query field metadata.
* @return Odbc query field metadata.
*/
- private static Collection<OdbcColumnMeta> convertMetadata(Collection<GridQueryFieldMetadata> meta) {
+ private static Collection<OdbcColumnMeta> convertMetadata(Collection<?> meta) {
List<OdbcColumnMeta> res = new ArrayList<>();
if (meta != null) {
- for (GridQueryFieldMetadata info : meta)
- res.add(new OdbcColumnMeta(info));
+ for (Object info : meta) {
+ assert info instanceof GridQueryFieldMetadata;
+
+ res.add(new OdbcColumnMeta((GridQueryFieldMetadata)info));
+ }
}
return res;
@@ -176,9 +179,9 @@ public class OdbcCommandHandler {
qryCurs.put(qryId, new IgniteBiTuple<>(qryCur, cur));
- List<GridQueryFieldMetadata> fieldsMeta = ((QueryCursorImpl) qryCur).fieldsMeta();
+ List<?> fieldsMeta = ((QueryCursorImpl) qryCur).fieldsMeta();
- System.out.println("Field meta: " + fieldsMeta);
+ log.debug("Field meta: " + fieldsMeta);
OdbcQueryExecuteResult res = new OdbcQueryExecuteResult(qryId, convertMetadata(fieldsMeta));
http://git-wip-us.apache.org/repos/asf/ignite/blob/e200771d/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 222293a..322cb1c 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
@@ -17,6 +17,7 @@
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.binary.*;
import org.apache.ignite.internal.binary.streams.BinaryHeapInputStream;
@@ -47,13 +48,18 @@ public class OdbcParser implements GridNioParser {
/** Marshaller. */
private final GridBinaryMarshaller marsh;
+ /** Logger. */
+ protected final IgniteLogger log;
+
/**
- * @param context Kernel context.
+ * @param ctx Kernel context.
*/
- public OdbcParser(GridKernalContext context) {
- CacheObjectBinaryProcessorImpl cacheObjProc = (CacheObjectBinaryProcessorImpl)context.cacheObjects();
+ public OdbcParser(GridKernalContext ctx) {
+ CacheObjectBinaryProcessorImpl cacheObjProc = (CacheObjectBinaryProcessorImpl)ctx.cacheObjects();
marsh = cacheObjProc.marshaller();
+
+ log = ctx.log(getClass());
}
/**
@@ -127,7 +133,7 @@ public class OdbcParser implements GridNioParser {
assert msg != null;
assert msg instanceof OdbcResponse;
- System.out.println("Encoding query processing result");
+ log.debug("Encoding query processing result");
BinaryRawWriterEx writer = marsh.writer(new BinaryHeapOutputStream(INIT_CAP));
@@ -171,10 +177,10 @@ public class OdbcParser implements GridNioParser {
String sql = reader.readString();
int argsNum = reader.readInt();
- System.out.println("Message EXECUTE_SQL_QUERY:");
- System.out.println("cache: " + cache);
- System.out.println("query: " + sql);
- System.out.println("argsNum: " + argsNum);
+ log.debug("Message EXECUTE_SQL_QUERY:");
+ log.debug("cache: " + cache);
+ log.debug("query: " + sql);
+ log.debug("argsNum: " + argsNum);
Object[] params = new Object[argsNum];
@@ -191,9 +197,9 @@ public class OdbcParser implements GridNioParser {
long queryId = reader.readLong();
int pageSize = reader.readInt();
- System.out.println("Message FETCH_SQL_QUERY:");
- System.out.println("queryId: " + queryId);
- System.out.println("pageSize: " + pageSize);
+ log.debug("Message FETCH_SQL_QUERY:");
+ log.debug("queryId: " + queryId);
+ log.debug("pageSize: " + pageSize);
res = new OdbcQueryFetchRequest(queryId, pageSize);
@@ -204,8 +210,8 @@ public class OdbcParser implements GridNioParser {
long queryId = reader.readLong();
- System.out.println("Message CLOSE_SQL_QUERY:");
- System.out.println("queryId: " + queryId);
+ log.debug("Message CLOSE_SQL_QUERY:");
+ log.debug("queryId: " + queryId);
res = new OdbcQueryCloseRequest(queryId);
@@ -218,10 +224,10 @@ public class OdbcParser implements GridNioParser {
String table = reader.readString();
String column = reader.readString();
- System.out.println("Message GET_COLUMNS_META:");
- System.out.println("cache: " + cache);
- System.out.println("table: " + table);
- System.out.println("column: " + column);
+ log.debug("Message GET_COLUMNS_META:");
+ log.debug("cache: " + cache);
+ log.debug("table: " + table);
+ log.debug("column: " + column);
res = new OdbcQueryGetColumnsMetaRequest(cache, table, column);
@@ -235,11 +241,11 @@ public class OdbcParser implements GridNioParser {
String table = reader.readString();
String tableType = reader.readString();
- System.out.println("Message GET_COLUMNS_META:");
- System.out.println("catalog: " + catalog);
- System.out.println("schema: " + schema);
- System.out.println("table: " + table);
- System.out.println("tableType: " + tableType);
+ log.debug("Message GET_COLUMNS_META:");
+ log.debug("catalog: " + catalog);
+ log.debug("schema: " + schema);
+ log.debug("table: " + table);
+ log.debug("tableType: " + tableType);
res = new OdbcQueryGetTablesMetaRequest(catalog, schema, table, tableType);
@@ -277,7 +283,7 @@ public class OdbcParser implements GridNioParser {
if (res0 instanceof OdbcQueryExecuteResult) {
OdbcQueryExecuteResult res = (OdbcQueryExecuteResult) res0;
- System.out.println("Resulting query ID: " + res.getQueryId());
+ log.debug("Resulting query ID: " + res.getQueryId());
writer.writeLong(res.getQueryId());
@@ -294,7 +300,7 @@ public class OdbcParser implements GridNioParser {
else if (res0 instanceof OdbcQueryFetchResult) {
OdbcQueryFetchResult res = (OdbcQueryFetchResult) res0;
- System.out.println("Resulting query ID: " + res.queryId());
+ log.debug("Resulting query ID: " + res.queryId());
writer.writeLong(res.queryId());
@@ -323,7 +329,7 @@ public class OdbcParser implements GridNioParser {
else if (res0 instanceof OdbcQueryCloseResult) {
OdbcQueryCloseResult res = (OdbcQueryCloseResult) res0;
- System.out.println("Resulting query ID: " + res.getQueryId());
+ log.debug("Resulting query ID: " + res.getQueryId());
writer.writeLong(res.getQueryId());
http://git-wip-us.apache.org/repos/asf/ignite/blob/e200771d/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 ffd425a..8bf3633 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
@@ -45,12 +45,12 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest
/** {@inheritDoc} */
@Override public void onConnected(GridNioSession ses) {
- System.out.println("Driver connected");
+ log.debug("Driver connected");
}
/** {@inheritDoc} */
@Override public void onDisconnected(GridNioSession ses, @Nullable Exception e) {
- System.out.println("Driver disconnected");
+ log.debug("Driver disconnected");
if (e != null) {
if (e instanceof RuntimeException)
@@ -64,7 +64,7 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest
@Override public void onMessage(GridNioSession ses, OdbcRequest msg) {
assert msg != null;
- System.out.println("Query: " + msg.command());
+ log.debug("Query: " + msg.command());
OdbcResponse res;
@@ -78,7 +78,7 @@ public class OdbcTcpNioListener extends GridNioServerListenerAdapter<OdbcRequest
"Failed to process client request: " + e.getMessage());
}
- System.out.println("Resulting success status: " + res.status());
+ log.debug("Resulting success status: " + res.status());
GridNioFuture<?> sf = ses.send(res);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e200771d/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 8c69e3a..648be56 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
@@ -76,7 +76,7 @@ public class OdbcTcpServer {
int port = cfg.getPort();
if (startTcpServer(host, port, listener, parser, cfg)) {
- System.out.println("ODBC Server has started on TCP port " + port);
+ log.debug("ODBC Server has started on TCP port " + port);
return;
}