Merge pull request #94 from sreekanth-r/grill-cli
Adding QueryHandle to Retrived Query, Changing fetch result logic
diff --git a/grill-client/src/main/java/com/inmobi/grill/client/GrillClient.java b/grill-client/src/main/java/com/inmobi/grill/client/GrillClient.java
index 4f50fb7..1e7a3ca 100644
--- a/grill-client/src/main/java/com/inmobi/grill/client/GrillClient.java
+++ b/grill-client/src/main/java/com/inmobi/grill/client/GrillClient.java
@@ -87,9 +87,10 @@
}
private GrillClientResultSetWithStats getResultsFromStatement(GrillStatement statement) {
- if(statement.getStatus().getStatus()
- == QueryStatus.Status.FAILED) {
- throw new IllegalStateException(statement.getStatus().getStatusMessage() + " cause:" + statement.getStatus().getErrorMessage());
+ QueryStatus.Status status = statement.getStatus().getStatus();
+ if(status != QueryStatus.Status.SUCCESSFUL) {
+ throw new IllegalStateException(statement.getStatus().getStatusMessage()
+ + " cause:" + statement.getStatus().getErrorMessage());
}
GrillClientResultSet result = null;
if (statement.getStatus().isResultSetAvailable()) {
diff --git a/grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java b/grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java
index 039790a..466a9e3 100644
--- a/grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java
+++ b/grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java
@@ -918,11 +918,12 @@
}
QueryContext finishedCtx = new QueryContext(
query.getUserQuery(), query.getSubmitter(), conf);
+ finishedCtx.setQueryHandle(queryHandle);
finishedCtx.setEndTime(query.getEndTime());
finishedCtx.setStatusSkippingTransitionTest(new QueryStatus(0.0,
QueryStatus.Status.valueOf(query.getStatus()),
query.getErrorMessage() == null ? "" : query.getErrorMessage(),
- query.getResult() == null,
+ query.getResult() != null,
null,
null));
finishedCtx.getDriverStatus().setDriverStartTime(query.getDriverStartTime());
