diff --git a/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java b/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java index 703e99715713a54437ca1b2dbf5dfce432d32ee4..bf6cb9174568cf13e73390ab4296143742e6ef7c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java @@ -65,7 +65,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public static class TaskDisplay { - private Integer returnVal; //if set, determines that task is complete. + private Integer returnValue; //if set, determines that task is complete. private String errorMsg; private Long beginTime; @@ -95,12 +95,12 @@ public TaskDisplay(Task task) { } @JsonIgnore public synchronized String getStatus() { - if (returnVal == null) { + if (returnValue == null) { return "Running"; - } else if (returnVal == 0) { + } else if (returnValue == 0) { return "Success, ReturnVal 0"; } else { - return "Failure, ReturnVal " + String.valueOf(returnVal); + return "Failure, ReturnVal " + String.valueOf(returnValue); } } @@ -116,7 +116,7 @@ public synchronized Long getElapsedTime() { } public synchronized Integer getReturnValue() { - return returnVal; + return returnValue; } public synchronized String getErrorMsg() { @@ -186,7 +186,7 @@ public synchronized void setStatusMessage(String statusMessage) { public synchronized void setTaskResult(String taskId, TaskResult result) { TaskDisplay taskDisplay = tasks.get(taskId); if (taskDisplay != null) { - taskDisplay.returnVal = result.getExitVal(); + taskDisplay.returnValue = result.getExitVal(); if (result.getTaskError() != null) { taskDisplay.errorMsg = result.getTaskError().toString(); } diff --git a/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java b/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java index fb8ee4cd8a5d65d134bc7686c7e1a1e73008de95..17d45ecae97938914b6b3df39d3e133e42170c0c 100644 --- a/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java +++ b/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java @@ -666,6 +666,9 @@ public void testTaskStatus() throws Exception { if (OperationState.CANCELED == state || state == OperationState.CLOSED || state == OperationState.FINISHED || state == OperationState.ERROR) { + for (QueryDisplay.TaskDisplay display: taskStatuses) { + assertNotNull(display.getReturnValue()); + } break; } Thread.sleep(1000);