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 2014/12/18 07:22:31 UTC
incubator-lens git commit: LENS-87 : Fixes intermittent failure for
TestJdbcDriver.testCancelQuery (Jaideep Dhok via amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master b8d09b17e -> c5922c522
LENS-87 : Fixes intermittent failure for TestJdbcDriver.testCancelQuery (Jaideep Dhok via 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/c5922c52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/c5922c52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/c5922c52
Branch: refs/heads/master
Commit: c5922c522704547fc4a231c3dabfe130fbf6d9a3
Parents: b8d09b1
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Thu Dec 18 11:52:12 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Thu Dec 18 11:52:12 2014 +0530
----------------------------------------------------------------------
.../apache/lens/driver/jdbc/TestJdbcDriver.java | 33 +++++++++++++++-----
1 file changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c5922c52/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
index 30b7935..ce62b65 100644
--- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
+++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestJdbcDriver.java
@@ -85,8 +85,11 @@ public class TestJdbcDriver {
assertNotNull(driver);
assertTrue(driver.configured);
- drivers = new ArrayList<LensDriver>() {{
- add(driver); }};
+ drivers = new ArrayList<LensDriver>() {
+ {
+ add(driver);
+ }
+ };
}
/**
@@ -100,10 +103,13 @@ public class TestJdbcDriver {
driver.close();
}
-
private QueryContext createQueryContext(final String query) throws LensException {
QueryContext context = new QueryContext(query, "SA", baseConf, drivers);
- context.getDriverContext().setDriverQueriesAndPlans(new HashMap<LensDriver, String>() {{ put(driver, query); }} );
+ context.getDriverContext().setDriverQueriesAndPlans(new HashMap<LensDriver, String>() {
+ {
+ put(driver, query);
+ }
+ });
context.setSelectedDriver(driver);
return context;
}
@@ -289,8 +295,12 @@ public class TestJdbcDriver {
insertData("prepare_test");
final String query = "SELECT * from prepare_test";
- PreparedQueryContext pContext = new PreparedQueryContext(query, "SA", baseConf, drivers );
- pContext.getDriverContext().setDriverQueriesAndPlans(new HashMap<LensDriver, String>() {{ put(driver, query); }});
+ PreparedQueryContext pContext = new PreparedQueryContext(query, "SA", baseConf, drivers);
+ pContext.getDriverContext().setDriverQueriesAndPlans(new HashMap<LensDriver, String>() {
+ {
+ put(driver, query);
+ }
+ });
pContext.setSelectedDriver(driver);
driver.prepare(pContext);
}
@@ -478,9 +488,16 @@ public class TestJdbcDriver {
System.out.println("@@@ test_cancel:" + context.getQueryHandle());
driver.executeAsync(context);
QueryHandle handle = context.getQueryHandle();
- driver.cancelQuery(handle);
+ boolean isCancelled = driver.cancelQuery(handle);
driver.updateStatus(context);
- assertEquals(context.getDriverStatus().getState(), DriverQueryState.CANCELED);
+
+ if (isCancelled) {
+ assertEquals(context.getDriverStatus().getState(), DriverQueryState.CANCELED);
+ } else {
+ // Query completed before cancelQuery call
+ assertEquals(context.getDriverStatus().getState(), DriverQueryState.SUCCESSFUL);
+ }
+
assertTrue(context.getDriverStatus().getDriverStartTime() > 0);
assertTrue(context.getDriverStatus().getDriverFinishTime() > 0);
driver.closeQuery(handle);