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 2013/11/21 09:34:30 UTC
git commit: TAJO-320: Visualize Tajo statemachine. (Min Zhou via
hyunsik)
Updated Branches:
refs/heads/master effa7df63 -> a7399577a
TAJO-320: Visualize Tajo statemachine. (Min Zhou via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/a7399577
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/a7399577
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/a7399577
Branch: refs/heads/master
Commit: a7399577a72319982fd4ad197b792f1db88bf472
Parents: effa7df
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Nov 21 17:31:31 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Nov 21 17:31:31 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 8 +++--
.../apache/tajo/master/querymaster/Query.java | 2 +-
.../tajo/master/querymaster/QueryUnit.java | 2 +-
.../master/querymaster/QueryUnitAttempt.java | 2 +-
.../tajo/master/querymaster/SubQuery.java | 5 +--
tajo-dist/pom.xml | 35 ++++++++++++++++++++
6 files changed, 47 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fb05b51..5cf8be4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,13 +19,15 @@ Release 0.8.0 - unreleased
TAJO-313: Support deprecated variables in CatalogConstants. (jaehwa)
- TAJO-310: Make the DataLocation class as a separate class and move it to the tajo-core-storage package. (jihoon)
+ TAJO-310: Make the DataLocation class as a separate class and move it to
+ the tajo-core-storage package. (jihoon)
TAJO-311: Improve Hive dependency. (jaehwa)
TAJO-309: Remove unused fields in FileFragment. (jihoon)
- TAJO-297: Rename JDBC variables in CatalogConstants to be more generic. (jaehwa)
+ TAJO-297: Rename JDBC variables in CatalogConstants to be more generic.
+ (jaehwa)
TAJO-287: Improve Fragment to be more generic. (hyunsik)
@@ -45,6 +47,8 @@ Release 0.8.0 - unreleased
TASKS
+ TAJO-320: Visualize Tajo statemachine. (Min Zhou via hyunsik)
+
TAJO-319: Update homepage and bump tajo version to 0.8. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Query.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Query.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Query.java
index 9b3c998..14a9a81 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Query.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Query.java
@@ -83,7 +83,7 @@ public class Query implements EventHandler<QueryEvent> {
// State Machine
private final StateMachine<QueryState, QueryEventType, QueryEvent> stateMachine;
- private static final StateMachineFactory
+ protected static final StateMachineFactory
<Query,QueryState,QueryEventType,QueryEvent> stateMachineFactory =
new StateMachineFactory<Query, QueryState, QueryEventType, QueryEvent>
(QueryState.QUERY_NEW)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
index c4d6150..5f734cb 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
@@ -82,7 +82,7 @@ public class QueryUnit implements EventHandler<TaskEvent> {
private long launchTime;
private long finishTime;
- private static final StateMachineFactory
+ protected static final StateMachineFactory
<QueryUnit, TaskState, TaskEventType, TaskEvent> stateMachineFactory =
new StateMachineFactory
<QueryUnit, TaskState, TaskEventType, TaskEvent>(TaskState.NEW)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/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 0b3bb7d..9a70c9a 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
@@ -58,7 +58,7 @@ public class QueryUnitAttempt implements EventHandler<TaskAttemptEvent> {
private final List<String> diagnostics = new ArrayList<String>();
- private static final StateMachineFactory
+ protected static final StateMachineFactory
<QueryUnitAttempt, TaskAttemptState, TaskAttemptEventType, TaskAttemptEvent>
stateMachineFactory = new StateMachineFactory
<QueryUnitAttempt, TaskAttemptState, TaskAttemptEventType, TaskAttemptEvent>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
index 61872ab..11455fb 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
@@ -94,7 +94,7 @@ public class SubQuery implements EventHandler<SubQueryEvent> {
private StateMachine<SubQueryState, SubQueryEventType, SubQueryEvent>
stateMachine;
- private StateMachineFactory<SubQuery, SubQueryState,
+ protected static final StateMachineFactory<SubQuery, SubQueryState,
SubQueryEventType, SubQueryEvent> stateMachineFactory =
new StateMachineFactory <SubQuery, SubQueryState,
SubQueryEventType, SubQueryEvent> (SubQueryState.NEW)
@@ -134,7 +134,8 @@ public class SubQuery implements EventHandler<SubQueryEvent> {
.addTransition(SubQueryState.FAILED, SubQueryState.FAILED,
SubQueryEventType.SQ_FAILED)
.addTransition(SubQueryState.FAILED, SubQueryState.FAILED,
- SubQueryEventType.SQ_INTERNAL_ERROR);
+ SubQueryEventType.SQ_INTERNAL_ERROR)
+ .installTopology();
private final Lock readLock;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a7399577/tajo-dist/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml
index 6d5d314..e24e4fb 100644
--- a/tajo-dist/pom.xml
+++ b/tajo-dist/pom.xml
@@ -156,5 +156,40 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>visualize</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.hadoop.yarn.util.VisualizeStateMachine</mainClass>
+ <arguments>
+ <argument>Tajo</argument>
+ <argument>org.apache.tajo.master.querymaster.Query,
+ org.apache.tajo.master.querymaster.SubQuery,
+ org.apache.tajo.master.querymaster.QueryUnit,
+ org.apache.tajo.master.querymaster.QueryUnitAttempt
+ </argument>
+ <argument>Tajo.gv</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>