Repository: lens Updated Branches: refs/heads/master 2d3a6cccd -> 139f029ae
LENS-1418: LensClient is not thread safe Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/139f029a Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/139f029a Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/139f029a Branch: refs/heads/master Commit: 139f029ae88da7cc29a02afeee73a542f0c92eef Parents: 2d3a6cc Author: Rajat Khandelwal <pro...@apache.org> Authored: Fri May 5 17:10:50 2017 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Fri May 5 17:10:50 2017 +0530 ---------------------------------------------------------------------- .../test/java/org/apache/lens/cli/TestLensQueryCommands.java | 2 +- .../src/main/java/org/apache/lens/client/LensClient.java | 6 +++--- src/site/apt/user/cli.apt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/139f029a/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 e1eaae5..2f80851 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 @@ -230,7 +230,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest { //Fetch again. Should not get resultset result = qCom.getQueryResults(handle, null, true); log.debug("Prepared Query Result is " + result); - assertTrue(result.contains("Failed"), "Query is not purged yet " + handle); + assertTrue(result.contains("not available"), "Query is not purged yet " + handle); result = qCom.destroyPreparedQuery(qh); http://git-wip-us.apache.org/repos/asf/lens/blob/139f029a/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 e936798..4f8da06 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 @@ -226,10 +226,10 @@ public class LensClient implements AutoCloseable { throw new IllegalStateException(query.getStatus().getErrorMessage()); } LensClientResultSet result = null; - if (statement.getStatus().isResultSetAvailable()) { - result = new LensClientResultSet(statement.getResultSetMetaData(), statement.getResultSet()); + if (query.getStatus().isResultSetAvailable()) { + result = new LensClientResultSet(statement.getResultSetMetaData(query), statement.getResultSet(query)); } - return new LensClientResultSetWithStats(result, statement.getQuery()); + return new LensClientResultSetWithStats(result, query); } public LensClientResultSetWithStats getAsyncResults(QueryHandle q) { http://git-wip-us.apache.org/repos/asf/lens/blob/139f029a/src/site/apt/user/cli.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/user/cli.apt b/src/site/apt/user/cli.apt index caffda7..fce41fe 100644 --- a/src/site/apt/user/cli.apt +++ b/src/site/apt/user/cli.apt @@ -244,7 +244,7 @@ User CLI Commands *--+--+ |fact get storage [--fact_name] \<fact_name\> [--storage_name] \<path-to-storage-spec\>|describe storage <<<storage_name>>> of fact <<<fact_name>>>\ | *--+--+ -|fact list partitions [--fact_name] \<fact_name\> [--storage_name] \<storage_name\> [[--filter] \<partition-filter\>]|get all partitions associated with fact <<<fact_name>>>, storage <<<storage_name>>> filtered by <<<partition-filter>>>\ | +|fact list partitions [--fact_name] \<fact_name\> [--storage_name] \<storage_name\> [--filter] \<partition-filter\>|get all partitions associated with fact <<<fact_name>>>, storage <<<storage_name>>> filtered by <<<partition-filter>>>\ | *--+--+ |fact list storage [--fact_name] \<fact_name\>|display list of storages associated to fact <<<fact_name>>>\ | *--+--+
