Repository: lens Updated Branches: refs/heads/master e26ee5a71 -> d1c58cbcf
LENS-1022 : Reduce time for TestLensQueryCommands Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d1c58cbc Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d1c58cbc Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d1c58cbc Branch: refs/heads/master Commit: d1c58cbcf755321ae72d0fb1d9e9994e95f9f189 Parents: e26ee5a Author: Amareshwari Sriramadasu <amareshw...@apache.org> Authored: Wed Apr 27 18:18:14 2016 +0530 Committer: Amareshwari Sriramadasu <amareshw...@apache.org> Committed: Wed Apr 27 18:18:14 2016 +0530 ---------------------------------------------------------------------- .../org/apache/lens/cli/TestLensQueryCommands.java | 16 ++++++++-------- .../lens/server/api/query/FinishedLensQuery.java | 2 +- .../lens/server/query/TestResultFormatting.java | 4 +++- lens-server/src/test/resources/lens-site.xml | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/d1c58cbc/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 dbb5e9d..1dd2ffe 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 @@ -175,10 +175,10 @@ public class TestLensQueryCommands extends LensCliApplicationTest { int chkCount = 0; while (!qCom.getAllQueries("SUCCESSFUL", null, "all", null, -1, Long.MAX_VALUE).contains( "Total number of queries: " + (noOfSuccQueriesSoFar + 1))) { - Thread.sleep(2000); + Thread.sleep(100); chkCount++; - if (chkCount > 30) { - fail("Unable to get successful status for query even after 30 checks"); + if (chkCount > 100) { + fail("Unable to get successful status for query even after 100 checks"); } } if (closeConn) { @@ -215,7 +215,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest { String handle = qCom.executePreparedQuery(qh, true, "testPrepQuery2"); log.debug("Perpared query handle is " + handle); while (!qCom.getClient().getQueryStatus(handle).finished()) { - Thread.sleep(5000); + Thread.sleep(100); } String status = qCom.getStatus(handle); log.debug("Prepared Query Status is " + status); @@ -225,8 +225,8 @@ public class TestLensQueryCommands extends LensCliApplicationTest { result = qCom.getQueryResults(handle, null, true); log.debug("Prepared Query Result is " + result); assertTrue(result.contains("1\tfirst")); - //Wait for query to purge. Purger runs every second - Thread.sleep(3000); + //Wait for query to purge. Purger runs every 100 millis + Thread.sleep(300); //Fetch again. Should not get resultset result = qCom.getQueryResults(handle, null, true); log.debug("Prepared Query Result is " + result); @@ -335,7 +335,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest { String details = qCom.getDetails(null); assertTrue(details.contains("Driver Query:")); } - Thread.sleep(1000); + Thread.sleep(100); queryStatus = qCom.getClient().getQueryStatus(qh); } @@ -521,7 +521,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest { String query = "cube select id,name from test_dim"; String qh = qCom.executeQuery(query, true, "testQuery"); while (!qCom.getClient().getQueryStatus(qh).finished()) { - Thread.sleep(5000); + Thread.sleep(100); } assertTrue(qCom.getStatus(qh).contains("Status: SUCCESSFUL")); http://git-wip-us.apache.org/repos/asf/lens/blob/d1c58cbc/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 e1ce415..1d56757 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 @@ -225,7 +225,7 @@ public class FinishedLensQuery { qctx.setLaunchTime(this.startTime); qctx.setEndTime(getEndTime()); qctx.setStatusSkippingTransitionTest(new QueryStatus(0.0, null, QueryStatus.Status.valueOf(getStatus()), - getErrorMessage() == null ? "" : getErrorMessage(), getResult() != null, null, null, null)); + null, getResult() != null, null, getErrorMessage() == null ? "" : getErrorMessage(), null)); qctx.getDriverStatus().setDriverStartTime(getDriverStartTime()); qctx.getDriverStatus().setDriverFinishTime(getDriverEndTime()); qctx.setResultSetPath(getResult()); http://git-wip-us.apache.org/repos/asf/lens/blob/d1c58cbc/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 646e759..2ee4eb1 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 @@ -255,7 +255,9 @@ public class TestResultFormatting extends LensJerseyTest { assertTrue(ctx.getFinishTime() > 0); assertEquals(ctx.getStatus().getStatus(), QueryStatus.Status.FAILED); assertFalse(ctx.getStatus().isResultSetAvailable()); - assertEquals(ctx.getStatus().getStatusMessage(), ResultFormatter.ERROR_MESSAGE); + // status message could be null if the query is purged + assertTrue(ctx.getStatus().getStatusMessage()== null + || ctx.getStatus().getStatusMessage().equals(ResultFormatter.ERROR_MESSAGE)); assertEquals(ctx.getStatus().getErrorMessage(), "Class NonexistentSerde.class not found"); } } http://git-wip-us.apache.org/repos/asf/lens/blob/d1c58cbc/lens-server/src/test/resources/lens-site.xml ---------------------------------------------------------------------- diff --git a/lens-server/src/test/resources/lens-site.xml b/lens-server/src/test/resources/lens-site.xml index 4205701..e6e5d2c 100644 --- a/lens-server/src/test/resources/lens-site.xml +++ b/lens-server/src/test/resources/lens-site.xml @@ -129,7 +129,7 @@ <property> <!-- run every second --> <name>lens.server.querypurger.sleep.interval</name> - <value>1000</value> + <value>100</value> </property> <property>