tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject git commit: TAJO-8: MapReduce's ShuffleHandler and Tajo's PullServerAuxService conflict each other
Date Sun, 31 Mar 2013 06:37:23 GMT
Updated Branches:
  refs/heads/master 8557b4377 -> c2362cf3b


TAJO-8: MapReduce's ShuffleHandler and Tajo's PullServerAuxService conflict each other


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

Branch: refs/heads/master
Commit: c2362cf3bf54df82c6d5fed53f21bb418f634301
Parents: 8557b43
Author: jinossy <jinossy@gmail.com>
Authored: Sun Mar 31 15:32:19 2013 +0900
Committer: jinossy <jinossy@gmail.com>
Committed: Sun Mar 31 15:32:19 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../main/java/tajo/engine/query/ResultSetImpl.java |    2 +-
 .../java/tajo/pullserver/PullServerAuxService.java |   10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c2362cf3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a9b947..da3a5a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,8 @@ Release 0.2.0 - unreleased
 
   BUG FIXES
 
+    TAJO-8: MapReduce's ShuffleHandler and Tajo's PullServerAuxService conflict each other
+
     TAJO-13: Update the groupId property in the pom.xml to use ASF org instead of kr.ac.korea.dbserver
 
     TAJO-1: RCFileWrapper always reads whole columns regardless of the target 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c2362cf3/tajo-core/tajo-core-backend/src/main/java/tajo/engine/query/ResultSetImpl.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/tajo/engine/query/ResultSetImpl.java
b/tajo-core/tajo-core-backend/src/main/java/tajo/engine/query/ResultSetImpl.java
index ee17219..abe78c0 100644
--- a/tajo-core/tajo-core-backend/src/main/java/tajo/engine/query/ResultSetImpl.java
+++ b/tajo-core/tajo-core-backend/src/main/java/tajo/engine/query/ResultSetImpl.java
@@ -73,7 +73,7 @@ public class ResultSetImpl implements ResultSet {
       init();
       return;
     }
-    this.totalRow = meta.getStat().getNumRows();
+    this.totalRow = meta.getStat() != null ? meta.getStat().getNumRows() : 0;
     Collection<Fragment> frags = getFragmentsNG(meta, path);
     scanner = new MergeScanner(conf, meta, frags);
     init();

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c2362cf3/tajo-core/tajo-core-pullserver/src/main/java/tajo/pullserver/PullServerAuxService.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-pullserver/src/main/java/tajo/pullserver/PullServerAuxService.java
b/tajo-core/tajo-core-pullserver/src/main/java/tajo/pullserver/PullServerAuxService.java
index 63d3568..607662d 100644
--- a/tajo-core/tajo-core-pullserver/src/main/java/tajo/pullserver/PullServerAuxService.java
+++ b/tajo-core/tajo-core-pullserver/src/main/java/tajo/pullserver/PullServerAuxService.java
@@ -127,15 +127,15 @@ public class PullServerAuxService extends AbstractService
 
   public static final int DEFAULT_SUFFLE_SSL_FILE_BUFFER_SIZE = 60 * 1024;
 
-  @Metrics(about="PullServer output metrics", context="mapred")
+  @Metrics(name="PullServerShuffleMetrics", about="PullServer output metrics", context="tajo")
   static class ShuffleMetrics implements ChannelFutureListener {
-    @Metric("PullServer output in bytes")
+    @Metric({"OutputBytes","PullServer output in bytes"})
     MutableCounterLong shuffleOutputBytes;
-    @Metric("# of failed shuffle outputs")
+    @Metric({"Failed","# of failed shuffle outputs"})
     MutableCounterInt shuffleOutputsFailed;
-    @Metric("# of succeeeded shuffle outputs")
+    @Metric({"Succeeded","# of succeeded shuffle outputs"})
     MutableCounterInt shuffleOutputsOK;
-    @Metric("# of current shuffle connections")
+    @Metric({"Connections","# of current shuffle connections"})
     MutableGaugeInt shuffleConnections;
 
     @Override


Mime
View raw message