You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2018/05/09 21:16:42 UTC
[2/2] phoenix git commit: PHOENIX-4733 NPE while running sql through
file using psql
PHOENIX-4733 NPE while running sql through file using psql
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d9308c56
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d9308c56
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d9308c56
Branch: refs/heads/5.x-HBase-2.0
Commit: d9308c56b53d4008ba791cf87d3111c21accc422
Parents: 0a554fc
Author: Ankit Singhal <an...@gmail.com>
Authored: Wed May 9 14:16:25 2018 -0700
Committer: Ankit Singhal <an...@gmail.com>
Committed: Wed May 9 14:16:25 2018 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/log/QueryLoggerUtil.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d9308c56/phoenix-core/src/main/java/org/apache/phoenix/log/QueryLoggerUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/log/QueryLoggerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/log/QueryLoggerUtil.java
index 2f22931..d5c4878 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/log/QueryLoggerUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/log/QueryLoggerUtil.java
@@ -30,10 +30,14 @@ import com.google.common.collect.ImmutableMap.Builder;
public class QueryLoggerUtil {
- public static void logInitialDetails(QueryLogger queryLogger, PName tenantId,
- ConnectionQueryServices queryServices, String query, long startTime, List<Object> bindParameters) {
- queryLogger.log(QueryLogState.STARTED,
- getInitialDetails(tenantId, queryServices, query, startTime, bindParameters));
+ public static void logInitialDetails(QueryLogger queryLogger, PName tenantId, ConnectionQueryServices queryServices,
+ String query, long startTime, List<Object> bindParameters) {
+ try {
+ queryLogger.log(QueryLogState.STARTED,
+ getInitialDetails(tenantId, queryServices, query, startTime, bindParameters));
+ } catch (Exception e) {
+ // Ignore for now
+ }
}
@@ -46,15 +50,21 @@ public class QueryLoggerUtil {
} catch (UnknownHostException e) {
clientIP = "UnknownHost";
}
- queryLogBuilder.put(QueryLogInfo.CLIENT_IP_I, clientIP);
- queryLogBuilder.put(QueryLogInfo.QUERY_I, query);
+
+ if (clientIP != null) {
+ queryLogBuilder.put(QueryLogInfo.CLIENT_IP_I, clientIP);
+ }
+ if (query != null) {
+ queryLogBuilder.put(QueryLogInfo.QUERY_I, query);
+ }
queryLogBuilder.put(QueryLogInfo.START_TIME_I, startTime);
if (bindParameters != null) {
- queryLogBuilder.put(QueryLogInfo.BIND_PARAMETERS_I, StringUtils.join(bindParameters,","));
+ queryLogBuilder.put(QueryLogInfo.BIND_PARAMETERS_I, StringUtils.join(bindParameters, ","));
}
if (tenantId != null) {
queryLogBuilder.put(QueryLogInfo.TENANT_ID_I, tenantId.getString());
}
+
queryLogBuilder.put(QueryLogInfo.USER_I, queryServices.getUserName() != null ? queryServices.getUserName()
: queryServices.getUser().getShortName());
return queryLogBuilder.build();