Repository: ambari Updated Branches: refs/heads/branch-2.4 90b0f3f22 -> e07faed8e
AMBARI-18042. Query execution takes a long time in hive view version1.5.0 (dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e07faed8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e07faed8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e07faed8 Branch: refs/heads/branch-2.4 Commit: e07faed8effa64c915ed4425f0c52bc5541f66c8 Parents: 90b0f3f Author: Dipayan Bhowmick <dipayan.bhowm...@gmail.com> Authored: Mon Aug 8 12:03:20 2016 +0530 Committer: Dipayan Bhowmick <dipayan.bhowm...@gmail.com> Committed: Mon Aug 8 19:44:03 2016 +0530 ---------------------------------------------------------------------- .../ambari/view/hive2/actor/JdbcConnector.java | 7 +++++++ .../jobs/viewJobs/JobResourceManager.java | 17 +---------------- 2 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e07faed8/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/JdbcConnector.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/JdbcConnector.java b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/JdbcConnector.java index 8d64c9b..0fcb800 100644 --- a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/JdbcConnector.java +++ b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/JdbcConnector.java @@ -86,6 +86,8 @@ public class JdbcConnector extends HiveActor { */ private static final long MAX_TERMINATION_INACTIVITY_INTERVAL = 10 * 60 * 1000; + private static final long MILLIS_IN_SECOND = 1000L; + private final Storage storage; /** @@ -420,6 +422,7 @@ public class JdbcConnector extends HiveActor { try { JobImpl job = storage.load(JobImpl.class, jobid); job.setStatus(status); + job.setDuration(getUpdatedDuration(job.getDateSubmitted())); storage.store(JobImpl.class, job); LOG.info("Stored job status for Job id: {} as '{}'", jobid, status); } catch (ItemNotFound itemNotFound) { @@ -427,6 +430,10 @@ public class JdbcConnector extends HiveActor { } } + private Long getUpdatedDuration(Long dateSubmitted) { + return (System.currentTimeMillis() / MILLIS_IN_SECOND) - (dateSubmitted / MILLIS_IN_SECOND); + } + private void checkInactivity() { LOG.debug("Inactivity check, executing status: {}", executing); http://git-wip-us.apache.org/repos/asf/ambari/blob/e07faed8/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/jobs/viewJobs/JobResourceManager.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/jobs/viewJobs/JobResourceManager.java b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/jobs/viewJobs/JobResourceManager.java index f91363f..781cec6 100644 --- a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/jobs/viewJobs/JobResourceManager.java +++ b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/jobs/viewJobs/JobResourceManager.java @@ -73,11 +73,7 @@ public class JobResourceManager extends PersonalCRUDResourceManager<Job> { @Override public Job read(Object id) throws ItemNotFound { - Job job = super.read(id); - JobController jobController = jobControllerFactory.createControllerForJob(job); - jobController.update(); - saveIfModified(jobController); - return job; + return super.read(id); } @Override @@ -94,15 +90,4 @@ public class JobResourceManager extends PersonalCRUDResourceManager<Job> { Job job = read(id); return jobControllerFactory.createControllerForJob(job); } - - /*public Cursor getJobResultsCursor(ExecuteJob job) { - try { - JobController jobController = jobControllerFactory.createControllerForJob(job); - return jobController.getResults(); - } catch (ItemNotFound itemNotFound) { - throw new NotFoundFormattedException("ExecuteJob results are expired", null); - } - }*/ - - //TODO: New implementation }