You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/14 10:52:34 UTC
incubator-lens git commit: LENS-501 : Add cli command to print query
details (amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master 7586a83c8 -> cddfc844e
LENS-501 : Add cli command to print query details (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/cddfc844
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/cddfc844
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/cddfc844
Branch: refs/heads/master
Commit: cddfc844e8b729484f9551631e45a8f26304ff1f
Parents: 7586a83
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Apr 14 03:52:24 2015 -0500
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Apr 14 03:52:24 2015 -0500
----------------------------------------------------------------------
.../org/apache/lens/api/query/QueryStatus.java | 2 +-
.../lens/cli/commands/LensQueryCommands.java | 23 +++++++++++++++++++
.../apache/lens/cli/TestLensQueryCommands.java | 10 +++++---
.../java/org/apache/lens/client/LensClient.java | 8 +++++++
.../org/apache/lens/client/LensStatement.java | 6 ++---
.../org/apache/lens/ml/impl/LensMLImpl.java | 2 +-
.../apache/lens/ml/server/MLServiceImpl.java | 2 +-
.../java/org/apache/lens/rdd/LensRDDClient.java | 4 ++--
.../server/query/QueryExecutionServiceImpl.java | 8 +++----
.../org/apache/lens/server/LensTestUtil.java | 6 ++---
.../org/apache/lens/server/TestServerMode.java | 2 +-
.../apache/lens/server/TestServerRestart.java | 8 +++----
.../apache/lens/server/query/TestLensDAO.java | 2 +-
.../server/query/TestQueryEndEmailNotifier.java | 2 +-
.../lens/server/query/TestQueryService.java | 24 ++++++++++----------
.../lens/server/query/TestResultFormatting.java | 2 +-
16 files changed, 73 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-api/src/main/java/org/apache/lens/api/query/QueryStatus.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/query/QueryStatus.java b/lens-api/src/main/java/org/apache/lens/api/query/QueryStatus.java
index 1aa5822..f927375 100644
--- a/lens-api/src/main/java/org/apache/lens/api/query/QueryStatus.java
+++ b/lens-api/src/main/java/org/apache/lens/api/query/QueryStatus.java
@@ -177,7 +177,7 @@ public class QueryStatus implements Serializable {
return str.toString();
}
- public boolean isFinished() {
+ public boolean finished() {
return status.equals(Status.SUCCESSFUL) || status.equals(Status.FAILED) || status.equals(Status.CANCELED);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java b/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java
index 016e35e..920ba9c 100644
--- a/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java
+++ b/lens-cli/src/main/java/org/apache/lens/cli/commands/LensQueryCommands.java
@@ -18,6 +18,7 @@
*/
package org.apache.lens.cli.commands;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.UUID;
@@ -140,6 +141,28 @@ public class LensQueryCommands extends BaseLensCommand implements CommandMarker
}
/**
+ * Gets the query details.
+ *
+ * @param qh the qh
+ * @return the query
+ */
+ @CliCommand(value = "query details", help = "Get query details")
+ public String getDetails(
+ @CliOption(key = {"", "query"}, mandatory = true, help
+ = "<query-handle> for which details have to be fetched") String qh) {
+ LensQuery query = getClient().getQueryDetails(qh);
+ if (query == null) {
+ return "Unable to find query for " + qh;
+ }
+
+ try {
+ return formatJson(mapper.writer(pp).writeValueAsString(query));
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ /**
* Explain query.
*
* @param sql the sql
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java b/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
index a69c53f..a48734a 100644
--- a/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
+++ b/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
@@ -130,7 +130,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest {
String handle = qCom.executePreparedQuery(qh, true, "testPrepQuery2");
LOG.debug("Perpared query handle is " + handle);
- while (!client.getQueryStatus(handle).isFinished()) {
+ while (!client.getQueryStatus(handle).finished()) {
Thread.sleep(5000);
}
String status = qCom.getStatus(handle);
@@ -227,16 +227,20 @@ public class TestLensQueryCommands extends LensCliApplicationTest {
String[] resultSplits = result.split("\n");
// assert on the number of queries
Assert.assertEquals(String.valueOf(resultSplits.length - 1), resultSplits[resultSplits.length - 1].split(": ")[1]);
+ String details = qCom.getDetails(qh);
+ Assert.assertTrue(details.contains("driverQuery"), details);
// Check that query name searching is 'ilike'
String result2 = qCom.getAllQueries("", "query", "all", -1, Long.MAX_VALUE);
Assert.assertTrue(result2.contains(qh), result2);
- while (!client.getQueryStatus(qh).isFinished()) {
+ while (!client.getQueryStatus(qh).finished()) {
Thread.sleep(5000);
}
Assert.assertTrue(qCom.getStatus(qh).contains("Status : SUCCESSFUL"));
+ details = qCom.getDetails(qh);
+ Assert.assertTrue(details.contains("driverQuery"));
result = qCom.getQueryResults(qh);
Assert.assertTrue(result.contains("1\tfirst"));
@@ -357,7 +361,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest {
String query = "cube select id,name from test_dim";
try {
String qh = qCom.executeQuery(query, true, "testQuery");
- while (!client.getQueryStatus(qh).isFinished()) {
+ while (!client.getQueryStatus(qh).finished()) {
Thread.sleep(5000);
}
Assert.assertTrue(qCom.getStatus(qh).contains("Status : SUCCESSFUL"));
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/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 b5b4a90..449c8ec 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
@@ -153,10 +153,18 @@ public class LensClient {
return new LensStatement(conn).getQuery(query).getStatus();
}
+ public LensQuery getQueryDetails(QueryHandle handle) {
+ return new LensStatement(conn).getQuery(handle);
+ }
+
public QueryStatus getQueryStatus(String q) {
return getQueryStatus(QueryHandle.fromString(q));
}
+ public LensQuery getQueryDetails(String handle) {
+ return getQueryDetails(QueryHandle.fromString(handle));
+ }
+
public QueryPlan getQueryPlan(String q) {
return new LensStatement(conn).explainQuery(q);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensStatement.java b/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
index 1a050da..b19ccd1 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensStatement.java
@@ -185,7 +185,7 @@ public class LensStatement {
*/
private void waitForQueryToComplete(QueryHandle handle) {
query = getQuery(handle);
- while (!query.getStatus().isFinished()) {
+ while (!query.getStatus().finished()) {
query = getQuery(handle);
try {
Thread.sleep(connection.getLensConnectionParams().getQueryPollInterval());
@@ -437,7 +437,7 @@ public class LensStatement {
*/
public boolean kill(LensQuery query) {
- if (query.getStatus().isFinished()) {
+ if (query.getStatus().finished()) {
return false;
}
@@ -485,7 +485,7 @@ public class LensStatement {
}
public boolean isIdle() {
- return query == null || query.getStatus().isFinished();
+ return query == null || query.getStatus().finished();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
index f0c6e04..39617df 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/impl/LensMLImpl.java
@@ -657,7 +657,7 @@ public class LensMLImpl implements LensML {
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", sessionHandle).request().get(LensQuery.class);
stat = ctx.getStatus();
try {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/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 f3e8ec1..dc29aef 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
@@ -298,7 +298,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());
- while (!query.getStatus().isFinished()) {
+ while (!query.getStatus().finished()) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/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 cdcdec0..dcd3751 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
@@ -182,7 +182,7 @@ public class LensRDDClient {
*/
public boolean isReadyForRDD(QueryHandle queryHandle) throws LensException {
QueryStatus status = getClient().getQueryStatus(queryHandle);
- return status.isFinished();
+ return status.finished();
}
/**
@@ -204,7 +204,7 @@ public class LensRDDClient {
*/
public LensRDDResult getRDD(QueryHandle queryHandle) throws LensException {
QueryStatus status = getClient().getQueryStatus(queryHandle);
- if (!status.isFinished() && !status.isResultSetAvailable()) {
+ if (!status.finished() && !status.isResultSetAvailable()) {
throw new LensException(queryHandle.getHandleId() + " query not finished or result unavailable");
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/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 b44ce7e..cd1fbd8 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
@@ -664,7 +664,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu
synchronized (ctx) {
QueryStatus before = ctx.getStatus();
if (!ctx.getStatus().getStatus().equals(QueryStatus.Status.QUEUED) && !ctx.getDriverStatus().isFinished()
- && !ctx.getStatus().isFinished()) {
+ && !ctx.getStatus().finished()) {
LOG.info("Updating status for " + ctx.getQueryHandle());
try {
ctx.getSelectedDriver().updateStatus(ctx);
@@ -681,7 +681,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu
|| !ctx.isResultAvailableInDriver())) {
setSuccessState(ctx);
} else {
- if (ctx.getStatus().isFinished()) {
+ if (ctx.getStatus().finished()) {
updateFinishedQuery(ctx, before);
}
fireStatusChangeEvent(ctx, ctx.getStatus(), before);
@@ -1695,7 +1695,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu
} catch (InterruptedException e) {
LOG.info("Waiting thread interrupted");
}
- if (getQueryContext(sessionHandle, handle).getStatus().isFinished()) {
+ if (getQueryContext(sessionHandle, handle).getStatus().finished()) {
result.setResult(getResultset(handle).toQueryResult());
}
return result;
@@ -1830,7 +1830,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu
LOG.info("CancelQuery: " + sessionHandle.toString() + " query:" + queryHandle);
acquire(sessionHandle);
QueryContext ctx = getQueryContext(sessionHandle, queryHandle);
- if (ctx.getStatus().isFinished()) {
+ if (ctx.getStatus().finished()) {
return false;
}
synchronized (ctx) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
index 30f1cb0..5658d47 100644
--- a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
+++ b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
@@ -92,7 +92,7 @@ public final class LensTestUtil {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -142,7 +142,7 @@ public final class LensTestUtil {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -197,7 +197,7 @@ public final class LensTestUtil {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
index 4ca0b35..86bec3a 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
@@ -204,7 +204,7 @@ public class TestServerMode extends LensAllApplicationJerseyTest {
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = queryTarget.path(qhandle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
stat = ctx.getStatus();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
index a6927d2..b634701 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
@@ -188,7 +188,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
LOG.info("Polling query " + handle + " Status:" + stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
@@ -282,14 +282,14 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
LOG.info("Polling query " + handle + " Status:" + stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
}
- Assert.assertTrue(stat.isFinished());
+ Assert.assertTrue(stat.finished());
LOG.info("Previous query status: " + stat.getStatusMessage());
for (int i = 0; i < 5; i++) {
@@ -308,7 +308,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest {
// Poll for second query, this should finish successfully
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
LOG.info("Post restart polling query " + handle + " Status:" + stat);
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/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 f0358cb..36f9d77 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
@@ -128,7 +128,7 @@ public class TestLensDAO extends LensJerseyTest {
for (QueryHandle handle : persistedHandles) {
LensQuery query = service.getQuery(session, handle);
if (!handle.getHandleId().toString().equals(finishedHandle)) {
- Assert.assertTrue(query.getStatus().isFinished(), query.getQueryHandle() + " STATUS="
+ Assert.assertTrue(query.getStatus().finished(), query.getQueryHandle() + " STATUS="
+ query.getStatus().getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
index 5726602..ca1b10b 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
@@ -176,7 +176,7 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index 0ab68c7..ed4749f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -224,7 +224,7 @@ public class TestQueryService extends LensJerseyTest {
LensQuery ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request()
.get(LensQuery.class);
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
System.out.println("%% query " + ctx.getQueryHandle() + " status:" + stat);
@@ -308,7 +308,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
switch (stat.getStatus()) {
@@ -534,7 +534,7 @@ public class TestQueryService extends LensJerseyTest {
Assert.assertEquals(ctx1.getQueryName().toLowerCase(), "testquery1");
// wait till the query finishes
QueryStatus stat = ctx1.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx1 = target().path("queryapi/queries").path(handle1.toString()).queryParam("sessionid", lensSessionId)
.request().get(LensQuery.class);
stat = ctx1.getStatus();
@@ -548,7 +548,7 @@ public class TestQueryService extends LensJerseyTest {
Assert.assertEquals(ctx2.getQueryName().toLowerCase(), "testqueryname2");
// wait till the query finishes
stat = ctx2.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx2 = target().path("queryapi/queries").path(handle1.toString()).queryParam("sessionid", lensSessionId)
.request().get(LensQuery.class);
stat = ctx2.getStatus();
@@ -626,7 +626,7 @@ public class TestQueryService extends LensJerseyTest {
.request().get(LensQuery.class);
// wait till the query finishes
QueryStatus stat = ctx1.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx1 = target().path("queryapi/queries").path(handle1.toString()).queryParam("sessionid", lensSessionId)
.request().get(LensQuery.class);
stat = ctx1.getStatus();
@@ -638,7 +638,7 @@ public class TestQueryService extends LensJerseyTest {
.request().get(LensQuery.class);
// wait till the query finishes
stat = ctx2.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx2 = target().path("queryapi/queries").path(handle1.toString()).queryParam("sessionid", lensSessionId)
.request().get(LensQuery.class);
stat = ctx2.getStatus();
@@ -697,7 +697,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
switch (stat.getStatus()) {
@@ -760,7 +760,7 @@ public class TestQueryService extends LensJerseyTest {
ctx = target.path(handle3.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
// wait till the query finishes
stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle3.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -981,7 +981,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -1036,7 +1036,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(dropHandle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -1066,7 +1066,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
@@ -1091,7 +1091,7 @@ public class TestQueryService extends LensJerseyTest {
// wait till the query finishes
stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle2.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/cddfc844/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
index 0a4bb74..e18a90f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
@@ -219,7 +219,7 @@ public class TestResultFormatting extends LensJerseyTest {
.get(LensQuery.class);
// wait till the query finishes
QueryStatus stat = ctx.getStatus();
- while (!stat.isFinished()) {
+ while (!stat.finished()) {
ctx = target.path(handle.toString()).queryParam("sessionid", lensSessionId).request().get(LensQuery.class);
stat = ctx.getStatus();
Thread.sleep(1000);