You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/02/28 06:41:30 UTC

git commit: TAJO-638: QueryUnitAttempt causes Invalid event error: TA_UPDATE at TA_ASSIGNED.

Repository: incubator-tajo
Updated Branches:
  refs/heads/master 51b019ab1 -> cf27e0572


TAJO-638: QueryUnitAttempt causes Invalid event error: TA_UPDATE at TA_ASSIGNED.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/cf27e057
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/cf27e057
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/cf27e057

Branch: refs/heads/master
Commit: cf27e05724969f6894b169037628d9f50e986948
Parents: 51b019a
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Feb 28 14:41:15 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Feb 28 14:41:15 2014 +0900

----------------------------------------------------------------------
 CHANGES.txt                                              |  9 +++++++--
 .../apache/tajo/master/querymaster/QueryUnitAttempt.java | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cf27e057/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f976d07..a3f8e44 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -263,11 +263,16 @@ Release 0.8.0 - unreleased
 
   BUG FIXES
 
-    TAJO-640: In inner join clause, empty table can cause a error by order-by clause. (jaehwa)
+    TAJO-638: QueryUnitAttempt causes Invalid event error: TA_UPDATE at
+    TA_ASSIGNED. (hyunsik)
+
+    TAJO-640: In inner join clause, empty table can cause a error by order-by
+    clause. (jaehwa)
 
     TAJO-635: Improve tests of query semantic verification. (hyunsik)
 
-    TAJO-620: A join query can cause IndexOutOfBoundsException if one of tables is empty. (jaehwa)
+    TAJO-620: A join query can cause IndexOutOfBoundsException if one of
+    tables is empty. (jaehwa)
 
     TAJO-628: The second stage of distinct aggregation can be scheduled to
     only one node. (hyunsik)

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cf27e057/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnitAttempt.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnitAttempt.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnitAttempt.java
index aac5e37..8a68c26 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnitAttempt.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnitAttempt.java
@@ -388,10 +388,13 @@ public class QueryUnitAttempt implements EventHandler<TaskAttemptEvent> {
       try {
         stateMachine.doTransition(event.getType(), event);
       } catch (InvalidStateTransitonException e) {
-        LOG.error("Can't handle this event at current state of "
-            + event.getTaskAttemptId() + ")", e);
-        eventHandler.handle(new QueryEvent(TajoIdUtils.parseQueryId(getId().toString()),
-            QueryEventType.INTERNAL_ERROR));
+        LOG.error("Can't handle this event at current state of " + event.getTaskAttemptId() + ")", e);
+        eventHandler.handle(
+            new SubQueryDiagnosticsUpdateEvent(event.getTaskAttemptId().getQueryUnitId().getExecutionBlockId(),
+                "Can't handle this event at current state of " + event.getTaskAttemptId() + ")"));
+        eventHandler.handle(
+            new SubQueryEvent(event.getTaskAttemptId().getQueryUnitId().getExecutionBlockId(),
+                SubQueryEventType.SQ_INTERNAL_ERROR));
       }
 
       //notify the eventhandler of state change