Repository: lens Updated Branches: refs/heads/master af3116639 -> fa8e5206f
LENS-757: Examples should continue to run in case submission failures Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/fa8e5206 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/fa8e5206 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/fa8e5206 Branch: refs/heads/master Commit: fa8e5206ffda1d4cdc6db13feac195d4b0caf9d0 Parents: af31166 Author: Amareshwari Sriramadasu <amareshw...@gmail.com> Authored: Wed Aug 26 20:17:57 2015 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Wed Aug 26 20:17:57 2015 +0530 ---------------------------------------------------------------------- .../org/apache/lens/examples/SampleQueries.java | 52 +++++++++++--------- 1 file changed, 29 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/fa8e5206/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java ---------------------------------------------------------------------- diff --git a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java index 6b662e7..805a282 100644 --- a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java +++ b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import javax.xml.bind.JAXBException; import org.apache.lens.api.query.*; +import org.apache.lens.client.LensClient; import org.apache.lens.client.LensClientSingletonWrapper; import org.apache.lens.client.LensMetadataClient; import org.apache.lens.client.LensStatement; @@ -83,9 +84,6 @@ public class SampleQueries { } } queries.queryAll(); - if (queries.retCode != 0) { - System.exit(queries.retCode); - } } finally { if (queries != null) { queries.close(); @@ -93,6 +91,9 @@ public class SampleQueries { long end = System.currentTimeMillis(); System.out.println("Total time for running examples(in millis) :" + (end-start)); } + if (queries.retCode != 0) { + System.exit(queries.retCode); + } } /** @@ -132,29 +133,34 @@ public class SampleQueries { } total++; System.out.println("Query:" + query); - QueryHandle handle = queryClient.executeQuery(query, true, null).getData(); - System.out.println("Status:" + queryClient.getQuery().getStatus()); - System.out.println("Total time in millis:" - + (queryClient.getQuery().getFinishTime() - queryClient.getQuery().getSubmissionTime())); - System.out.println("Driver run time in millis:" - + (queryClient.getQuery().getDriverFinishTime() - queryClient.getQuery().getDriverStartTime())); - if (queryClient.wasQuerySuccessful()) { - success++; - if (queryClient.getQuery().getStatus().isResultSetAvailable()) { - System.out.println("Result:"); - QueryResult queryResult = queryClient.getResultSet(); - if (queryResult instanceof InMemoryQueryResult) { - InMemoryQueryResult result = (InMemoryQueryResult) queryResult; - for (ResultRow row : result.getRows()) { - System.out.println(StringUtils.join(row.getValues(), "\t")); + try { + QueryHandle handle = queryClient.executeQuery(query, true, null).getData(); + System.out.println("Status:" + queryClient.getQuery().getStatus()); + System.out.println("Total time in millis:" + + (queryClient.getQuery().getFinishTime() - queryClient.getQuery().getSubmissionTime())); + System.out.println("Driver run time in millis:" + + (queryClient.getQuery().getDriverFinishTime() - queryClient.getQuery().getDriverStartTime())); + if (queryClient.wasQuerySuccessful()) { + success++; + if (queryClient.getQuery().getStatus().isResultSetAvailable()) { + System.out.println("Result:"); + QueryResult queryResult = queryClient.getResultSet(); + if (queryResult instanceof InMemoryQueryResult) { + InMemoryQueryResult result = (InMemoryQueryResult) queryResult; + for (ResultRow row : result.getRows()) { + System.out.println(StringUtils.join(row.getValues(), "\t")); + } + } else if (queryResult instanceof PersistentQueryResult) { + PersistentQueryResult persistentQueryResult = (PersistentQueryResult) queryResult; + System.out.println("Result stored at " + persistentQueryResult.getPersistedURI()); } - } else if (queryResult instanceof PersistentQueryResult) { - PersistentQueryResult persistentQueryResult = (PersistentQueryResult) queryResult; - System.out.println("Result stored at " + persistentQueryResult.getPersistedURI()); + queryClient.closeResultSet(); } - queryClient.closeResultSet(); + } else { + retCode = 1; } - } else { + } catch (Exception e) { + LensClient.getCliLooger().error("Exception for example query : \"{}\"", query, e); retCode = 1; } System.out.println("--------------------");
