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/10/16 14:49:14 UTC
lens git commit: LENS-817 : No need to persist metadata class
information in DB after LENS-576 fix
Repository: lens
Updated Branches:
refs/heads/master 9497c8367 -> f29c2f240
LENS-817 : No need to persist metadata class information in DB after LENS-576 fix
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/f29c2f24
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/f29c2f24
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/f29c2f24
Branch: refs/heads/master
Commit: f29c2f2401238531d624a2438dd3e7911ab92014
Parents: 9497c83
Author: Deepak Barr <de...@gmail.com>
Authored: Fri Oct 16 18:18:30 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Fri Oct 16 18:18:30 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/server/api/query/FinishedLensQuery.java | 7 -------
.../java/org/apache/lens/server/query/LensServerDAO.java | 8 ++++----
.../apache/lens/server/query/QueryExecutionServiceImpl.java | 1 -
.../test/java/org/apache/lens/server/query/TestLensDAO.java | 1 -
4 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/f29c2f24/lens-server-api/src/main/java/org/apache/lens/server/api/query/FinishedLensQuery.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/FinishedLensQuery.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/FinishedLensQuery.java
index 8308198..89053aa 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/FinishedLensQuery.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/FinishedLensQuery.java
@@ -152,13 +152,6 @@ public class FinishedLensQuery {
private long driverEndTime;
/**
- * The metadata class.
- */
- @Getter
- @Setter
- private String metadataClass;
-
- /**
* The query name.
*/
@Getter
http://git-wip-us.apache.org/repos/asf/lens/blob/f29c2f24/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java b/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java
index 8a2ac19..05bee9e 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java
@@ -85,7 +85,7 @@ public class LensServerDAO {
+ "userquery varchar(10000) not null," + "submitter varchar(255) not null," + "starttime bigint, "
+ "endtime bigint," + "result varchar(255)," + "status varchar(255), " + "metadata varchar(100000), "
+ "rows int, " + "filesize bigint, " + "errormessage varchar(10000), " + "driverstarttime bigint, "
- + "driverendtime bigint, " + "metadataclass varchar(10000), " + "driverclass varchar(10000), "
+ + "driverendtime bigint, " + "driverclass varchar(10000), "
+ "queryname varchar(255), " + "submissiontime bigint" + ")";
try {
QueryRunner runner = new QueryRunner(ds);
@@ -109,15 +109,15 @@ public class LensServerDAO {
Connection conn = null;
String sql = "insert into finished_queries (handle, userquery,submitter,"
+ "starttime,endtime,result,status,metadata,rows,filesize,"
- + "errormessage,driverstarttime,driverendtime, metadataclass, driverclass, queryname, submissiontime)"
- + " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ + "errormessage,driverstarttime,driverendtime, driverclass, queryname, submissiontime)"
+ + " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
try {
conn = getConnection();
QueryRunner runner = new QueryRunner();
runner.update(conn, sql, query.getHandle(), query.getUserQuery(), query.getSubmitter(), query.getStartTime(),
query.getEndTime(), query.getResult(), query.getStatus(), query.getMetadata(), query.getRows(),
query.getFileSize(), query.getErrorMessage(), query.getDriverStartTime(), query.getDriverEndTime(),
- query.getMetadataClass(), query.getDriverClass(), query.getQueryName(), query.getSubmissionTime());
+ query.getDriverClass(), query.getQueryName(), query.getSubmissionTime());
conn.commit();
} finally {
DbUtils.closeQuietly(conn);
http://git-wip-us.apache.org/repos/asf/lens/blob/f29c2f24/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
index d57812f..deb8572 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
@@ -906,7 +906,6 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
String outputPath = set.getOutputPath();
Long fileSize = ((PersistentResultSet) set).getFileSize();
Integer rows = set.size();
- finishedQuery.setMetadataClass(metadata.getClass().getName());
finishedQuery.setResult(outputPath);
finishedQuery.setMetadata(metadata.toJson());
finishedQuery.setRows(rows);
http://git-wip-us.apache.org/repos/asf/lens/blob/f29c2f24/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java b/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
index 708afe5..8c3e2a2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java
@@ -92,7 +92,6 @@ public class TestLensDAO extends LensJerseyTest {
log.info("@@@JSON {}" + jsonMetadata);
finishedLensQuery.setMetadata(MAPPER.writeValueAsString(jdbcRsMeta));
- finishedLensQuery.setMetadataClass(JDBCResultSet.JDBCResultSetMetadata.class.getName());
} catch (SQLException ex) {
log.error("Error creating result set ", ex);
} finally {