You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2016/06/08 17:40:52 UTC
[1/2] lens git commit: LENS-1170: Queries can get stuck in EXECUTED
state on restart
Repository: lens
Updated Branches:
refs/heads/master 9ace50b3e -> 1362e667e
LENS-1170: Queries can get stuck in EXECUTED state on restart
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/aad1250d
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/aad1250d
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/aad1250d
Branch: refs/heads/master
Commit: aad1250db9449cea7b65c6bad0b747dd158203b1
Parents: 9ace50b
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Wed Jun 8 23:09:58 2016 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Wed Jun 8 23:09:58 2016 +0530
----------------------------------------------------------------------
.../lens/server/query/QueryExecutionServiceImpl.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/aad1250d/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 23c7743..fde432f 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
@@ -1335,6 +1335,14 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
} catch (final Exception e) {
log.error("Query not restored:QueryContext:{}", ctx, e);
}
+ // If EXECUTED, try to nudge result formatting forward
+ if (ctx.getStatus().getStatus() == EXECUTED) {
+ try {
+ getEventService().notifyEvent(newStatusChangeEvent(ctx, null, ctx.getStatus().getStatus()));
+ } catch (LensException e) {
+ log.error("Couldn't notify event for query executed for {}", ctx, e);
+ }
+ }
break;
case SUCCESSFUL:
case FAILED:
@@ -1895,7 +1903,7 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
*
* @param query
* @param sessionHandle
- * @param qconf
+ * @param conf
* @param queryName
* @return
*/
[2/2] lens git commit: LENS-1171: TestMetastoreService is
creating/destroying session in each test
Posted by pr...@apache.org.
LENS-1171: TestMetastoreService is creating/destroying session in each test
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/1362e667
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/1362e667
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/1362e667
Branch: refs/heads/master
Commit: 1362e667e8c1375bb20abd555a266934bbc9faa1
Parents: aad1250
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Wed Jun 8 23:10:28 2016 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Wed Jun 8 23:10:28 2016 +0530
----------------------------------------------------------------------
.../apache/lens/server/metastore/TestMetastoreService.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/1362e667/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
index 5424404..1b76ea5 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
@@ -55,6 +55,7 @@ import org.apache.lens.server.api.util.LensUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.TableType;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.ql.session.SessionState;
@@ -81,7 +82,7 @@ public class TestMetastoreService extends LensJerseyTest {
assertEquals(result.getStatus(), Status.SUCCEEDED, String.valueOf(result));
}
- @BeforeMethod
+ @BeforeTest
public void setUp() throws Exception {
super.setUp();
cubeObjectFactory = new ObjectFactory();
@@ -90,7 +91,7 @@ public class TestMetastoreService extends LensJerseyTest {
}
- @AfterMethod
+ @AfterTest
public void tearDown() throws Exception {
metastoreService.closeSession(lensSessionId);
super.tearDown();
@@ -2663,6 +2664,7 @@ public class TestMetastoreService extends LensJerseyTest {
setCurrentDatabase(DB, mediaType);
try {
+ SessionState.start(new HiveConf());
// create hive table
String tableName = "test_simple_table";
SessionState.get().setCurrentDatabase(DB);
@@ -2774,6 +2776,7 @@ public class TestMetastoreService extends LensJerseyTest {
} finally {
dropDatabase(DB, mediaType);
setCurrentDatabase(prevDb, mediaType);
+ SessionState.detachSession();
}
}