You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/08/26 16:07:22 UTC

[1/2] incubator-carbondata git commit: [CARBONDATA-183] Blocks are allocated to single node when Executors configured is based on the ip address.

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master d702e8262 -> 4bb004855


[CARBONDATA-183] Blocks are allocated to single node when Executors configured is based on the ip address.


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

Branch: refs/heads/master
Commit: be84575e99df5f9e20a8c9578ad26d3e1558dbf4
Parents: d702e82
Author: mohammadshahidkhan <mo...@gmail.com>
Authored: Fri Aug 26 11:52:11 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Aug 26 21:35:07 2016 +0530

----------------------------------------------------------------------
 .../java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/be84575e/integration/spark/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java b/integration/spark/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
index b7fb4a7..48f2805 100644
--- a/integration/spark/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
+++ b/integration/spark/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
@@ -1121,6 +1121,7 @@ public final class CarbonLoaderUtil {
       noofNodes = activeNodes.size();
     }
     int blocksPerNode = blockInfos.size() / noofNodes;
+    blocksPerNode = blocksPerNode <=0 ? 1 : blocksPerNode;
 
     // sort the flattened data.
     Collections.sort(flattenedList);
@@ -1358,7 +1359,7 @@ public final class CarbonLoaderUtil {
       }
     } else {
       try {
-        String hostAddress = InetAddress.getLocalHost().getHostAddress();
+        String hostAddress = InetAddress.getByName(nodeName).getHostAddress();
         isActiveNode = activeNode.contains(hostAddress);
         if(isActiveNode){
           return hostAddress;


[2/2] incubator-carbondata git commit: [CARBONDATA-183] Blocks are allocated to single node when Executors configured is based on the ip address This closes #98

Posted by ra...@apache.org.
[CARBONDATA-183] Blocks are allocated to single node when Executors configured is based on the ip address This closes #98


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

Branch: refs/heads/master
Commit: 4bb00485586dd6c8e2e744f5be3cb8b7a78ca95b
Parents: d702e82 be84575
Author: ravipesala <ra...@gmail.com>
Authored: Fri Aug 26 21:36:46 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Aug 26 21:36:46 2016 +0530

----------------------------------------------------------------------
 .../java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------