tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject git commit: TAJO-154: Query calculates wrong progress in multiple step queries. (hyunsik)
Date Mon, 09 Sep 2013 02:28:28 GMT
Updated Branches:
  refs/heads/master 27f76811c -> 30ab48b06


TAJO-154: Query calculates wrong progress in multiple step queries. (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/30ab48b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/30ab48b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/30ab48b0

Branch: refs/heads/master
Commit: 30ab48b061fcaefd232544b084e490f04d76de15
Parents: 27f7681
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Mon Sep 9 11:28:03 2013 +0900
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Mon Sep 9 11:28:03 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                  | 8 ++++++--
 .../java/org/apache/tajo/master/ExecutionBlockCursor.java    | 4 ++++
 .../main/java/org/apache/tajo/master/querymaster/Query.java  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/30ab48b0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9fb16b4..a15fd46 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -128,10 +128,14 @@ Release 0.2.0 - unreleased
 
   BUG FIXES
 
-    TAJO-152: The tajo local directory path is mismatched in PullServer. (jihoon)
+    TAJO-154: Query calculates wrong progress in multiple step queries.
+    (hyunsik)
 
-    TAJO-80: Remove codes of legacy data paths. (jihoon)
+    TAJO-152: The tajo local directory path is mismatched in PullServer. 
+    (jihoon)
 
+    TAJO-80: Remove codes of legacy data paths. (jihoon)
+ 
     TAJO-159: QueryMaster cannot connect the remote CatalogServer. (hyunsik)
 
     TAJO-158: Can't allocate worker when single SubQuery requests more than

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/30ab48b0/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/ExecutionBlockCursor.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/ExecutionBlockCursor.java
b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/ExecutionBlockCursor.java
index 160584c..fd3ae1e 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/ExecutionBlockCursor.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/ExecutionBlockCursor.java
@@ -32,6 +32,10 @@ public class ExecutionBlockCursor {
     buildOrder(plan.getRoot());
   }
 
+  public int size() {
+    return orderedBlocks.size();
+  }
+
   private void buildOrder(ExecutionBlock current) {
     if (current.hasChildBlock()) {
       if (current.getChildNum() == 1) {

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/30ab48b0/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 c4b6ae0..c473586 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
@@ -162,7 +162,7 @@ public class Query implements EventHandler<QueryEvent> {
       }
 
       float totalProgress = 0;
-      float proportion = 1.0f / (float)subqueries.size();
+      float proportion = 1.0f / (float)getExecutionBlockCursor().size();
 
       for (int i = 0; i < subProgresses.length; i++) {
         totalProgress += subProgresses[i] * proportion;


Mime
View raw message