You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by sh...@apache.org on 2015/07/29 06:57:07 UTC
[20/50] [abbrv] incubator-lens git commit: LENS-667 : Use SLF4j
logger in driver modules
LENS-667 : Use SLF4j logger in driver modules
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/d8e071c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/d8e071c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/d8e071c1
Branch: refs/heads/LENS-581
Commit: d8e071c1eb253a0077f595ac448e32f6c359c4bb
Parents: 9492add
Author: Amareshwari Sriramadasu <am...@gmail.com>
Authored: Tue Jul 21 13:16:45 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Tue Jul 21 13:16:45 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/driver/hive/HiveDriver.java | 80 ++++++++++----------
.../apache/lens/driver/hive/HiveQueryPlan.java | 2 +-
.../driver/hive/RemoteThriftConnection.java | 19 +++--
.../lens/driver/jdbc/ColumnarSQLRewriter.java | 34 ++++-----
.../jdbc/DataSourceConnectionProvider.java | 13 ++--
.../org/apache/lens/driver/jdbc/JDBCDriver.java | 51 ++++++-------
.../apache/lens/driver/jdbc/JDBCResultSet.java | 11 ++-
.../apache/lens/driver/jdbc/TestJdbcDriver.java | 6 +-
8 files changed, 105 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java
----------------------------------------------------------------------
diff --git a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java
index 89d671f..7c3e3e0 100644
--- a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java
+++ b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveDriver.java
@@ -179,7 +179,7 @@ public class HiveDriver implements LensDriver {
if (thConn != null) {
try {
- log.info("Closed connection:" + expired.getConnId());
+ log.info("Closed connection: {}", expired.getConnId());
thConn.close();
} catch (IOException e) {
log.error("Error closing connection", e);
@@ -361,7 +361,7 @@ public class HiveDriver implements LensDriver {
@Override
public QueryCost estimate(AbstractQueryContext qctx) throws LensException {
- log.info("Estimate: " + qctx.getDriverQuery(this));
+ log.info("Estimate: {}", qctx.getDriverQuery(this));
if (qctx.getDriverQuery(this) == null) {
throw new NullPointerException("Null driver query for " + qctx.getUserQuery());
}
@@ -396,7 +396,7 @@ public class HiveDriver implements LensDriver {
// explain called again and again
return (HiveQueryPlan) explainCtx.getDriverContext().getDriverQueryPlan(this);
}
- log.info("Explain: " + explainCtx.getDriverQuery(this));
+ log.info("Explain: {}", explainCtx.getDriverQuery(this));
Configuration explainConf = new Configuration(explainCtx.getDriverConf(this));
explainConf.setClassLoader(explainCtx.getConf().getClassLoader());
explainConf.setBoolean(LensConfConstants.QUERY_PERSISTENT_RESULT_INDRIVER, false);
@@ -475,7 +475,7 @@ public class HiveDriver implements LensDriver {
qdconf.set("mapred.job.name", ctx.getQueryHandle().toString());
OperationHandle op = getClient().executeStatement(getSession(ctx), ctx.getSelectedDriverQuery(),
qdconf.getValByRegex(".*"));
- log.info("The hive operation handle: " + op);
+ log.info("The hive operation handle: {}", op);
ctx.setDriverOpHandle(op.toString());
hiveHandles.put(ctx.getQueryHandle(), op);
updateStatus(ctx);
@@ -512,7 +512,7 @@ public class HiveDriver implements LensDriver {
Configuration qdconf = ctx.getDriverConf(this);
qdconf.set("mapred.job.name", ctx.getQueryHandle().toString());
//Query is already explained.
- log.info("whetherCalculatePriority: " + whetherCalculatePriority);
+ log.info("whetherCalculatePriority: {}", whetherCalculatePriority);
if (whetherCalculatePriority) {
try {
// Inside try since non-data fetching queries can also be executed by async method.
@@ -521,19 +521,19 @@ public class HiveDriver implements LensDriver {
}
String priority = queryPriorityDecider.decidePriority(ctx.getDriverQueryCost(this)).toString();
qdconf.set("mapred.job.priority", priority);
- log.info("set priority to " + priority);
+ log.info("set priority to {}", priority);
} catch (Exception e) {
// not failing query launch when setting priority fails
// priority will be set to usually NORMAL - the default in underlying system.
- log.error("could not set priority for lens session id:" + ctx.getLensSessionIdentifier()
- + "User query: " + ctx.getUserQuery(), e);
+ log.error("could not set priority for lens session id:{} User query: {}", ctx.getLensSessionIdentifier(),
+ ctx.getUserQuery(), e);
}
}
queryHook.preLaunch(ctx);
OperationHandle op = getClient().executeStatementAsync(getSession(ctx), ctx.getSelectedDriverQuery(),
qdconf.getValByRegex(".*"));
ctx.setDriverOpHandle(op.toString());
- log.info("QueryHandle: " + ctx.getQueryHandle() + " HiveHandle:" + op);
+ log.info("QueryHandle: {} HiveHandle:{}", ctx.getQueryHandle(), op);
hiveHandles.put(ctx.getQueryHandle(), op);
} catch (IOException e) {
throw new LensException("Error adding persistent path", e);
@@ -550,7 +550,7 @@ public class HiveDriver implements LensDriver {
*/
@Override
public void updateStatus(QueryContext context) throws LensException {
- log.debug("GetStatus: " + context.getQueryHandle());
+ log.debug("GetStatus: {}", context.getQueryHandle());
if (context.getDriverStatus().isFinished()) {
return;
}
@@ -558,9 +558,9 @@ public class HiveDriver implements LensDriver {
ByteArrayInputStream in = null;
try {
// Get operation status from hive server
- log.debug("GetStatus hiveHandle: " + hiveHandle);
+ log.debug("GetStatus hiveHandle: {}", hiveHandle);
OperationStatus opStatus = getClient().getOperationStatus(hiveHandle);
- log.debug("GetStatus on hiveHandle: " + hiveHandle + " returned state:" + opStatus.getState().name());
+ log.debug("GetStatus on hiveHandle: {} returned state:", hiveHandle, opStatus.getState().name());
switch (opStatus.getState()) {
case CANCELED:
@@ -672,7 +672,7 @@ public class HiveDriver implements LensDriver {
*/
@Override
public LensResultSet fetchResultSet(QueryContext ctx) throws LensException {
- log.info("FetchResultSet: " + ctx.getQueryHandle());
+ log.info("FetchResultSet: {}", ctx.getQueryHandle());
// This should be applicable only for a async query
return createResultSet(ctx, false);
}
@@ -697,10 +697,10 @@ public class HiveDriver implements LensDriver {
if (handle == null) {
return;
}
- log.info("CloseQuery: " + handle);
+ log.info("CloseQuery: {}", handle);
OperationHandle opHandle = hiveHandles.remove(handle);
if (opHandle != null) {
- log.info("CloseQuery: " + opHandle);
+ log.info("CloseQuery hiveHandle: {}", opHandle);
try {
getClient().closeOperation(opHandle);
} catch (HiveSQLException e) {
@@ -717,10 +717,10 @@ public class HiveDriver implements LensDriver {
*/
@Override
public boolean cancelQuery(QueryHandle handle) throws LensException {
- log.info("CancelQuery: " + handle);
+ log.info("CancelQuery: {}", handle);
OperationHandle hiveHandle = getHiveHandle(handle);
try {
- log.info("CancelQuery hiveHandle: " + hiveHandle);
+ log.info("CancelQuery hiveHandle: {}", hiveHandle);
getClient().cancelOperation(hiveHandle);
return true;
} catch (HiveSQLException e) {
@@ -745,8 +745,8 @@ public class HiveDriver implements LensDriver {
getClient().closeSession(lensToHiveSession.get(lensSessionDbKey));
} catch (Exception e) {
checkInvalidSession(e);
- log.warn("Error closing session for lens session: " + lensSessionDbKey + ", hive session: "
- + lensToHiveSession.get(lensSessionDbKey), e);
+ log.warn("Error closing session for lens session: {}, hive session: ", lensSessionDbKey,
+ lensToHiveSession.get(lensSessionDbKey), e);
}
}
lensToHiveSession.clear();
@@ -774,7 +774,7 @@ public class HiveDriver implements LensDriver {
} catch (Exception e) {
throw new LensException(e);
}
- log.info("New thrift connection " + connectionClass);
+ log.info("New thrift connection {}", connectionClass);
}
return embeddedConnection.getClient();
} else {
@@ -792,8 +792,8 @@ public class HiveDriver implements LensDriver {
connection = new ExpirableConnection(tconn, connectionExpiryTimeout);
thriftConnExpiryQueue.offer(connection);
threadConnections.put(connectionKey, connection);
- log.info("New thrift connection " + connectionClass + " for thread:" + Thread.currentThread().getId()
- + " for user:" + user + " connection ID=" + connection.getConnId());
+ log.info("New thrift connection {} for thread: {} for user: {} connection ID={}", connectionClass,
+ Thread.currentThread().getId(), user, connection.getConnId());
} catch (Exception e) {
throw new LensException(e);
}
@@ -817,7 +817,7 @@ public class HiveDriver implements LensDriver {
*/
private LensResultSet createResultSet(QueryContext context, boolean closeAfterFetch) throws LensException {
OperationHandle op = getHiveHandle(context.getQueryHandle());
- log.info("Creating result set for hiveHandle:" + op);
+ log.info("Creating result set for hiveHandle:{}", op);
try {
if (context.isDriverPersistent()) {
return new HivePersistentResultSet(new Path(context.getHdfsoutPath()), op, getClient());
@@ -864,7 +864,7 @@ public class HiveDriver implements LensDriver {
context.unSetDriverPersistent();
hiveQuery = context.getSelectedDriverQuery();
}
- log.info("Hive driver query:" + hiveQuery);
+ log.info("Hive driver query:{}", hiveQuery);
context.setSelectedDriverQuery(hiveQuery);
}
@@ -893,14 +893,14 @@ public class HiveDriver implements LensDriver {
try {
hiveSession = getClient().openSession(ctx.getClusterUser(), "");
lensToHiveSession.put(sessionDbKey, hiveSession);
- log.info("New hive session for user: " + ctx.getClusterUser() + ", lens session: " + sessionDbKey
- + " hive session handle: " + hiveSession.getHandleIdentifier());
+ log.info("New hive session for user: {} , lens session: {} hive session handle: {}", ctx.getClusterUser(),
+ sessionDbKey, hiveSession.getHandleIdentifier());
for (LensEventListener<DriverEvent> eventListener : driverListeners) {
try {
eventListener.onEvent(new DriverSessionStarted(System.currentTimeMillis(), this, lensSession, hiveSession
.getSessionId().toString()));
} catch (Exception exc) {
- log.error("Error sending driver start event to listener " + eventListener, exc);
+ log.error("Error sending driver start event to listener {}", eventListener, exc);
}
}
} catch (Exception e) {
@@ -1048,9 +1048,9 @@ public class HiveDriver implements LensDriver {
QueryHandle qhandle = (QueryHandle) in.readObject();
OperationHandle opHandle = new OperationHandle((TOperationHandle) in.readObject());
hiveHandles.put(qhandle, opHandle);
- log.debug("Hive driver recovered " + qhandle + ":" + opHandle);
+ log.debug("Hive driver recovered {}:{}", qhandle, opHandle);
}
- log.info("HiveDriver recovered " + hiveHandles.size() + " queries");
+ log.info("HiveDriver recovered {} queries", hiveHandles.size());
int numSessions = in.readInt();
for (int i = 0; i < numSessions; i++) {
String lensId = in.readUTF();
@@ -1058,7 +1058,7 @@ public class HiveDriver implements LensDriver {
TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6);
lensToHiveSession.put(lensId, sHandle);
}
- log.info("HiveDriver recovered " + lensToHiveSession.size() + " sessions");
+ log.info("HiveDriver recovered {} sessions", lensToHiveSession.size());
}
}
@@ -1075,15 +1075,15 @@ public class HiveDriver implements LensDriver {
for (Map.Entry<QueryHandle, OperationHandle> entry : hiveHandles.entrySet()) {
out.writeObject(entry.getKey());
out.writeObject(entry.getValue().toTOperationHandle());
- log.debug("Hive driver persisted " + entry.getKey() + ":" + entry.getValue());
+ log.debug("Hive driver persisted {}:{}", entry.getKey(), entry.getValue());
}
- log.info("HiveDriver persisted " + hiveHandles.size() + " queries");
+ log.info("HiveDriver persisted {} queries ", hiveHandles.size());
out.writeInt(lensToHiveSession.size());
for (Map.Entry<String, SessionHandle> entry : lensToHiveSession.entrySet()) {
out.writeUTF(entry.getKey());
out.writeObject(entry.getValue().toTSessionHandle());
}
- log.info("HiveDriver persisted " + lensToHiveSession.size() + " sessions");
+ log.info("HiveDriver persisted {} sessions", lensToHiveSession.size());
}
}
@@ -1145,7 +1145,7 @@ public class HiveDriver implements LensDriver {
for (SessionHandle session : hiveSessionsToCheck) {
if (isSessionInvalid(exc, session)) {
// We have to expire previous session
- log.info("Hive server session " + session + " for lens session " + lensSession + " has become invalid");
+ log.info("Hive server session {} for lens session {} has become invalid", session, lensSession);
sessionLock.lock();
try {
// We should close all connections and clear the session map since
@@ -1169,12 +1169,12 @@ public class HiveDriver implements LensDriver {
protected void checkInvalidOperation(QueryHandle queryHandle, HiveSQLException exc) {
final OperationHandle operation = hiveHandles.get(queryHandle);
if (operation == null) {
- log.info("No hive operation available for " + queryHandle);
+ log.info("No hive operation available for {}", queryHandle);
return;
}
if (exc.getMessage() != null && exc.getMessage().contains("Invalid OperationHandle:")
&& exc.getMessage().contains(operation.toString())) {
- log.info("Hive operation " + operation + " for query " + queryHandle + " has become invalid");
+ log.info("Hive operation {} for query {} has become invalid", operation, queryHandle);
hiveHandles.remove(queryHandle);
return;
}
@@ -1216,11 +1216,11 @@ public class HiveDriver implements LensDriver {
if (hiveSession != null) {
try {
getClient().closeSession(hiveSession);
- log.info("Closed Hive session " + hiveSession.getHandleIdentifier() + " for lens session "
- + sessionDbKey);
+ log.info("Closed Hive session {} for lens session {}", hiveSession.getHandleIdentifier(),
+ sessionDbKey);
} catch (Exception e) {
- log.error("Error closing hive session " + hiveSession.getHandleIdentifier()
- + " for lens session " + sessionDbKey, e);
+ log.error("Error closing hive session {} for lens session {}", hiveSession.getHandleIdentifier(),
+ sessionDbKey, e);
}
resourcesAddedForSession.remove(hiveSession);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveQueryPlan.java
----------------------------------------------------------------------
diff --git a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveQueryPlan.java b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveQueryPlan.java
index f38b1da..f53e2b6 100644
--- a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveQueryPlan.java
+++ b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/HiveQueryPlan.java
@@ -166,7 +166,7 @@ public class HiveQueryPlan extends DriverQueryPlan {
Table tbl = metastore.getTable(table, false);
if (tbl == null) {
// table not found, possible case if query is create table
- log.info("Table " + table + " not found while extracting plan details");
+ log.info("Table {} not found while extracting plan details", table);
continue;
}
tablesQueried.add(table);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/RemoteThriftConnection.java
----------------------------------------------------------------------
diff --git a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/RemoteThriftConnection.java b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/RemoteThriftConnection.java
index 0104670..741294c 100644
--- a/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/RemoteThriftConnection.java
+++ b/lens-driver-hive/src/main/java/org/apache/lens/driver/hive/RemoteThriftConnection.java
@@ -20,21 +20,19 @@ package org.apache.lens.driver.hive;
import org.apache.lens.server.api.error.LensException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hive.service.cli.CLIServiceClient;
import org.apache.hive.service.cli.HiveSQLException;
import org.apache.hive.service.cli.thrift.RetryingThriftCLIServiceClient;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Connect to a remote Hive Server 2 service to run driver queries.
*/
+@Slf4j
public class RemoteThriftConnection implements ThriftConnection {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(RemoteThriftConnection.class);
-
/** The connected. */
private boolean connected;
@@ -64,12 +62,13 @@ public class RemoteThriftConnection implements ThriftConnection {
public CLIServiceClient getClient() throws LensException {
if (!connected) {
try {
- LOG.info("HiveDriver connecting to HiveServer @ "
- + conf.getVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST) + ":"
- + conf.getIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_PORT));
+ log.info("HiveDriver connecting to HiveServer @ {}:{}",
+ conf.getVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST),
+ conf.getIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_PORT));
hs2Client = RetryingThriftCLIServiceClient.newRetryingCLIServiceClient(conf);
- LOG.info("HiveDriver connected to HiveServer @ " + conf.getVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST)
- + ":" + conf.getIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_PORT));
+ log.info("HiveDriver connected to HiveServer @ {}:{}",
+ conf.getVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST),
+ conf.getIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_PORT));
} catch (HiveSQLException e) {
throw new LensException(e);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/ColumnarSQLRewriter.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/ColumnarSQLRewriter.java b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/ColumnarSQLRewriter.java
index 18f84cd..0556d0c 100644
--- a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/ColumnarSQLRewriter.java
+++ b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/ColumnarSQLRewriter.java
@@ -31,8 +31,6 @@ import org.apache.lens.server.api.query.rewrite.QueryRewriter;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.mutable.MutableInt;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.metadata.HiveException;
@@ -44,9 +42,12 @@ import org.apache.hadoop.hive.ql.parse.SemanticException;
import org.antlr.runtime.CommonToken;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class ColumnarSQLRewriter.
*/
+@Slf4j
public class ColumnarSQLRewriter implements QueryRewriter {
/** The clause name. */
@@ -115,9 +116,6 @@ public class ColumnarSQLRewriter implements QueryRewriter {
/** The map aliases. */
private final Map<String, String> mapAliases = new HashMap<String, String>();
- /** The Constant LOG. */
- private static final Log LOG = LogFactory.getLog(ColumnarSQLRewriter.class);
-
/** The where tree. */
private String whereTree;
@@ -197,7 +195,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
}
if (!qb.getSubqAliases().isEmpty()) {
- LOG.warn("Subqueries in from clause is not supported by " + this + " Query : " + this.query);
+ log.warn("Subqueries in from clause is not supported by {} Query : {}", this, this.query);
throw new SemanticException("Subqueries in from clause is not supported by " + this + " Query : " + this.query);
}
@@ -302,7 +300,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
} else if (joinToken.equals("TOK_UNIQUEJOIN")) {
joinType = "unique join";
} else {
- LOG.info("Non supported join type : " + joinToken);
+ log.info("Non supported join type : {}", joinToken);
}
if (node.getChildCount() > 2) {
@@ -382,7 +380,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
public void getFilterInJoinCond(ASTNode node) {
if (node == null) {
- LOG.debug("Join AST is null ");
+ log.debug("Join AST is null ");
return;
}
@@ -422,7 +420,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
public void factFilterPushDown(ASTNode node) {
if (node == null) {
- LOG.debug("Join AST is null ");
+ log.debug("Join AST is null ");
return;
}
@@ -460,7 +458,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
*/
public void getFactKeysFromNode(ASTNode node) {
if (node == null) {
- LOG.debug("AST is null ");
+ log.debug("AST is null ");
return;
}
if (node.getToken().getType() == HiveParser.DOT
@@ -507,7 +505,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
*/
public void buildSubqueries(ASTNode node) {
if (node == null) {
- LOG.debug("Join AST is null ");
+ log.debug("Join AST is null ");
return;
}
@@ -880,7 +878,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
if (whereTree == null || joinTree == null || allSubQueries.length() == 0
|| aggColumn.isEmpty() || isExpressionsUsed(selectAST)) {
- LOG.info("@@@Query not eligible for inner subquery rewrite");
+ log.info("@@@Query not eligible for inner subquery rewrite");
// construct query without fact sub query
constructQuery(selectTree, whereTree, groupByTree, havingTree, orderByTree, limit);
return;
@@ -1079,7 +1077,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
String finalRewrittenQuery = "";
String[] queries = query.toLowerCase().split("union all");
for (int i = 0; i < queries.length; i++) {
- LOG.info("Union Query Part " + i + " : " + queries[i]);
+ log.info("Union Query Part {} : {}", i, queries[i]);
ast = HQLParser.parseHQL(queries[i], metastoreConf);
buildQuery(conf, metastoreConf);
mergedQuery = rewrittenQuery.append(" union all ");
@@ -1087,14 +1085,14 @@ public class ColumnarSQLRewriter implements QueryRewriter {
reset();
}
queryReplacedUdf = replaceUDFForDB(finalRewrittenQuery);
- LOG.info("Input Query : " + query);
- LOG.info("Rewritten Query : " + queryReplacedUdf);
+ log.info("Input Query : {}", query);
+ log.info("Rewritten Query : {}", queryReplacedUdf);
} else {
ast = HQLParser.parseHQL(query, metastoreConf);
buildQuery(conf, metastoreConf);
queryReplacedUdf = replaceUDFForDB(rewrittenQuery.toString());
- LOG.info("Input Query : " + query);
- LOG.info("Rewritten Query : " + queryReplacedUdf);
+ log.info("Input Query : {}", query);
+ log.info("Rewritten Query : {}", queryReplacedUdf);
}
} catch (SemanticException e) {
throw new LensException(e);
@@ -1158,7 +1156,7 @@ public class ColumnarSQLRewriter implements QueryRewriter {
}
}
} catch (HiveException e) {
- LOG.warn("No corresponding table in metastore:" + e.getMessage());
+ log.warn("No corresponding table in metastore:", e);
}
} else {
for (int i = 0; i < tree.getChildCount(); i++) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/DataSourceConnectionProvider.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/DataSourceConnectionProvider.java b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/DataSourceConnectionProvider.java
index 7b454fa..b14835a 100644
--- a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/DataSourceConnectionProvider.java
+++ b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/DataSourceConnectionProvider.java
@@ -28,18 +28,17 @@ import java.util.Map;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.Logger;
import com.mchange.v2.c3p0.ComboPooledDataSource;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class DataSourceConnectionProvider.
*/
+@Slf4j
public class DataSourceConnectionProvider implements ConnectionProvider {
- /** The Constant LOG. */
- public static final Logger LOG = Logger.getLogger(DataSourceConnectionProvider.class);
-
/** The data source map. */
private Map<DriverConfig, ComboPooledDataSource> dataSourceMap;
@@ -187,7 +186,7 @@ public class DataSourceConnectionProvider implements ConnectionProvider {
cpds.setCheckoutTimeout(conf.getInt(JDBCDriverConfConstants.JDBC_GET_CONNECTION_TIMEOUT,
JDBCDriverConfConstants.JDBC_GET_CONNECTION_TIMEOUT_DEFAULT));
dataSourceMap.put(config, cpds);
- LOG.info("Created new datasource for config: " + config);
+ log.info("Created new datasource for config: {}", config);
}
return dataSourceMap.get(config).getConnection();
}
@@ -201,10 +200,10 @@ public class DataSourceConnectionProvider implements ConnectionProvider {
public void close() throws IOException {
for (Map.Entry<DriverConfig, ComboPooledDataSource> entry : dataSourceMap.entrySet()) {
entry.getValue().close();
- LOG.info("Closed datasource: " + entry.getKey());
+ log.info("Closed datasource: {}", entry.getKey());
}
dataSourceMap.clear();
- LOG.info("Closed datasource connection provider");
+ log.info("Closed datasource connection provider");
}
protected final ComboPooledDataSource getDataSource(Configuration conf) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
index 9445436..e3a8799 100644
--- a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
+++ b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
@@ -54,20 +54,19 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.parse.ASTNode;
import org.apache.hadoop.hive.ql.parse.HiveParser;
-import org.apache.log4j.Logger;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
/**
* This driver is responsible for running queries against databases which can be queried using the JDBC API.
*/
+@Slf4j
public class JDBCDriver implements LensDriver {
- /** The Constant LOG. */
- public static final Logger LOG = Logger.getLogger(JDBCDriver.class);
-
/** The Constant THID. */
public static final AtomicInteger THID = new AtomicInteger();
@@ -233,7 +232,7 @@ public class JDBCDriver implements LensDriver {
try {
stmt.close();
} catch (SQLException e) {
- LOG.error("Error closing SQL statement", e);
+ log.error("Error closing SQL statement", e);
}
}
} finally {
@@ -241,7 +240,7 @@ public class JDBCDriver implements LensDriver {
try {
conn.close();
} catch (SQLException e) {
- LOG.error("Error closing SQL Connection", e);
+ log.error("Error closing SQL Connection", e);
}
}
}
@@ -306,7 +305,7 @@ public class JDBCDriver implements LensDriver {
conn = getConnection();
result.conn = conn;
} catch (LensException e) {
- LOG.error("Error obtaining connection: " + e.getMessage(), e);
+ log.error("Error obtaining connection: ", e);
result.error = e;
}
@@ -321,11 +320,11 @@ public class JDBCDriver implements LensDriver {
queryContext.notifyComplete();
} catch (SQLException sqlEx) {
if (queryContext.isClosed()) {
- LOG.info("Ignored exception on already closed query: " + queryContext.getLensContext().getQueryHandle()
- + " - " + sqlEx);
+ log.info("Ignored exception on already closed query : {} - {}",
+ queryContext.getLensContext().getQueryHandle(), sqlEx.getMessage());
} else {
- LOG.error("Error executing SQL query: " + queryContext.getLensContext().getQueryHandle() + " reason: "
- + sqlEx.getMessage(), sqlEx);
+ log.error("Error executing SQL query: {} reason: {}", queryContext.getLensContext().getQueryHandle(),
+ sqlEx.getMessage(), sqlEx);
result.error = sqlEx;
// Close connection in case of failed queries. For successful queries, connection is closed
// When result set is closed or driver.closeQuery is called
@@ -355,7 +354,7 @@ public class JDBCDriver implements LensDriver {
JDBCDriverConfConstants.DEFAULT_JDBC_ENABLE_RESULTSET_STREAMING_RETRIEVAL);
if (enabledRowRetrieval) {
- LOG.info("JDBC streaming retrieval is enabled for " + queryContext.getLensContext().getQueryHandle());
+ log.info("JDBC streaming retrieval is enabled for {}", queryContext.getLensContext().getQueryHandle());
if (queryContext.isPrepared()) {
stmt = conn.prepareStatement(queryContext.getRewrittenQuery(),
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
@@ -427,7 +426,7 @@ public class JDBCDriver implements LensDriver {
throw new LensException("Can't instantiate driver query hook for hivedriver with given class", e);
}
configured = true;
- LOG.info("JDBC Driver configured");
+ log.info("JDBC Driver configured");
}
/**
@@ -453,7 +452,7 @@ public class JDBCDriver implements LensDriver {
connectionProvider = cpClass.newInstance();
estimateConnectionProvider = cpClass.newInstance();
} catch (Exception e) {
- LOG.error("Error initializing connection provider: " + e.getMessage(), e);
+ log.error("Error initializing connection provider: ", e);
throw new LensException(e);
}
this.logSegregationContext = new MappedDiagnosticLogSegregationContext();
@@ -492,9 +491,9 @@ public class JDBCDriver implements LensDriver {
DummyQueryRewriter.class, QueryRewriter.class);
try {
rewriter = queryRewriterClass.newInstance();
- LOG.info("Initialized :" + queryRewriterClass);
+ log.info("Initialized :{}", queryRewriterClass);
} catch (Exception e) {
- LOG.error("Unable to create rewriter object", e);
+ log.error("Unable to create rewriter object", e);
throw new LensException(e);
}
rewriter.init(conf);
@@ -614,7 +613,7 @@ public class JDBCDriver implements LensDriver {
explainQuery = rewrittenQuery.replaceAll("select ", "select "
+ explainKeyword + " ");
}
- LOG.info("Explain Query : " + explainQuery);
+ log.info("Explain Query : {}", explainQuery);
QueryContext explainQueryCtx = QueryContext.createContextWithSingleDriver(explainQuery, null,
new LensConf(), explainConf, this, explainCtx.getLensSessionIdentifier(), false);
QueryResult result = null;
@@ -784,12 +783,12 @@ public class JDBCDriver implements LensDriver {
try {
conn.close();
} catch (SQLException e) {
- LOG.error("Error closing connection: " + rewrittenQuery, e);
+ log.error("Error closing connection: {}", rewrittenQuery, e);
}
}
jdbcPrepareGauge.markSuccess();
}
- LOG.info("Prepared: " + rewrittenQuery);
+ log.info("Prepared: {}", rewrittenQuery);
return stmt;
}
@@ -858,7 +857,7 @@ public class JDBCDriver implements LensDriver {
checkConfigured();
String rewrittenQuery = rewriteQuery(context);
- LOG.info("Execute " + context.getQueryHandle());
+ log.info("Execute {}", context.getQueryHandle());
QueryResult result = executeInternal(context, rewrittenQuery);
return result.getLensResultSet(true);
@@ -901,11 +900,11 @@ public class JDBCDriver implements LensDriver {
Future<QueryResult> future = asyncQueryPool.submit(new QueryCallable(jdbcCtx, logSegregationContext));
jdbcCtx.setResultFuture(future);
} catch (RejectedExecutionException e) {
- LOG.error("Query execution rejected: " + context.getQueryHandle() + " reason:" + e.getMessage(), e);
+ log.error("Query execution rejected: {} reason:{}", context.getQueryHandle(), e.getMessage(), e);
throw new LensException("Query execution rejected: " + context.getQueryHandle() + " reason:" + e.getMessage(), e);
}
queryContextMap.put(context.getQueryHandle(), jdbcCtx);
- LOG.info("ExecuteAsync: " + context.getQueryHandle());
+ log.info("ExecuteAsync: {}", context.getQueryHandle());
}
/**
@@ -1018,7 +1017,7 @@ public class JDBCDriver implements LensDriver {
context.setEndTime(System.currentTimeMillis());
}
context.closeResult();
- LOG.info("Cancelled query: " + handle);
+ log.info("Cancelled query: {}", handle);
}
return cancelResult;
}
@@ -1039,7 +1038,7 @@ public class JDBCDriver implements LensDriver {
} finally {
queryContextMap.remove(handle);
}
- LOG.info("Closed query " + handle.getHandleId());
+ log.info("Closed query {}", handle.getHandleId());
}
/**
@@ -1055,7 +1054,7 @@ public class JDBCDriver implements LensDriver {
try {
closeQuery(query);
} catch (LensException e) {
- LOG.warn("Error closing query : " + query.getHandleId(), e);
+ log.warn("Error closing query : {}", query.getHandleId(), e);
}
}
for (QueryPrepareHandle query : new ArrayList<QueryPrepareHandle>(preparedQueries.keySet())) {
@@ -1066,7 +1065,7 @@ public class JDBCDriver implements LensDriver {
throw new LensException();
}
} catch (LensException e) {
- LOG.warn("Error closing prapared query : " + query, e);
+ log.warn("Error closing prapared query : {}", query, e);
}
}
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCResultSet.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCResultSet.java b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCResultSet.java
index 2687673..f80cdd8 100644
--- a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCResultSet.java
+++ b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCResultSet.java
@@ -37,7 +37,6 @@ import org.apache.hive.service.cli.ColumnDescriptor;
import org.apache.hive.service.cli.Type;
import org.apache.hive.service.cli.TypeDescriptor;
import org.apache.hive.service.cli.TypeQualifiers;
-import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -46,14 +45,14 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class JDBCResultSet.
*/
+@Slf4j
public class JDBCResultSet extends InMemoryResultSet {
- /** The Constant LOG. */
- public static final Logger LOG = Logger.getLogger(JDBCResultSet.class);
-
/** The result meta. */
ResultSetMetaData resultMeta;
@@ -101,7 +100,7 @@ public class JDBCResultSet extends InMemoryResultSet {
*/
@Override
public int size() throws LensException {
- LOG.warn("Size of result set is not supported");
+ log.warn("Size of result set is not supported");
return -1;
}
@@ -120,7 +119,7 @@ public class JDBCResultSet extends InMemoryResultSet {
jdbcResultSetMetadata.getFieldSchemas().add(col);
}
} catch (Exception e) {
- LOG.error("Error getting JDBC type information: " + e.getMessage(), e);
+ log.error("Error getting JDBC type information: {}", e.getMessage(), e);
jdbcResultSetMetadata.setFieldSchemas(null);
}
lensResultMeta = jdbcResultSetMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/d8e071c1/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
index f534b69..9041709 100644
--- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
+++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
@@ -261,7 +261,7 @@ public class TestJdbcDriver {
driver.getEstimateConnectionConf().getInt(JDBCDriverConfConstants.JDBC_POOL_MAX_SIZE, 50);
for (int i = 0; i < maxEstimateConnections + 10; i++) {
try {
- log.info("Iteration#" + (i + 1));
+ log.info("Iteration#{}", (i + 1));
String query = i > maxEstimateConnections ? "SELECT * FROM estimate_test" : "CREATE TABLE FOO(ID INT)";
ExplainQueryContext context = createExplainContext(query, baseConf);
cost = driver.estimate(context);
@@ -807,8 +807,8 @@ public class TestJdbcDriver {
DataSourceConnectionProvider.DriverConfig queryCfg =
queryCp.getDriverConfigfromConf(driver.getConf());
- log.info("@@@ ESTIMATE_CFG " + estimateCfg);
- log.info("@@@ QUERY CFG " + queryCfg);
+ log.info("@@@ ESTIMATE_CFG {}", estimateCfg);
+ log.info("@@@ QUERY CFG {}", queryCfg);
// Get connection from each so that pools get initialized
try {