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:13 UTC
[26/50] [abbrv] incubator-lens git commit: LENS-679 : Use slf4j in
api, regression, ml and client modules
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SessionHelper.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SessionHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SessionHelper.java
index ca59e3e..e7bc700 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SessionHelper.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/SessionHelper.java
@@ -35,15 +35,11 @@ import org.apache.lens.regression.util.AssertUtil;
import org.apache.lens.regression.util.Util;
import org.apache.lens.server.api.error.LensException;
-import org.apache.log4j.Logger;
-
-
-
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class SessionHelper extends ServiceManagerHelper {
- private static Logger logger = Logger.getLogger(SessionHelper.class);
-
private WebTarget servLens = ServiceManagerHelper.getServerLens();
private String sessionHandleString = ServiceManagerHelper.getSessionHandle();
@@ -75,7 +71,7 @@ public class SessionHelper extends ServiceManagerHelper {
formData.getForm());
AssertUtil.assertSucceededResponse(response);
String newSessionHandleString = response.readEntity(String.class);
- logger.info("Session Handle String" + newSessionHandleString);
+ log.info("Session Handle String:{}", newSessionHandleString);
return newSessionHandleString;
}
@@ -102,7 +98,7 @@ public class SessionHelper extends ServiceManagerHelper {
if (result.getMessage() == null) {
throw new LensException("Status message is null");
}
- logger.info("Closed Session : " + sessionHandleString);
+ log.info("Closed Session : {}", sessionHandleString);
}
/**
@@ -127,12 +123,12 @@ public class SessionHelper extends ServiceManagerHelper {
response = this.exec("get", "/session/params", servLens, null, query);
AssertUtil.assertSucceededResponse(response);
String responseString = response.readEntity(String.class);
- logger.info(responseString);
+ log.info(responseString);
HashMap<String, String> map = Util.stringListToMap(responseString);
if (!map.get(param).equals(value)) {
throw new LensException("Could not set property");
}
- logger.info("Added property " + param + " = " + value);
+ log.info("Added property {}={}", param, value);
}
public void setAndValidateParam(String param, String value) throws Exception {
@@ -156,7 +152,7 @@ public class SessionHelper extends ServiceManagerHelper {
* @param sessionHandleString
*/
public void addResourcesJar(String path, String sessionHandleString) throws JAXBException, LensException {
- logger.info("Adding Resources " + path);
+ log.info("Adding Resources {}", path);
FormBuilder formData = new FormBuilder();
formData.add("sessionid", sessionHandleString);
formData.add("type", "jar");
@@ -164,7 +160,7 @@ public class SessionHelper extends ServiceManagerHelper {
Response response = this
.exec("put", "/session/resources/add", servLens, null, null, MediaType.MULTIPART_FORM_DATA_TYPE, null,
formData.getForm());
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceeded(response);
}
@@ -179,7 +175,7 @@ public class SessionHelper extends ServiceManagerHelper {
* @param sessionHandleString
*/
public void removeResourcesJar(String path, String sessionHandleString) throws JAXBException, LensException {
- logger.info("Removing Resources " + path);
+ log.info("Removing Resources {}", path);
FormBuilder formData = new FormBuilder();
formData.add("sessionid", sessionHandleString);
formData.add("type", "jar");
@@ -187,7 +183,7 @@ public class SessionHelper extends ServiceManagerHelper {
Response response = this
.exec("put", "/session/resources/delete", servLens, null, null, MediaType.MULTIPART_FORM_DATA_TYPE, null,
formData.getForm());
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceeded(response);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/util/AssertUtil.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/util/AssertUtil.java b/lens-regression/src/main/java/org/apache/lens/regression/util/AssertUtil.java
index abcea2b..62bd160 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/util/AssertUtil.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/util/AssertUtil.java
@@ -24,15 +24,8 @@ import javax.ws.rs.core.Response;
import org.apache.lens.api.APIResult;
import org.apache.lens.server.api.error.LensException;
-import org.apache.log4j.Logger;
-
-
-
-
public class AssertUtil {
- private static final Logger LOGGER = Logger.getLogger(AssertUtil.class);
-
private AssertUtil() {
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java b/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java
index 5db4fa6..6a2bc6b 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/util/Util.java
@@ -33,17 +33,17 @@ import org.apache.lens.api.APIResult;
import org.apache.lens.api.StringList;
import org.apache.lens.api.metastore.ObjectFactory;
-import org.apache.log4j.Logger;
-
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class Util {
- private static final Logger LOGGER = Logger.getLogger(Util.class);
private static final String PROPERTY_FILE = "lens.properties";
private static Properties properties;
@@ -55,7 +55,7 @@ public class Util {
try {
if (properties == null) {
properties = new Properties();
- LOGGER.info("filename: " + filename);
+ log.info("filename: {}", filename);
InputStream confStream = Util.class.getResourceAsStream("/" + filename);
properties.load(confStream);
confStream.close();
@@ -63,7 +63,7 @@ public class Util {
return properties;
} catch (IOException e) {
- LOGGER.info(e.getStackTrace());
+ log.info("Error in getProperies:", e);
}
return null;
}
@@ -81,7 +81,7 @@ public class Util {
String host = Util.getProperty("lens.remote.host");
String password = Util.getProperty("lens.remote.password");
- LOGGER.info("Running command : " + command + " on host : " + host + " with user as " + userName);
+ log.info("Running command : {} on host : {} with user as {}", command, host, userName);
JSch jsch = new JSch();
Session session = jsch.getSession(userName, host, 22);
@@ -106,7 +106,7 @@ public class Util {
outputBuffer.append(toAppend);
readByte = commandOutput.read();
if (toAppend == '\n') {
- LOGGER.info(print.toString());
+ log.info(print.toString());
print = new StringBuilder();
} else {
print.append(toAppend);
@@ -123,7 +123,7 @@ public class Util {
out.println(str);
out.close();
} catch (IOException e) {
- LOGGER.info("File Exception : " + e);
+ log.info("File Exception : ", e);
}
}
@@ -177,7 +177,7 @@ public class Util {
try {
getMarshaller(clazz).marshal(root, stringWriter);
} catch (JAXBException e) {
- LOGGER.error("Not able to marshall", e);
+ log.error("Not able to marshall", e);
}
return stringWriter.toString();
}
@@ -191,7 +191,7 @@ public class Util {
return jaxbMarshaller;
} catch (JAXBException e) {
- LOGGER.error("Error : ", e);
+ log.error("Error : ", e);
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/test/java/org/apache/lens/regression/sanity/ITSmokeTest.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/test/java/org/apache/lens/regression/sanity/ITSmokeTest.java b/lens-regression/src/test/java/org/apache/lens/regression/sanity/ITSmokeTest.java
index 595ef67..cf7b17b 100644
--- a/lens-regression/src/test/java/org/apache/lens/regression/sanity/ITSmokeTest.java
+++ b/lens-regression/src/test/java/org/apache/lens/regression/sanity/ITSmokeTest.java
@@ -24,21 +24,20 @@ import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Method;
-
import org.apache.lens.regression.core.testHelper.BaseTestClass;
import org.apache.lens.regression.util.Util;
-import org.apache.log4j.Logger;
-
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.jcraft.jsch.JSchException;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class ITSmokeTest extends BaseTestClass {
- private static final Logger LOGGER = Logger.getLogger(ITSmokeTest.class);
private final String resourceDir = "src/test/resources";
private final String resultFile = resourceDir + "/result.data";
private final String smokeOutput = resourceDir + "/output.txt";
@@ -47,7 +46,7 @@ public class ITSmokeTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
- LOGGER.info("Test Name: " + method.getName());
+ log.info("Test Name: {}", method.getName());
}
@Test(enabled = true, groups = { "integration" })
@@ -58,23 +57,23 @@ public class ITSmokeTest extends BaseTestClass {
String populateMetastoreCommand = "bash " + exampleScript + " populate-metastore -db " + dbName;
String runQueriesCommand = "bash " + exampleScript + " runqueries -db " + dbName;
- LOGGER.info("Creating schema : ");
+ log.info("Creating schema : ");
String output = Util.runRemoteCommand(sampleMetastoreCommand);
System.out.println("Output : " + output);
- LOGGER.info("Output : " + output);
+ log.info("Output : {}", output);
- LOGGER.info("Populating Metastore : ");
+ log.info("Populating Metastore : ");
output = Util.runRemoteCommand(populateMetastoreCommand);
- LOGGER.info("Output : " + output);
+ log.info("Output : {}", output);
- LOGGER.info("Running Queries in Background : ");
+ log.info("Running Queries in Background : ");
output = Util.runRemoteCommand("nohup " + runQueriesCommand + " > smoke.log 2>&1 &");
- LOGGER.info("Output : " + output);
+ log.info("Output : {}", output);
waitToComplete();
output = Util.runRemoteCommand("cat smoke.log");
- LOGGER.info("Output : " + output);
+ log.info("Output : {}", output);
Util.writeFile(smokeOutput, output);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java b/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java
index c3fe8eb..a3fd6ac 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java
@@ -25,10 +25,8 @@ import org.apache.lens.server.api.query.AbstractQueryContext;
import org.apache.lens.server.api.query.cost.QueryCost;
import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.Logger;
public class MinQueryCostSelector implements DriverSelector {
- public static final Logger LOG = Logger.getLogger(MinQueryCostSelector.class);
/**
* Returns the driver that has the minimum query cost.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-server-api/src/main/java/org/apache/lens/server/api/metrics/MethodMetricsFactory.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/metrics/MethodMetricsFactory.java b/lens-server-api/src/main/java/org/apache/lens/server/api/metrics/MethodMetricsFactory.java
index 5b6ec3b..17578b6 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/metrics/MethodMetricsFactory.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/metrics/MethodMetricsFactory.java
@@ -30,7 +30,6 @@ import org.apache.lens.server.model.LensResourceMethod;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.Logger;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.model.ResourceMethod;
@@ -38,14 +37,16 @@ import org.glassfish.jersey.server.model.ResourceMethod;
import com.codahale.metrics.MetricRegistry;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
+
import lombok.Getter;
import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
/**
* Factory for creating MethodMetrics objects on demand.
*/
+@Slf4j
public class MethodMetricsFactory {
- public static final Logger LOG = Logger.getLogger(MethodMetricsFactory.class);
private final MetricRegistry metricRegistry;
@@ -83,7 +84,7 @@ public class MethodMetricsFactory {
if (result == null) {
synchronized (this) {
result = methodMetricsMap.get(name);
- LOG.info("Creating MethodMetrics of name: " + name);
+ log.info("Creating MethodMetrics of name: {}", name);
result = new MethodMetrics(
metricRegistry.meter(name(name, "meter")),
metricRegistry.timer(name(name, "timer")),
@@ -146,7 +147,7 @@ public class MethodMetricsFactory {
*/
public void clear() {
synchronized (this) {
- LOG.info("clearing factory");
+ log.info("clearing factory");
for (Map.Entry<String, MethodMetrics> entry : methodMetricsMap.entrySet()) {
metricRegistry.remove(name(entry.getKey(), "meter"));
metricRegistry.remove(name(entry.getKey(), "timer"));
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-server-api/src/main/java/org/apache/lens/server/api/query/AbstractQueryContext.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/AbstractQueryContext.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/AbstractQueryContext.java
index 71a37f0..8046927 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/AbstractQueryContext.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/AbstractQueryContext.java
@@ -34,24 +34,19 @@ import org.apache.lens.server.api.query.DriverSelectorQueryContext.DriverQueryCo
import org.apache.lens.server.api.query.cost.QueryCost;
import org.apache.lens.server.api.util.LensUtil;
-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.session.SessionState;
import lombok.Getter;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public abstract class AbstractQueryContext implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * The Constant LOG
- */
- public static final Log LOG = LogFactory.getLog(AbstractQueryContext.class);
-
- /**
* The user query.
*/
@Getter
@@ -129,7 +124,7 @@ public abstract class AbstractQueryContext implements Serializable {
if (conf.getBoolean(LensConfConstants.ENABLE_QUERY_METRICS, LensConfConstants.DEFAULT_ENABLE_QUERY_METRICS)) {
UUID metricId = UUID.randomUUID();
conf.set(LensConfConstants.QUERY_METRIC_UNIQUE_ID_CONF_KEY, metricId.toString());
- LOG.info("Generated metric id: " + metricId + " for query: " + query);
+ log.info("Generated metric id: {} for query: {}", metricId, query);
}
driverContext = new DriverSelectorQueryContext(query, conf, drivers, mergeDriverConf);
userQuery = query;
@@ -178,7 +173,7 @@ public abstract class AbstractQueryContext implements Serializable {
public void estimateCostForDrivers() throws LensException {
Map<LensDriver, DriverEstimateRunnable> estimateRunnables = getDriverEstimateRunnables();
for (LensDriver driver : estimateRunnables.keySet()) {
- LOG.info("Running estimate for driver " + driver);
+ log.info("Running estimate for driver {}", driver);
estimateRunnables.get(driver).run();
}
}
@@ -258,7 +253,7 @@ public abstract class AbstractQueryContext implements Serializable {
.append(" Cause :")
.append(expMsg)
.toString();
- LOG.error("Setting driver cost failed for driver " + driver + " Cause: " + failureCause, e);
+ log.error("Setting driver cost failed for driver {} Cause: {}", driver, failureCause, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
index 3e7de17..7a2da99 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
@@ -28,22 +28,16 @@ import org.apache.lens.server.api.query.cost.QueryCost;
import org.apache.lens.server.api.util.LensUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import lombok.Getter;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class DriverSelectorQueryContext {
/**
- * The constant LOG
- */
- public static final Log LOG = LogFactory.getLog(DriverSelectorQueryContext.class);
-
-
- /**
* The selected driver.
*/
@Getter
@@ -200,7 +194,7 @@ public class DriverSelectorQueryContext {
driverQueryContext.setDriverQueryPlan(driver.explain(qctx));
succeededOnAtleastOneDriver = true;
} catch (Exception e) {
- LOG.error("Setting driver plan failed for driver " + driver, e);
+ log.error("Setting driver plan failed for driver {}", driver, e);
String expMsg = LensUtil.getCauseMessage(e);
driverQueryContext.setDriverQueryPlanGenerationError(e);
detailedFailureCause.append("\n Driver :").append(driver.getClass().getName());