You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/08/11 14:20:25 UTC
[02/50] [abbrv] incubator-lens git commit: LENS-679 : Use slf4j in
api, regression, ml and client modules
LENS-679 : Use slf4j in api, regression, ml and client 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/90415a10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/90415a10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/90415a10
Branch: refs/heads/current-release-line
Commit: 90415a10db1284943e2b042fb2f81464beb8207d
Parents: 5e70bee
Author: Amareshwari Sriramadasu <am...@gmail.com>
Authored: Wed Jul 22 12:33:03 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Wed Jul 22 12:33:03 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/lens/client/LensClient.java | 47 +++++-----
.../lens/client/LensClientSingletonWrapper.java | 9 +-
.../org/apache/lens/client/LensConnection.java | 16 ++--
.../apache/lens/client/LensMetadataClient.java | 96 ++++++++++----------
.../apache/lens/client/LensMLJerseyClient.java | 10 +-
.../lens/ml/algo/spark/BaseSparkAlgo.java | 14 ++-
.../ml/algo/spark/ColumnFeatureFunction.java | 10 +-
.../apache/lens/ml/algo/spark/HiveTableRDD.java | 4 -
.../lens/ml/algo/spark/SparkMLDriver.java | 28 +++---
.../lens/ml/algo/spark/TableTrainingSpec.java | 20 ++--
.../java/org/apache/lens/ml/impl/HiveMLUDF.java | 12 +--
.../java/org/apache/lens/ml/impl/MLRunner.java | 15 ++-
.../java/org/apache/lens/ml/impl/MLTask.java | 21 ++---
.../org/apache/lens/ml/impl/ModelLoader.java | 24 +++--
.../apache/lens/ml/impl/TableTestingSpec.java | 17 ++--
.../apache/lens/ml/server/MLServiceImpl.java | 16 ++--
.../lens/ml/server/MLServiceResource.java | 14 ++-
.../java/org/apache/lens/rdd/LensRDDClient.java | 19 ++--
.../java/org/apache/lens/ml/ExampleUtils.java | 11 +--
.../java/org/apache/lens/ml/TestMLRunner.java | 3 -
lens-regression/pom.xml | 4 -
.../core/helpers/LensServerHelper.java | 10 +-
.../core/helpers/MetastoreHelper.java | 12 +--
.../regression/core/helpers/QueryHelper.java | 60 ++++++------
.../core/helpers/ServiceManagerHelper.java | 10 +-
.../regression/core/helpers/SessionHelper.java | 24 ++---
.../apache/lens/regression/util/AssertUtil.java | 7 --
.../org/apache/lens/regression/util/Util.java | 20 ++--
.../lens/regression/sanity/ITSmokeTest.java | 23 +++--
.../server/api/driver/MinQueryCostSelector.java | 2 -
.../api/metrics/MethodMetricsFactory.java | 9 +-
.../server/api/query/AbstractQueryContext.java | 15 +--
.../api/query/DriverSelectorQueryContext.java | 12 +--
33 files changed, 269 insertions(+), 345 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-client/src/main/java/org/apache/lens/client/LensClient.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensClient.java b/lens-client/src/main/java/org/apache/lens/client/LensClient.java
index d7df1ba..9ff2124 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensClient.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensClient.java
@@ -38,12 +38,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.google.common.collect.Maps;
+
import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class LensClient {
- private static final Log LOG = LogFactory.getLog(LensClient.class);
-
public static final String CLILOGGER = "cliLogger";
private static final String DEFAULT_PASSWORD = "";
private final LensClientConfig conf;
@@ -93,10 +94,10 @@ public class LensClient {
}
public LensAPIResult<QueryHandle> executeQueryAsynch(String sql, String queryName) throws LensAPIException {
- LOG.debug("Executing query " + sql);
+ log.debug("Executing query {}", sql);
LensAPIResult<QueryHandle> lensAPIResult = statement.execute(sql, false, queryName);
LensQuery query = statement.getQuery();
- LOG.debug("Adding query to statementMap " + query.getQueryHandle());
+ log.debug("Adding query to statementMap {}", query.getQueryHandle());
statementMap.put(query.getQueryHandle(), statement);
return lensAPIResult;
}
@@ -130,7 +131,7 @@ public class LensClient {
}
public LensClientResultSetWithStats getResults(String sql, String queryName) throws LensAPIException {
- LOG.debug("Executing query " + sql);
+ log.debug("Executing query {}", sql);
statement.execute(sql, true, queryName);
return getResultsFromStatement(statement);
}
@@ -213,7 +214,7 @@ public class LensClient {
public QueryResult getResults(QueryHandle query) {
QueryStatus status = getLensStatement(query).getStatus();
if (!status.isResultSetAvailable()) {
- LOG.debug("Current status of the query is " + status);
+ log.debug("Current status of the query is {}", status);
throw new IllegalStateException("Resultset for the query "
+ query + " is not available, its current status is " + status);
}
@@ -226,76 +227,76 @@ public class LensClient {
private void connectToLensServer() {
- LOG.debug("Connecting to lens server " + new LensConnectionParams(conf));
+ log.debug("Connecting to lens server {}", new LensConnectionParams(conf));
connection = new LensConnection(new LensConnectionParams(conf));
connection.open(password);
- LOG.debug("Successfully connected to server " + connection);
+ log.debug("Successfully connected to server {}", connection);
}
public List<String> getAllDatabases() {
- LOG.debug("Getting all database");
+ log.debug("Getting all database");
return mc.getAlldatabases();
}
public List<String> getAllNativeTables() {
- LOG.debug("Getting all native tables");
+ log.debug("Getting all native tables");
return mc.getAllNativeTables();
}
public List<String> getAllFactTables() {
- LOG.debug("Getting all fact table");
+ log.debug("Getting all fact table");
return mc.getAllFactTables();
}
public List<String> getAllFactTables(String cubeName) {
- LOG.debug("Getting all fact table");
+ log.debug("Getting all fact table");
return mc.getAllFactTables(cubeName);
}
public List<String> getAllDimensionTables() {
- LOG.debug("Getting all dimension table");
+ log.debug("Getting all dimension table");
return mc.getAllDimensionTables();
}
public List<String> getAllDimensionTables(String dimensionName) {
- LOG.debug("Getting all dimension table");
+ log.debug("Getting all dimension table");
return mc.getAllDimensionTables(dimensionName);
}
public List<String> getAllCubes() {
- LOG.debug("Getting all cubes in database");
+ log.debug("Getting all cubes in database");
return mc.getAllCubes();
}
public List<String> getAllDimensions() {
- LOG.debug("Getting all dimensions in database");
+ log.debug("Getting all dimensions in database");
return mc.getAllDimensions();
}
public String getCurrentDatabae() {
- LOG.debug("Getting current database");
+ log.debug("Getting current database");
return mc.getCurrentDatabase();
}
public boolean setDatabase(String database) {
- LOG.debug("Set the database to " + database);
+ log.debug("Set the database to {}", database);
APIResult result = mc.setDatabase(database);
return result.getStatus() == APIResult.Status.SUCCEEDED;
}
public APIResult dropDatabase(String database, boolean cascade) {
- LOG.debug("Dropping database " + database + ", cascade: " + cascade);
+ log.debug("Dropping database {}, cascade: {}", database, cascade);
APIResult result = mc.dropDatabase(database, cascade);
- LOG.debug("Return status of dropping " + database + " result " + result);
+ log.debug("Return status of dropping {} result {}", database, result);
return result;
}
public APIResult createDatabase(String database, boolean ignoreIfExists) {
- LOG.debug("Creating database " + database + " ignore " + ignoreIfExists);
+ log.debug("Creating database {} ignore {}", database, ignoreIfExists);
APIResult result = mc.createDatabase(database, ignoreIfExists);
- LOG.debug("Create database result " + result);
+ log.debug("Create database result {}", result);
return result;
}
@@ -312,7 +313,7 @@ public class LensClient {
}
public APIResult closeConnection() {
- LOG.debug("Closing lens connection: " + new LensConnectionParams(conf));
+ log.debug("Closing lens connection: {}", new LensConnectionParams(conf));
return this.connection.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
index 14a0690..4629559 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
@@ -20,12 +20,12 @@ package org.apache.lens.client;
import org.apache.lens.client.exceptions.LensClientServerConnectionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import lombok.extern.slf4j.Slf4j;
/**
* The Enum LensClientSingletonWrapper.
*/
+@Slf4j
public class LensClientSingletonWrapper {
/** The instance. */
@@ -37,9 +37,6 @@ public class LensClientSingletonWrapper {
return InstanceHolder.INSTANCE;
}
- /** The log. */
- private static final Log LOG = LogFactory.getLog(LensClientSingletonWrapper.class);
-
/** The client. */
private LensClient client;
@@ -58,7 +55,7 @@ public class LensClientSingletonWrapper {
* @param e the e
*/
public void explainFailedAttempt(LensClientServerConnectionException e) {
- LOG.error("failed login attempt", e);
+ log.error("failed login attempt", e);
switch (e.getErrorCode()) {
case 401:
System.console().printf("username/password combination incorrect.\n");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensConnection.java b/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
index 61e16f7..10819ea 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensConnection.java
@@ -35,24 +35,20 @@ import org.apache.lens.api.LensSessionHandle;
import org.apache.lens.api.StringList;
import org.apache.lens.client.exceptions.LensClientServerConnectionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
/**
* Top level client connection class which is used to connect to a lens server.
*/
+@Slf4j
public class LensConnection {
- /** The Constant LOG. */
- private static final Log LOG = LogFactory.getLog(LensConnection.class);
-
/** The params. */
private final LensConnectionParams params;
@@ -148,7 +144,7 @@ public class LensConnection {
final LensSessionHandle handle = response.readEntity(LensSessionHandle.class);
if (handle != null) {
sessionHandle = handle;
- LOG.debug("Created a new session " + sessionHandle.getPublicId());
+ log.debug("Created a new session {}", sessionHandle.getPublicId());
} else {
throw new IllegalStateException("Unable to connect to lens " + "server with following paramters" + params);
}
@@ -158,7 +154,7 @@ public class LensConnection {
}
}
- LOG.debug("Successfully switched to database " + params.getDbName());
+ log.debug("Successfully switched to database {}", params.getDbName());
open.set(true);
return sessionHandle;
@@ -189,7 +185,7 @@ public class LensConnection {
if (result.getStatus() != APIResult.Status.SUCCEEDED) {
throw new IllegalStateException("Unable to close lens connection " + "with params " + params);
}
- LOG.debug("Lens connection closed.");
+ log.debug("Lens connection closed.");
return result;
}
@@ -258,7 +254,7 @@ public class LensConnection {
MediaType.APPLICATION_XML_TYPE));
mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("key").build(), key));
mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("value").build(), value));
- LOG.debug("Setting connection params " + key + "=" + value);
+ log.debug("Setting connection params {}={}", key, value);
APIResult result = target.path("params").request()
.put(Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE), APIResult.class);
return result;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java b/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
index dba13ca..4bec6ad 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensMetadataClient.java
@@ -42,18 +42,16 @@ import org.apache.lens.api.DateTime;
import org.apache.lens.api.StringList;
import org.apache.lens.api.metastore.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.glassfish.jersey.media.multipart.*;
import org.xml.sax.SAXException;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
-public class LensMetadataClient {
+import lombok.extern.slf4j.Slf4j;
- private static final Log LOG = LogFactory.getLog(LensMetadataClient.class);
+@Slf4j
+public class LensMetadataClient {
private final LensConnection connection;
private final LensConnectionParams params;
@@ -66,13 +64,13 @@ public class LensMetadataClient {
ClassLoader classLoader = LensMetadataClient.class.getClassLoader();
SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
URI uri = classLoader.getResource("cube-0.1.xsd").toURI();
- LOG.info("URI for cube schema: " + uri.toString());
+ log.info("URI for cube schema: {}", uri.toString());
Schema schema = sf.newSchema(uri.toURL());
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
JAXB_UNMARSHALLER = jaxbContext.createUnmarshaller();
JAXB_UNMARSHALLER.setSchema(schema);
} catch (JAXBException | URISyntaxException | MalformedURLException | SAXException e) {
- LOG.error("Could not initialize JAXBContext. ", e);
+ log.error("Could not initialize JAXBContext. ", e);
throw new RuntimeException("Could not initialize JAXBContext. ", e);
}
}
@@ -207,10 +205,10 @@ public class LensMetadataClient {
try {
return createCube(this.<XCube>readFromXML(cubeSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -228,10 +226,10 @@ public class LensMetadataClient {
try {
return updateCube(cubeName, this.<XCube>readFromXML(cubeSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -301,10 +299,10 @@ public class LensMetadataClient {
try {
return createDimension(this.<XDimension>readFromXML(dimSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -322,10 +320,10 @@ public class LensMetadataClient {
try {
return updateDimension(dimName, this.<XDimension>readFromXML(dimSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -370,10 +368,10 @@ public class LensMetadataClient {
try {
return createNewStorage(this.<XStorage>readFromXML(storage));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -400,10 +398,10 @@ public class LensMetadataClient {
try {
return updateStorage(storageName, this.<XStorage>readFromXML(storage));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -492,10 +490,10 @@ public class LensMetadataClient {
try {
return createFactTable(this.<XFactTable>readFromXML(factSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -514,10 +512,10 @@ public class LensMetadataClient {
}
return Joiner.on("\n").skipNulls().join(content);
} catch (IOException e) {
- LOG.error("IO Error reading content ", e);
+ log.error("IO Error reading content ", e);
throw new IllegalStateException(e);
} catch (URISyntaxException e) {
- LOG.error("URI Error reading content ", e);
+ log.error("URI Error reading content ", e);
throw new IllegalStateException(e);
}
}
@@ -536,10 +534,10 @@ public class LensMetadataClient {
try {
return updateFactTable(factName, this.<XFactTable>readFromXML(table));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -589,10 +587,10 @@ public class LensMetadataClient {
try {
return addStorageToFactTable(factname, this.<XStorageTableElement>readFromXML(storageSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -706,10 +704,10 @@ public class LensMetadataClient {
try {
return createDimensionTable(this.<XDimensionTable>readFromXML(tableXml));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -731,10 +729,10 @@ public class LensMetadataClient {
dimensionTable.setTableName(dimTblName);
return updateDimensionTable(dimensionTable);
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
@@ -787,10 +785,10 @@ public class LensMetadataClient {
try {
return addStorageToDimTable(dimTblName, this.<XStorageTableElement>readFromXML(table));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -888,10 +886,10 @@ public class LensMetadataClient {
try {
return addPartitionToDimensionTable(dimTblName, storage, (XPartition) readFromXML(partitionSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -912,10 +910,10 @@ public class LensMetadataClient {
try {
return addPartitionsToDimensionTable(dimTblName, storage, (XPartitionList) readFromXML(partitionsSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -936,10 +934,10 @@ public class LensMetadataClient {
try {
return addPartitionToFactTable(fact, storage, (XPartition) readFromXML(partitionSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -960,10 +958,10 @@ public class LensMetadataClient {
try {
return addPartitionsToFactTable(fact, storage, (XPartitionList) readFromXML(partitionsSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -983,10 +981,10 @@ public class LensMetadataClient {
try {
return updatePartitionOfDimensionTable(dimTblName, storage, (XPartition) readFromXML(partitionSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -1007,10 +1005,10 @@ public class LensMetadataClient {
try {
return updatePartitionsOfDimensionTable(dimTblName, storage, (XPartitionList) readFromXML(partitionsSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -1031,10 +1029,10 @@ public class LensMetadataClient {
try {
return updatePartitionOfFactTable(fact, storage, (XPartition) readFromXML(partitionSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
@@ -1055,10 +1053,10 @@ public class LensMetadataClient {
try {
return updatePartitionsOfFactTable(fact, storage, (XPartitionList) readFromXML(partitionsSpec));
} catch (JAXBException e) {
- LOG.info("Unmarshalling error:", e);
+ log.error("Unmarshalling error:", e);
return new APIResult(Status.FAILED, "Unmarshalling failed");
} catch (IOException e) {
- LOG.info("File error:", e);
+ log.error("File error:", e);
return new APIResult(Status.FAILED, "File not found");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
index c68dd12..875e692 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/client/LensMLJerseyClient.java
@@ -34,8 +34,6 @@ import org.apache.lens.api.StringList;
import org.apache.lens.ml.api.ModelMetadata;
import org.apache.lens.ml.api.TestReport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
@@ -43,6 +41,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import lombok.extern.slf4j.Slf4j;
+
/*
* Client code to invoke server side ML API
*/
@@ -50,6 +50,7 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
/**
* The Class LensMLJerseyClient.
*/
+@Slf4j
public class LensMLJerseyClient {
/** The Constant LENS_ML_RESOURCE_PATH. */
public static final String LENS_ML_RESOURCE_PATH = "lens.ml.resource.path";
@@ -57,9 +58,6 @@ public class LensMLJerseyClient {
/** The Constant DEFAULT_ML_RESOURCE_PATH. */
public static final String DEFAULT_ML_RESOURCE_PATH = "ml";
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(LensMLJerseyClient.class);
-
/** The connection. */
private final LensConnection connection;
@@ -257,7 +255,7 @@ public class LensMLJerseyClient {
try {
connection.close();
} catch (Exception exc) {
- LOG.error("Error closing connection", exc);
+ log.error("Error closing connection", exc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
index 86cab38..3936693 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/BaseSparkAlgo.java
@@ -28,21 +28,19 @@ import org.apache.lens.ml.algo.api.MLAlgo;
import org.apache.lens.ml.algo.api.MLModel;
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.spark.api.java.JavaSparkContext;
import org.apache.spark.mllib.regression.LabeledPoint;
import org.apache.spark.rdd.RDD;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class BaseSparkAlgo.
*/
+@Slf4j
public abstract class BaseSparkAlgo implements MLAlgo {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(BaseSparkAlgo.class);
-
/** The name. */
private final String name;
@@ -126,7 +124,7 @@ public abstract class BaseSparkAlgo implements MLAlgo {
}
TableTrainingSpec spec = builder.build();
- LOG.info("Training " + " with " + features.size() + " features");
+ log.info("Training with {} features", features.size());
spec.createRDDs(sparkContext);
@@ -208,7 +206,7 @@ public abstract class BaseSparkAlgo implements MLAlgo {
try {
return Double.parseDouble(params.get(param));
} catch (NumberFormatException nfe) {
- LOG.warn("Couldn't parse param value: " + param + " as double.");
+ log.warn("Couldn't parse param value: {} as double.", param);
}
}
return defaultVal;
@@ -226,7 +224,7 @@ public abstract class BaseSparkAlgo implements MLAlgo {
try {
return Integer.parseInt(params.get(param));
} catch (NumberFormatException nfe) {
- LOG.warn("Couldn't parse param value: " + param + " as integer.");
+ log.warn("Couldn't parse param value: {} as integer.", param);
}
}
return defaultVal;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/ColumnFeatureFunction.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/ColumnFeatureFunction.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/ColumnFeatureFunction.java
index d75efc0..900792e 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/ColumnFeatureFunction.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/ColumnFeatureFunction.java
@@ -20,22 +20,22 @@ package org.apache.lens.ml.algo.spark;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hive.hcatalog.data.HCatRecord;
-import org.apache.log4j.Logger;
import org.apache.spark.mllib.linalg.Vectors;
import org.apache.spark.mllib.regression.LabeledPoint;
import com.google.common.base.Preconditions;
+
+import lombok.extern.slf4j.Slf4j;
+
import scala.Tuple2;
/**
* A feature function that directly maps an HCatRecord to a feature vector. Each column becomes a feature in the vector,
* with the value of the feature obtained using the value mapper for that column
*/
+@Slf4j
public class ColumnFeatureFunction extends FeatureFunction {
- /** The Constant LOG. */
- public static final Logger LOG = Logger.getLogger(ColumnFeatureFunction.class);
-
/** The feature value mappers. */
private final FeatureValueMapper[] featureValueMappers;
@@ -85,7 +85,7 @@ public class ColumnFeatureFunction extends FeatureFunction {
HCatRecord record = tuple._2();
if (record == null) {
- LOG.info("@@@ Null record");
+ log.info("@@@ Null record");
return defaultLabeledPoint;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/HiveTableRDD.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/HiveTableRDD.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/HiveTableRDD.java
index 4960e1e..fd5651e 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/HiveTableRDD.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/HiveTableRDD.java
@@ -20,8 +20,6 @@ package org.apache.lens.ml.algo.spark;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hive.hcatalog.data.HCatRecord;
@@ -36,8 +34,6 @@ public final class HiveTableRDD {
private HiveTableRDD() {
}
- public static final Log LOG = LogFactory.getLog(HiveTableRDD.class);
-
/**
* Creates the hive table rdd.
*
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
index 21ed87d..9ac62ce 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/SparkMLDriver.java
@@ -34,19 +34,17 @@ import org.apache.lens.ml.algo.spark.svm.SVMAlgo;
import org.apache.lens.server.api.error.LensException;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class SparkMLDriver.
*/
+@Slf4j
public class SparkMLDriver implements MLDriver {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(SparkMLDriver.class);
-
/** The owns spark context. */
private boolean ownsSparkContext = true;
@@ -120,7 +118,7 @@ public class SparkMLDriver implements MLDriver {
((BaseSparkAlgo) algo).setSparkContext(sparkContext);
}
} catch (LensException exc) {
- LOG.error("Error creating algo object", exc);
+ log.error("Error creating algo object", exc);
}
return algo;
}
@@ -178,8 +176,8 @@ public class SparkMLDriver implements MLDriver {
sparkConf.set("spark.yarn.jar", yarnJars);
}
- LOG.info("Spark home is set to " + sparkConf.get("spark.home"));
- LOG.info("spark.yarn.jar is set to " + yarnJars);
+ log.info("Spark home is set to {}", sparkConf.get("spark.home"));
+ log.info("spark.yarn.jar is set to {}", yarnJars);
}
sparkConf.setAppName("lens-ml");
@@ -206,7 +204,7 @@ public class SparkMLDriver implements MLDriver {
throw new LensException("HIVE_HOME is not set");
}
- LOG.info("HIVE_HOME at " + hiveLocation);
+ log.info("HIVE_HOME at {}", hiveLocation);
File hiveLibDir = new File(hiveLocation, "lib");
FilenameFilter jarFileFilter = new FilenameFilter() {
@@ -220,7 +218,7 @@ public class SparkMLDriver implements MLDriver {
// Add hive jars
for (File jarFile : hiveLibDir.listFiles(jarFileFilter)) {
jarFiles.add(jarFile.getAbsolutePath());
- LOG.info("Adding HIVE jar " + jarFile.getAbsolutePath());
+ log.info("Adding HIVE jar {}", jarFile.getAbsolutePath());
sparkContext.addJar(jarFile.getAbsolutePath());
}
@@ -228,20 +226,20 @@ public class SparkMLDriver implements MLDriver {
File hcatalogDir = new File(hiveLocation + "/hcatalog/share/hcatalog");
for (File jarFile : hcatalogDir.listFiles(jarFileFilter)) {
jarFiles.add(jarFile.getAbsolutePath());
- LOG.info("Adding HCATALOG jar " + jarFile.getAbsolutePath());
+ log.info("Adding HCATALOG jar {}", jarFile.getAbsolutePath());
sparkContext.addJar(jarFile.getAbsolutePath());
}
// Add the current jar
String[] lensSparkLibJars = JavaSparkContext.jarOfClass(SparkMLDriver.class);
for (String lensSparkJar : lensSparkLibJars) {
- LOG.info("Adding Lens JAR " + lensSparkJar);
+ log.info("Adding Lens JAR {}", lensSparkJar);
sparkContext.addJar(lensSparkJar);
}
}
isStarted = true;
- LOG.info("Created Spark context for app: '" + sparkContext.appName() + "', Spark master: " + sparkContext.master());
+ log.info("Created Spark context for app: '{}', Spark master: {}", sparkContext.appName(), sparkContext.master());
}
/*
@@ -252,14 +250,14 @@ public class SparkMLDriver implements MLDriver {
@Override
public void stop() throws LensException {
if (!isStarted) {
- LOG.warn("Spark driver was not started");
+ log.warn("Spark driver was not started");
return;
}
isStarted = false;
if (ownsSparkContext) {
sparkContext.stop();
}
- LOG.info("Stopped spark context " + this);
+ log.info("Stopped spark context {}", this);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/TableTrainingSpec.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/TableTrainingSpec.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/TableTrainingSpec.java
index 897aacb..5b7c48b 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/TableTrainingSpec.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/algo/spark/TableTrainingSpec.java
@@ -25,8 +25,6 @@ import java.util.List;
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.hadoop.io.WritableComparable;
import org.apache.hive.hcatalog.data.HCatRecord;
@@ -41,18 +39,18 @@ import org.apache.spark.mllib.regression.LabeledPoint;
import org.apache.spark.rdd.RDD;
import com.google.common.base.Preconditions;
+
import lombok.Getter;
import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
/**
* The Class TableTrainingSpec.
*/
@ToString
+@Slf4j
public class TableTrainingSpec implements Serializable {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TableTrainingSpec.class);
-
/** The training rdd. */
@Getter
private transient RDD<LabeledPoint> trainingRDD;
@@ -324,11 +322,11 @@ public class TableTrainingSpec implements Serializable {
HCatSchema tableSchema = HCatInputFormat.getTableSchema(conf);
columns = tableSchema.getFields();
} catch (IOException exc) {
- LOG.error("Error getting table info " + toString(), exc);
+ log.error("Error getting table info {}", toString(), exc);
return false;
}
- LOG.info(table + " columns " + columns.toString());
+ log.info("{} columns {}", table, columns.toString());
boolean valid = false;
if (columns != null && !columns.isEmpty()) {
@@ -388,7 +386,7 @@ public class TableTrainingSpec implements Serializable {
throw new LensException("Table spec not valid: " + toString());
}
- LOG.info("Creating RDDs with spec " + toString());
+ log.info("Creating RDDs with spec {}", toString());
// Get the RDD for table
JavaPairRDD<WritableComparable, HCatRecord> tableRDD;
@@ -412,7 +410,7 @@ public class TableTrainingSpec implements Serializable {
if (splitTraining) {
// We have to split the RDD between a training RDD and a testing RDD
- LOG.info("Splitting RDD for table " + database + "." + table + " with split fraction " + trainingFraction);
+ log.info("Splitting RDD for table {}.{} with split fraction {}", database, table, trainingFraction);
JavaRDD<DataSample> sampledRDD = labeledRDD.map(new Function<LabeledPoint, DataSample>() {
@Override
public DataSample call(LabeledPoint v1) throws Exception {
@@ -423,11 +421,11 @@ public class TableTrainingSpec implements Serializable {
trainingRDD = sampledRDD.filter(new TrainingFilter(trainingFraction)).map(new GetLabeledPoint()).rdd();
testingRDD = sampledRDD.filter(new TestingFilter(trainingFraction)).map(new GetLabeledPoint()).rdd();
} else {
- LOG.info("Using same RDD for train and test");
+ log.info("Using same RDD for train and test");
trainingRDD = labeledRDD.rdd();
testingRDD = trainingRDD;
}
- LOG.info("Generated RDDs");
+ log.info("Generated RDDs");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/HiveMLUDF.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/HiveMLUDF.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/HiveMLUDF.java
index 60a4008..2addb20 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/HiveMLUDF.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/HiveMLUDF.java
@@ -22,8 +22,6 @@ import java.io.IOException;
import org.apache.lens.ml.algo.api.MLModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.MapredContext;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
@@ -38,12 +36,15 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn
import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
import org.apache.hadoop.mapred.JobConf;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Generic UDF to laod ML Models saved in HDFS and apply the model on list of columns passed as argument.
*/
@Description(name = "predict",
value = "_FUNC_(algorithm, modelID, features...) - Run prediction algorithm with given "
+ "algorithm name, model ID and input feature columns")
+@Slf4j
public final class HiveMLUDF extends GenericUDF {
private HiveMLUDF() {
}
@@ -51,9 +52,6 @@ public final class HiveMLUDF extends GenericUDF {
/** The Constant UDF_NAME. */
public static final String UDF_NAME = "predict";
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(HiveMLUDF.class);
-
/** The conf. */
private JobConf conf;
@@ -80,7 +78,7 @@ public final class HiveMLUDF extends GenericUDF {
throw new UDFArgumentLengthException("Algo name, model ID and at least one feature should be passed to "
+ UDF_NAME);
}
- LOG.info(UDF_NAME + " initialized");
+ log.info("{} initialized", UDF_NAME);
return PrimitiveObjectInspectorFactory.javaDoubleObjectInspector;
}
@@ -133,6 +131,6 @@ public final class HiveMLUDF extends GenericUDF {
conf = context.getJobConf();
soi = PrimitiveObjectInspectorFactory.javaStringObjectInspector;
doi = LazyPrimitiveObjectInspectorFactory.LAZY_DOUBLE_OBJECT_INSPECTOR;
- LOG.info(UDF_NAME + " configured. Model base dir path: " + conf.get(ModelLoader.MODEL_PATH_BASE_DIR));
+ log.info("{} configured. Model base dir path: {}", UDF_NAME, conf.get(ModelLoader.MODEL_PATH_BASE_DIR));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLRunner.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLRunner.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLRunner.java
index e5ec272..91840e9 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLRunner.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLRunner.java
@@ -26,8 +26,6 @@ import org.apache.lens.client.LensClient;
import org.apache.lens.client.LensClientConfig;
import org.apache.lens.client.LensMLClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.TableType;
@@ -39,9 +37,10 @@ import org.apache.hadoop.hive.ql.plan.AddPartitionDesc;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.mapred.TextInputFormat;
-public class MLRunner {
+import lombok.extern.slf4j.Slf4j;
- private static final Log LOG = LogFactory.getLog(MLRunner.class);
+@Slf4j
+public class MLRunner {
private LensMLClient mlClient;
private String algoName;
@@ -90,7 +89,7 @@ public class MLRunner {
}
public MLTask train() throws Exception {
- LOG.info("Starting train & eval");
+ log.info("Starting train & eval");
createTable(trainTable, trainFile);
createTable(testTable, testFile);
@@ -103,7 +102,7 @@ public class MLRunner {
taskBuilder.addFeatureColumn(feature);
}
MLTask task = taskBuilder.build();
- LOG.info("Created task " + task.toString());
+ log.info("Created task {}", task.toString());
task.run();
return task;
}
@@ -141,7 +140,7 @@ public class MLRunner {
Hive.get(conf).dropTable(database, tableName, false, true);
Hive.get(conf).createTable(tbl, true);
- LOG.info("Created table " + tableName);
+ log.info("Created table {}", tableName);
// Add partition for the data file
AddPartitionDesc partitionDesc = new AddPartitionDesc(database, tableName,
@@ -150,7 +149,7 @@ public class MLRunner {
partSpec.put("dummy_partition_col", "dummy_val");
partitionDesc.addPartition(partSpec, partDir.toUri().toString());
Hive.get(conf).createPartitions(partitionDesc);
- LOG.info(tableName + ": Added partition " + partDir.toUri().toString());
+ log.info("{}: Added partition {}", tableName, partDir.toUri().toString());
}
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLTask.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLTask.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLTask.java
index 2867b90..a3695ba 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLTask.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/MLTask.java
@@ -24,19 +24,18 @@ import org.apache.lens.client.LensMLClient;
import org.apache.lens.ml.api.LensML;
import org.apache.lens.ml.api.MLTestReport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import lombok.Getter;
import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
/**
* Run a complete cycle of train and test (evaluation) for an ML algorithm
*/
@ToString
+@Slf4j
public class MLTask implements Runnable {
- private static final Log LOG = LogFactory.getLog(MLTask.class);
public enum State {
RUNNING, SUCCESSFUL, FAILED
@@ -200,14 +199,14 @@ public class MLTask implements Runnable {
@Override
public void run() {
taskState = State.RUNNING;
- LOG.info("Starting " + taskID);
+ log.info("Starting {}", taskID);
try {
runTask();
taskState = State.SUCCESSFUL;
- LOG.info("Complete " + taskID);
+ log.info("Complete {}", taskID);
} catch (Exception e) {
taskState = State.FAILED;
- LOG.info("Error running task " + taskID, e);
+ log.info("Error running task {}", taskID, e);
}
}
@@ -221,20 +220,20 @@ public class MLTask implements Runnable {
if (mlClient != null) {
// Connect to a remote Lens server
ml = mlClient;
- LOG.info("Working in client mode. Lens session handle " + mlClient.getSessionHandle().getPublicId());
+ log.info("Working in client mode. Lens session handle {}", mlClient.getSessionHandle().getPublicId());
} else {
// In server mode session handle has to be passed by the user as a request parameter
ml = MLUtils.getMLService();
- LOG.info("Working in Lens server");
+ log.info("Working in Lens server");
}
String[] algoArgs = buildTrainingArgs();
- LOG.info("Starting task " + taskID + " algo args: " + Arrays.toString(algoArgs));
+ log.info("Starting task {} algo args: {} ", taskID, Arrays.toString(algoArgs));
modelID = ml.train(trainingTable, algorithm, algoArgs);
printModelMetadata(taskID, modelID);
- LOG.info("Starting test " + taskID);
+ log.info("Starting test {}", taskID);
testTable = (testTable != null) ? testTable : trainingTable;
MLTestReport testReport = ml.testModel(mlClient.getSessionHandle(), testTable, algorithm, modelID, outputTable);
reportID = testReport.getReportID();
@@ -244,7 +243,7 @@ public class MLTask implements Runnable {
// Save task metadata to DB
private void saveTask() {
- LOG.info("Saving task details to DB");
+ log.info("Saving task details to DB");
}
private void printTestReport(String exampleID, MLTestReport testReport) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/ModelLoader.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/ModelLoader.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/ModelLoader.java
index c0e7953..4fc45d3 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/ModelLoader.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/ModelLoader.java
@@ -29,8 +29,6 @@ import org.apache.lens.ml.algo.api.MLModel;
import org.apache.lens.ml.api.MLTestReport;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -39,9 +37,12 @@ import org.apache.hadoop.hive.conf.HiveConf;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Load ML models from a FS location.
*/
+@Slf4j
public final class ModelLoader {
private ModelLoader() {
}
@@ -52,9 +53,6 @@ public final class ModelLoader {
/** The Constant MODEL_PATH_BASE_DIR_DEFAULT. */
public static final String MODEL_PATH_BASE_DIR_DEFAULT = "file:///tmp";
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(ModelLoader.class);
-
/** The Constant TEST_REPORT_BASE_DIR. */
public static final String TEST_REPORT_BASE_DIR = "lens.ml.test.basedir";
@@ -97,8 +95,8 @@ public final class ModelLoader {
*/
public static MLModel loadModel(Configuration conf, String algorithm, String modelID) throws IOException {
final Path modelPath = getModelLocation(conf, algorithm, modelID);
- LOG.info("Loading model for algorithm: " + algorithm + " modelID: " + modelID + " At path: "
- + modelPath.toUri().toString());
+ log.info("Loading model for algorithm: {} modelID: {} At path: {}", algorithm, modelID,
+ modelPath.toUri().toString());
try {
return modelCache.get(modelPath, new Callable<MLModel>() {
@Override
@@ -112,7 +110,7 @@ public final class ModelLoader {
try {
ois = new ObjectInputStream(fs.open(modelPath));
MLModel model = (MLModel) ois.readObject();
- LOG.info("Loaded model " + model.getId() + " from location " + modelPath);
+ log.info("Loaded model {} from location {}", model.getId(), modelPath);
return model;
} catch (ClassNotFoundException e) {
throw new IOException(e);
@@ -158,14 +156,14 @@ public final class ModelLoader {
FileSystem fs = reportDir.getFileSystem(conf);
if (!fs.exists(reportDir)) {
- LOG.info("Creating test report dir " + reportDir.toUri().toString());
+ log.info("Creating test report dir {}", reportDir.toUri().toString());
fs.mkdirs(reportDir);
}
Path algoDir = new Path(reportDir, report.getAlgorithm());
if (!fs.exists(algoDir)) {
- LOG.info("Creating algorithm report dir " + algoDir.toUri().toString());
+ log.info("Creating algorithm report dir {}", algoDir.toUri().toString());
fs.mkdirs(algoDir);
}
@@ -177,12 +175,12 @@ public final class ModelLoader {
reportOutputStream.writeObject(report);
reportOutputStream.flush();
} catch (IOException ioexc) {
- LOG.error("Error saving test report " + report.getReportID(), ioexc);
+ log.error("Error saving test report {}", report.getReportID(), ioexc);
throw ioexc;
} finally {
IOUtils.closeQuietly(reportOutputStream);
}
- LOG.info("Saved report " + report.getReportID() + " at location " + reportSaveLocation.toUri());
+ log.info("Saved report {} at location {}", report.getReportID(), reportSaveLocation.toUri());
}
/**
@@ -204,7 +202,7 @@ public final class ModelLoader {
reportStream = new ObjectInputStream(fs.open(reportLocation));
report = (MLTestReport) reportStream.readObject();
} catch (IOException ioex) {
- LOG.error("Error reading report " + reportLocation, ioex);
+ log.error("Error reading report {}", reportLocation, ioex);
} catch (ClassNotFoundException e) {
throw new IOException(e);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/TableTestingSpec.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/TableTestingSpec.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/TableTestingSpec.java
index 34b2a3f..470c977 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/TableTestingSpec.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/TableTestingSpec.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.ql.metadata.Hive;
@@ -32,15 +30,14 @@ import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.metadata.Table;
import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
/**
* Table specification for running test on a table.
*/
+@Slf4j
public class TableTestingSpec {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(TableTestingSpec.class);
-
/** The db. */
private String db;
@@ -256,7 +253,7 @@ public class TableTestingSpec {
Table outTbl = metastoreClient.getTable(db == null ? "default" : db, outputTable, false);
outputTableExists = (outTbl != null);
} catch (HiveException exc) {
- LOG.error("Error getting table info " + toString(), exc);
+ log.error("Error getting table info {}", toString(), exc);
return false;
}
@@ -267,22 +264,22 @@ public class TableTestingSpec {
}
if (!testTableColumns.containsAll(featureColumns)) {
- LOG.info("Invalid feature columns: " + featureColumns + ". Actual columns in table:" + testTableColumns);
+ log.info("Invalid feature columns: {}. Actual columns in table:{}", featureColumns, testTableColumns);
return false;
}
if (!testTableColumns.contains(labelColumn)) {
- LOG.info("Invalid label column: " + labelColumn + ". Actual columns in table:" + testTableColumns);
+ log.info("Invalid label column: {}. Actual columns in table:{}", labelColumn, testTableColumns);
return false;
}
if (StringUtils.isBlank(outputColumn)) {
- LOG.info("Output column is required");
+ log.info("Output column is required");
return false;
}
if (StringUtils.isBlank(outputTable)) {
- LOG.info("Output table is required");
+ log.info("Output table is required");
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
index de9c711..ff046c7 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceImpl.java
@@ -38,19 +38,17 @@ import org.apache.lens.server.api.ServiceProviderFactory;
import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.query.QueryExecutionService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hive.service.CompositeService;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class MLServiceImpl.
*/
+@Slf4j
public class MLServiceImpl extends CompositeService implements MLService {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(LensMLImpl.class);
-
/** The ml. */
private LensMLImpl ml;
@@ -156,7 +154,7 @@ public class MLServiceImpl extends CompositeService implements MLService {
ml.init(hiveConf);
super.init(hiveConf);
serviceProviderFactory = getServiceProviderFactory(hiveConf);
- LOG.info("Inited ML service");
+ log.info("Inited ML service");
}
/*
@@ -168,7 +166,7 @@ public class MLServiceImpl extends CompositeService implements MLService {
public synchronized void start() {
ml.start();
super.start();
- LOG.info("Started ML service");
+ log.info("Started ML service");
}
/*
@@ -180,7 +178,7 @@ public class MLServiceImpl extends CompositeService implements MLService {
public synchronized void stop() {
ml.stop();
super.stop();
- LOG.info("Stopped ML service");
+ log.info("Stopped ML service");
}
/**
@@ -294,7 +292,7 @@ public class MLServiceImpl extends CompositeService implements MLService {
// Wait for test query to complete
LensQuery query = queryService.getQuery(sessionHandle, testQueryHandle);
- LOG.info("Submitted query " + testQueryHandle.getHandleId());
+ log.info("Submitted query {}", testQueryHandle.getHandleId());
while (!query.getStatus().finished()) {
try {
Thread.sleep(500);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
index 77a6c40..ac2957d 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
@@ -41,22 +41,20 @@ import org.apache.lens.server.api.ServiceProviderFactory;
import org.apache.lens.server.api.error.LensException;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import lombok.extern.slf4j.Slf4j;
+
/**
* Machine Learning service.
*/
@Path("/ml")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+@Slf4j
public class MLServiceResource {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(MLServiceResource.class);
-
/** The ml service. */
MLService mlService;
@@ -284,9 +282,9 @@ public class MLServiceResource {
algoArgs.add(values.get(0));
}
}
- LOG.info("Training table " + table + " with algo " + algorithm + " params=" + algoArgs.toString());
+ log.info("Training table {} with algo {} params={}", table, algorithm, algoArgs.toString());
String modelId = getMlService().train(table, algorithm, algoArgs.toArray(new String[]{}));
- LOG.info("Done training " + table + " modelid = " + modelId);
+ log.info("Done training {} modelid = {}", table, modelId);
return modelId;
}
@@ -300,7 +298,7 @@ public class MLServiceResource {
@Produces(MediaType.TEXT_PLAIN)
public Response clearModelCache() {
ModelLoader.clearCache();
- LOG.info("Cleared model cache");
+ log.info("Cleared model cache");
return Response.ok("Cleared cache", MediaType.TEXT_PLAIN_TYPE).build();
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java b/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
index fc4164f..b4f43ec 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
@@ -32,8 +32,6 @@ import org.apache.lens.client.exceptions.LensAPIException;
import org.apache.lens.ml.algo.spark.HiveTableRDD;
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.hadoop.hive.metastore.TableType;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
@@ -50,6 +48,8 @@ import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.rdd.RDD;
+import lombok.extern.slf4j.Slf4j;
+
/**
* <p>
* Create RDD from a Lens query. User can poll returned query handle with isReadyForRDD() until the RDD is ready to be
@@ -76,10 +76,9 @@ import org.apache.spark.rdd.RDD;
* JavaRDD<ResultRow> rdd = client.createLensRDD("SELECT msr1 from TEST_CUBE WHERE ...", conf);
* </pre>
*/
+@Slf4j
public class LensRDDClient {
- /** The Constant LOG. */
- public static final Log LOG = LogFactory.getLog(LensRDDClient.class);
// Default input format for table created from Lens result set
/** The Constant INPUT_FORMAT. */
private static final String INPUT_FORMAT = TextInputFormat.class.getName();
@@ -231,7 +230,7 @@ public class LensRDDClient {
try {
rdd = HiveTableRDD.createHiveTableRDD(sparkContext, HIVE_CONF, "default", tempTableName, TEMP_TABLE_PART_COL
+ "='" + TEMP_TABLE_PART_VAL + "'");
- LOG.info("Created RDD " + rdd.name() + " for table " + tempTableName);
+ log.info("Created RDD {} for table {}", rdd.name(), tempTableName);
} catch (IOException e) {
throw new LensException("Error creating RDD for table " + tempTableName, e);
}
@@ -268,7 +267,7 @@ public class LensRDDClient {
tbl.getPartCols().add(new FieldSchema(TEMP_TABLE_PART_COL, "string", "default"));
hiveClient.createTable(tbl);
- LOG.info("Table " + tableName + " created");
+ log.info("Table {} created", tableName);
// Add partition to the table
AddPartitionDesc partitionDesc = new AddPartitionDesc("default", tableName, false);
@@ -276,7 +275,7 @@ public class LensRDDClient {
partSpec.put(TEMP_TABLE_PART_COL, TEMP_TABLE_PART_VAL);
partitionDesc.addPartition(partSpec, dataLocation);
hiveClient.createPartitions(partitionDesc);
- LOG.info("Created partition in " + tableName + " for data in " + dataLocation);
+ log.info("Created partition in {} for data in {}", tableName, dataLocation);
return tableName;
}
@@ -306,7 +305,7 @@ public class LensRDDClient {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- LOG.warn("Interrupted while waiting for query", e);
+ log.warn("Interrupted while waiting for query", e);
break;
}
}
@@ -369,7 +368,7 @@ public class LensRDDClient {
JavaPairRDD<WritableComparable, HCatRecord> javaPairRDD = HiveTableRDD.createHiveTableRDD(sparkContext,
HIVE_CONF, "default", tempTableName, TEMP_TABLE_PART_COL + "='" + TEMP_TABLE_PART_VAL + "'");
resultRDD = javaPairRDD.map(new HCatRecordToObjectListMapper()).rdd();
- LOG.info("Created RDD " + resultRDD.name() + " for table " + tempTableName);
+ log.info("Created RDD {} for table {}", resultRDD.name(), tempTableName);
} catch (IOException e) {
throw new LensException("Error creating RDD for table " + tempTableName, e);
}
@@ -391,7 +390,7 @@ public class LensRDDClient {
try {
hiveClient = Hive.get(HIVE_CONF);
hiveClient.dropTable("default." + tempTableName);
- LOG.info("Dropped temp table " + tempTableName);
+ log.info("Dropped temp table {}", tempTableName);
} catch (HiveException e) {
throw new LensException(e);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/test/java/org/apache/lens/ml/ExampleUtils.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/test/java/org/apache/lens/ml/ExampleUtils.java b/lens-ml-lib/src/test/java/org/apache/lens/ml/ExampleUtils.java
index 9fe1ea0..ac3a55e 100644
--- a/lens-ml-lib/src/test/java/org/apache/lens/ml/ExampleUtils.java
+++ b/lens-ml-lib/src/test/java/org/apache/lens/ml/ExampleUtils.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.TableType;
@@ -36,15 +34,16 @@ import org.apache.hadoop.hive.ql.plan.AddPartitionDesc;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.mapred.TextInputFormat;
+import lombok.extern.slf4j.Slf4j;
+
/**
* The Class ExampleUtils.
*/
+@Slf4j
public final class ExampleUtils {
private ExampleUtils() {
}
- private static final Log LOG = LogFactory.getLog(ExampleUtils.class);
-
/**
* Creates the example table.
*
@@ -88,7 +87,7 @@ public final class ExampleUtils {
tbl.setPartCols(partCols);
Hive.get(conf).createTable(tbl, false);
- LOG.info("Created table " + tableName);
+ log.info("Created table {}", tableName);
// Add partition for the data file
AddPartitionDesc partitionDesc = new AddPartitionDesc(database, tableName, false);
@@ -96,6 +95,6 @@ public final class ExampleUtils {
partSpec.put("dummy_partition_col", "dummy_val");
partitionDesc.addPartition(partSpec, partDir.toUri().toString());
Hive.get(conf).createPartitions(partitionDesc);
- LOG.info(tableName + ": Added partition " + partDir.toUri().toString());
+ log.info("{}: Added partition {}", tableName, partDir.toUri().toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLRunner.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLRunner.java b/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLRunner.java
index 7f6413b..67e3379 100644
--- a/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLRunner.java
+++ b/lens-ml-lib/src/test/java/org/apache/lens/ml/TestMLRunner.java
@@ -35,8 +35,6 @@ import org.apache.lens.server.metastore.MetastoreResource;
import org.apache.lens.server.query.QueryServiceResource;
import org.apache.lens.server.session.SessionResource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.ql.metadata.Hive;
@@ -51,7 +49,6 @@ import org.testng.annotations.Test;
@Test
public class TestMLRunner extends LensJerseyTest {
- private static final Log LOG = LogFactory.getLog(TestMLRunner.class);
private static final String TEST_DB = TestMLRunner.class.getSimpleName();
private LensMLClient mlClient;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 66ddbb0..cfbdc0a 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -44,10 +44,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/LensServerHelper.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/LensServerHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/LensServerHelper.java
index ad67d7d..8b41dba 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/LensServerHelper.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/LensServerHelper.java
@@ -30,15 +30,13 @@ 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 com.jcraft.jsch.JSchException;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class LensServerHelper extends ServiceManagerHelper {
- private static Logger logger = Logger.getLogger(LensServerHelper.class);
-
private WebTarget servLens = ServiceManagerHelper.getServerLens();
private String sessionHandleString = ServiceManagerHelper.getSessionHandle();
@@ -60,9 +58,9 @@ public class LensServerHelper extends ServiceManagerHelper {
Response response = this.exec("get", "", servLens, null, null);
while (response == null && counter < 40) {
Thread.sleep(5000);
- logger.info("Waiting for Lens server to come up ");
+ log.info("Waiting for Lens server to come up ");
response = this.exec("get", "", servLens, null, null);
- logger.info(response);
+ log.info("Response:{}", response);
counter++;
}
AssertUtil.assertSucceededResponse(response);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/MetastoreHelper.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/MetastoreHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/MetastoreHelper.java
index 7fd3c47..aff0e8e 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/MetastoreHelper.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/MetastoreHelper.java
@@ -32,15 +32,11 @@ import org.apache.lens.regression.core.type.MapBuilder;
import org.apache.lens.regression.util.AssertUtil;
import org.apache.lens.server.api.error.LensException;
-import org.apache.log4j.Logger;
-
-
-
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public class MetastoreHelper extends ServiceManagerHelper {
- private static Logger logger = Logger.getLogger(MetastoreHelper.class);
-
private WebTarget servLens = ServiceManagerHelper.getServerLens();
private String sessionHandleString = ServiceManagerHelper.getSessionHandle();
@@ -66,11 +62,11 @@ public class MetastoreHelper extends ServiceManagerHelper {
response = this.exec("get", MetastoreURL.METASTORE_DATABASES_CURRENT_URL, servLens, null, query);
String responseString = response.readEntity(String.class);
AssertUtil.assertSucceededResponse(response);
- logger.info(responseString.trim());
+ log.info("Response: {}", responseString.trim());
if (!responseString.trim().equals(currentDBName)) {
throw new LensException("Could not set database");
}
- logger.info("Set Current database to " + currentDBName);
+ log.info("Set Current database to {}", currentDBName);
}
public void setCurrentDatabase(String currentDBName) throws JAXBException, LensException {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/QueryHelper.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/QueryHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/QueryHelper.java
index 5d58ef2..70cad28 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/QueryHelper.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/QueryHelper.java
@@ -40,16 +40,14 @@ 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 org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import lombok.extern.slf4j.Slf4j;
-
+@Slf4j
public class QueryHelper extends ServiceManagerHelper {
- private static Logger logger = Logger.getLogger(QueryHelper.class);
private WebTarget servLens = ServiceManagerHelper.getServerLens();
private String sessionHandleString = ServiceManagerHelper.getSessionHandle();
@@ -83,13 +81,13 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
String queryHandleString = response.readEntity(String.class);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
LensAPIResult successResponse = (LensAPIResult) Util.getObject(queryHandleString, LensAPIResult.class);
QueryHandle queryHandle = (QueryHandle) successResponse.getData();
if (queryHandle == null) {
throw new LensException("Query Execute Failed");
}
- logger.info("Query Handle : " + queryHandle);
+ log.info("Query Handle : {}", queryHandle);
return queryHandle;
}
@@ -138,13 +136,13 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
String queryHandleString = response.readEntity(String.class);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
LensAPIResult successResponse = (LensAPIResult) Util.getObject(queryHandleString, LensAPIResult.class);
QueryHandleWithResultSet queryHandleWithResultSet = (QueryHandleWithResultSet) successResponse.getData();
if (queryHandleWithResultSet==null) {
throw new LensException("Query Execute Failed");
}
- logger.info("Query Handle with ResultSet : " + queryHandleWithResultSet);
+ log.info("Query Handle with ResultSet : {}", queryHandleWithResultSet);
return queryHandleWithResultSet;
}
@@ -200,7 +198,7 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
String queryHandleString = response.readEntity(String.class);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
LensAPIResult successResponse = (LensAPIResult) Util.getObject(queryHandleString, LensAPIResult.class);
QueryHandle queryHandle = (QueryHandle) successResponse.getData();
return queryHandle;
@@ -228,7 +226,7 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
String queryPlanString = response.readEntity(String.class);
- logger.info(queryPlanString);
+ log.info("QueryPlan String:{}", queryPlanString);
LensAPIResult successResponse = (LensAPIResult) Util.getObject(queryPlanString, LensAPIResult.class);
QueryPlan queryPlan = (QueryPlan) successResponse.getData();
return queryPlan;
@@ -265,7 +263,7 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
String queryCostString = response.readEntity(String.class);
- logger.info(queryCostString);
+ log.info("QueryCost String:{}", queryCostString);
LensAPIResult successResponse = (LensAPIResult) Util.getObject(queryCostString, LensAPIResult.class);
QueryCostTO queryCostTO = (QueryCostTO) successResponse.getData();
if (queryCostTO == null) {
@@ -306,7 +304,7 @@ public class QueryHelper extends ServiceManagerHelper {
.exec("post", "/queryapi/preparedqueries", servLens, null, null, MediaType.MULTIPART_FORM_DATA_TYPE,
MediaType.APPLICATION_XML, formData.getForm());
String queryPlanString = response.readEntity(String.class);
- logger.info(queryPlanString);
+ log.info("QueryPlan String:{}", queryPlanString);
QueryPlan queryPlan = (QueryPlan) Util.getObject(queryPlanString, QueryPlan.class);
return queryPlan;
}
@@ -341,9 +339,9 @@ public class QueryHelper extends ServiceManagerHelper {
Response response = this
.exec("get", QueryURL.QUERY_URL + "/" + queryHandle.toString() + "/resultset", servLens, null, query);
AssertUtil.assertSucceededResponse(response);
- logger.info(response);
+ log.info("Response {}", response);
String queryResultString = response.readEntity(String.class);
- logger.info(queryResultString);
+ log.info("QueryResult String:{}", queryResultString);
QueryResult queryResult = (QueryResult) Util.getObject(queryResultString, QueryResult.class);
return queryResult;
}
@@ -370,9 +368,9 @@ public class QueryHelper extends ServiceManagerHelper {
Response response = this
.exec("get", QueryURL.QUERY_URL + "/" + queryHandle.toString() + "/httpresultset", servLens, null, null);
AssertUtil.assertSucceededResponse(response);
- logger.info(response);
+ log.info("Response {}", response);
String queryResultString = response.readEntity(String.class);
- logger.info(queryResultString);
+ log.info("QueryResult String:{}", queryResultString);
QueryResult queryResult = (QueryResult) Util.getObject(queryResultString, QueryResult.class);
return queryResult;
}
@@ -397,7 +395,7 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.MULTIPART_FORM_DATA_TYPE, MediaType.APPLICATION_XML, formData.getForm());
String queryHandleString = response.readEntity(String.class);
AssertUtil.assertSucceededResponse(response);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
QueryHandle handle = (QueryHandle) Util.getObject(queryHandleString, QueryHandle.class);
return handle;
}
@@ -438,7 +436,7 @@ public class QueryHelper extends ServiceManagerHelper {
MediaType.MULTIPART_FORM_DATA_TYPE, MediaType.APPLICATION_XML, formData.getForm());
String queryHandleString = response.readEntity(String.class);
AssertUtil.assertSucceededResponse(response);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
QueryHandleWithResultSet handle = (QueryHandleWithResultSet) Util
.getObject(queryHandleString, QueryHandleWithResultSet.class);
return handle;
@@ -483,7 +481,7 @@ public class QueryHelper extends ServiceManagerHelper {
.exec("post", "/queryapi/preparedqueries", servLens, null, null, MediaType.MULTIPART_FORM_DATA_TYPE,
MediaType.APPLICATION_XML, formData.getForm());
String queryHandleString = response.readEntity(String.class);
- logger.info(queryHandleString);
+ log.info("QueryHandle String:{}", queryHandleString);
AssertUtil.assertSucceededResponse(response);
QueryPrepareHandle queryHandle = (QueryPrepareHandle) Util.getObject(queryHandleString, QueryPrepareHandle.class);
return queryHandle;
@@ -517,7 +515,7 @@ public class QueryHelper extends ServiceManagerHelper {
MapBuilder query = new MapBuilder("sessionid", sessionHandleString);
Response response = this
.exec("delete", QueryURL.PREPAREDQUERY_URL + "/" + queryPreparedHandle.toString(), servLens, null, query);
- logger.info("Response : " + response);
+ log.info("Response : {}" + response);
AssertUtil.assertSucceededResponse(response);
}
@@ -552,9 +550,9 @@ public class QueryHelper extends ServiceManagerHelper {
queryList.put("toDate", toDate);
}
Response response = this.sendQuery("get", QueryURL.PREPAREDQUERY_URL, queryList);
- logger.info("Response : " + response);
+ log.info("Response : {}" + response);
String responseString = response.readEntity(String.class);
- logger.info(responseString);
+ log.info("Response String:{}", responseString);
PrepareQueryHandles result = (PrepareQueryHandles) Util.getObject(responseString, PrepareQueryHandles.class);
List<QueryPrepareHandle> list = result.getQueryHandles();
return list;
@@ -606,7 +604,7 @@ public class QueryHelper extends ServiceManagerHelper {
}
Response response = this.exec("delete", QueryURL.PREPAREDQUERY_URL, servLens, null, query);
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceededResponse(response);
}
@@ -677,7 +675,7 @@ public class QueryHelper extends ServiceManagerHelper {
queryList.put("toDate", toDate);
}
Response response = this.sendQuery("get", QueryURL.QUERY_URL, queryList);
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
String responseString = response.readEntity(String.class);
QueryHandles result = (QueryHandles) Util.getObject(responseString, QueryHandles.class);
List<QueryHandle> list = result.getQueryHandles();
@@ -723,12 +721,12 @@ public class QueryHelper extends ServiceManagerHelper {
String responseString = response.readEntity(String.class);
LensQuery lensQuery = (LensQuery) Util.getObject(responseString, LensQuery.class);
while (!lensQuery.getStatus().finished()) {
+ log.info("Waiting...");
Thread.sleep(1000);
- logger.info("Waiting...");
response = this.exec("get", QueryURL.QUERY_URL + "/" + queryHandle.toString(), servLens, null, query);
lensQuery = (LensQuery) Util.getObject(response.readEntity(String.class), LensQuery.class);
}
- logger.info(lensQuery.getStatus().getStatusMessage());
+ log.info("QueryStatus message:{}", lensQuery.getStatus().getStatusMessage());
return lensQuery;
}
@@ -749,7 +747,7 @@ public class QueryHelper extends ServiceManagerHelper {
JAXBException, InterruptedException, InstantiationException, IllegalAccessException, LensException {
QueryStatus queryStatus = getQueryStatus(sessionHandleString, queryHandle);
while (queryStatus.getStatus() == QueryStatus.Status.QUEUED) {
- logger.info("Waiting for Query to be in Running Phase");
+ log.info("Waiting for Query to be in Running Phase");
Thread.sleep(1000);
queryStatus = getQueryStatus(sessionHandleString, queryHandle);
}
@@ -773,11 +771,11 @@ public class QueryHelper extends ServiceManagerHelper {
JAXBException, InstantiationException, IllegalAccessException, LensException {
MapBuilder query = new MapBuilder("sessionid", sessionHandleString);
Response response = this.exec("get", QueryURL.QUERY_URL + "/" + queryHandle.toString(), servLens, null, query);
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceededResponse(response);
LensQuery lensQuery = (LensQuery) Util.getObject(response.readEntity(String.class), LensQuery.class);
QueryStatus qStatus = lensQuery.getStatus();
- logger.info("Query Status : " + qStatus);
+ log.info("Query Status : {}", qStatus);
return qStatus;
}
@@ -797,7 +795,7 @@ public class QueryHelper extends ServiceManagerHelper {
JAXBException, LensException {
MapBuilder query = new MapBuilder("sessionid", sessionHandleString);
Response response = this.exec("delete", QueryURL.QUERY_URL + "/" + queryHandle.toString(), servLens, null, query);
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceededResponse(response);
}
@@ -841,7 +839,7 @@ public class QueryHelper extends ServiceManagerHelper {
}
Response response = this.exec("delete", QueryURL.QUERY_URL, servLens, null, query);
- logger.info("Response : " + response);
+ log.info("Response : {}", response);
AssertUtil.assertSucceededResponse(response);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/90415a10/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ServiceManagerHelper.java
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ServiceManagerHelper.java b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ServiceManagerHelper.java
index 2aecbfd..b14b00b 100644
--- a/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ServiceManagerHelper.java
+++ b/lens-regression/src/main/java/org/apache/lens/regression/core/helpers/ServiceManagerHelper.java
@@ -40,12 +40,12 @@ 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 org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
public abstract class ServiceManagerHelper {
private static final String LENS_BASE_URL = "lens.baseurl";
@@ -69,8 +69,6 @@ public abstract class ServiceManagerHelper {
protected String serverHdfsUrl;
protected String currentDB;
- private Logger logger = Logger.getLogger(ServiceManagerHelper.class);
-
public ServiceManagerHelper(String envFileName) {
Properties prop = Util.getPropertiesObj(envFileName);
this.baseUrl = prop.getProperty(LENS_BASE_URL);
@@ -153,7 +151,7 @@ public abstract class ServiceManagerHelper {
MediaType.MULTIPART_FORM_DATA_TYPE, MediaType.APPLICATION_XML, formData.getForm());
AssertUtil.assertSucceededResponse(response);
sessionHandleString = response.readEntity(String.class);
- logger.info("Session Handle String" + sessionHandleString);
+ log.info("Session Handle String:{}", sessionHandleString);
return sessionHandleString;
}
@@ -174,7 +172,7 @@ public abstract class ServiceManagerHelper {
if (result.getMessage() == null) {
throw new LensException("Status message is null");
}
- logger.info("Closed Session : " + sessionHandleString);
+ log.info("Closed Session : {}", sessionHandleString);
}
public <T> Response exec(String functionName, String path, WebTarget service, FormDataMultiPart headers,