You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/04/26 17:50:43 UTC
[27/47] git commit: Check style fixes relating to feed module
Check style fixes relating to feed module
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/afbcea08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/afbcea08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/afbcea08
Branch: refs/heads/master
Commit: afbcea089140baf9c7400d8e31fa99748c9f8d2e
Parents: bdadf2e
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Wed Apr 17 15:06:46 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Wed Apr 17 15:06:46 2013 +0530
----------------------------------------------------------------------
.../apache/falcon/converter/OozieFeedMapper.java | 36 +++++++++------
.../falcon/workflow/OozieFeedWorkflowBuilder.java | 12 +++--
.../falcon/converter/OozieFeedMapperTest.java | 11 +++--
3 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/afbcea08/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
----------------------------------------------------------------------
diff --git a/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java b/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
index d02f6c1..a409e44 100644
--- a/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
+++ b/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
@@ -47,9 +47,13 @@ import org.apache.log4j.Logger;
import java.io.IOException;
import java.util.*;
+/**
+ * Mapper which maps feed definition to oozie workflow definitions for
+ * replication & retention.
+ */
public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
- private static Logger LOG = Logger.getLogger(OozieFeedMapper.class);
+ private static final Logger LOG = Logger.getLogger(OozieFeedMapper.class);
private static final int THIRTY_MINUTES = 30 * 60 * 1000;
@@ -150,7 +154,8 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
}
private List<COORDINATORAPP> getReplicationCoordinators(Cluster targetCluster, Path bundlePath)
- throws FalconException {
+ throws FalconException {
+
Feed feed = getEntity();
List<COORDINATORAPP> replicationCoords = new ArrayList<COORDINATORAPP>();
@@ -176,7 +181,8 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
}
private COORDINATORAPP createAndGetCoord(Feed feed, Cluster srcCluster, Cluster trgCluster, Path bundlePath)
- throws FalconException {
+ throws FalconException {
+
COORDINATORAPP replicationCoord;
String coordName;
try {
@@ -186,14 +192,14 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
replicationCoord.setName(coordName);
replicationCoord.setFrequency("${coord:" + feed.getFrequency().toString() + "}");
- long frequency_ms = ExpressionHelper.get().
+ long frequencyInMillis = ExpressionHelper.get().
evaluate(feed.getFrequency().toString(), Long.class);
- long timeout_ms = frequency_ms * 6;
- if (timeout_ms < THIRTY_MINUTES) {
- timeout_ms = THIRTY_MINUTES;
+ long timeoutInMillis = frequencyInMillis * 6;
+ if (timeoutInMillis < THIRTY_MINUTES) {
+ timeoutInMillis = THIRTY_MINUTES;
}
- replicationCoord.getControls().setTimeout(String.valueOf(timeout_ms / (1000 * 60)));
- replicationCoord.getControls().setThrottle(String.valueOf(timeout_ms / frequency_ms * 2));
+ replicationCoord.getControls().setTimeout(String.valueOf(timeoutInMillis / (1000 * 60)));
+ replicationCoord.getControls().setThrottle(String.valueOf(timeoutInMillis / frequencyInMillis * 2));
Date srcStartDate = FeedHelper.getCluster(feed, srcCluster.getName()).getValidity().getStart();
Date srcEndDate = FeedHelper.getCluster(feed, srcCluster.getName()).getValidity().getEnd();
@@ -218,11 +224,10 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
SYNCDATASET inputDataset = (SYNCDATASET) replicationCoord.getDatasets().getDatasetOrAsyncDataset().get(0);
SYNCDATASET outputDataset = (SYNCDATASET) replicationCoord.getDatasets().getDatasetOrAsyncDataset().get(1);
- inputDataset.setUriTemplate(new Path(ClusterHelper
- .getStorageUrl(srcCluster), FeedHelper.getLocation(feed,
- LocationType.DATA, srcCluster.getName()).getPath()).toString());
- outputDataset.setUriTemplate(getStoragePath(FeedHelper.getLocation(
- feed, LocationType.DATA, trgCluster.getName()).getPath()));
+ inputDataset.setUriTemplate(new Path(ClusterHelper.getStorageUrl(srcCluster),
+ FeedHelper.getLocation(feed, LocationType.DATA, srcCluster.getName()).getPath()).toString());
+ outputDataset.setUriTemplate(getStoragePath(
+ FeedHelper.getLocation(feed, LocationType.DATA, trgCluster.getName()).getPath()));
setDatasetValues(inputDataset, feed, srcCluster);
setDatasetValues(outputDataset, feed, srcCluster);
if (feed.getAvailabilityFlag() == null) {
@@ -248,7 +253,8 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed> {
}
private ACTION getReplicationWorkflowAction(Cluster srcCluster, Cluster trgCluster, Path wfPath, String wfName)
- throws FalconException {
+ throws FalconException {
+
ACTION replicationAction = new ACTION();
WORKFLOW replicationWF = new WORKFLOW();
try {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/afbcea08/feed/src/main/java/org/apache/falcon/workflow/OozieFeedWorkflowBuilder.java
----------------------------------------------------------------------
diff --git a/feed/src/main/java/org/apache/falcon/workflow/OozieFeedWorkflowBuilder.java b/feed/src/main/java/org/apache/falcon/workflow/OozieFeedWorkflowBuilder.java
index 14f39e9..0cbdf77 100644
--- a/feed/src/main/java/org/apache/falcon/workflow/OozieFeedWorkflowBuilder.java
+++ b/feed/src/main/java/org/apache/falcon/workflow/OozieFeedWorkflowBuilder.java
@@ -33,6 +33,9 @@ import org.apache.hadoop.fs.Path;
import java.util.*;
+/**
+ * Workflow definition builder for feed replication & retention.
+ */
public class OozieFeedWorkflowBuilder extends OozieWorkflowBuilder<Feed> {
@Override
@@ -53,11 +56,10 @@ public class OozieFeedWorkflowBuilder extends OozieWorkflowBuilder<Feed> {
@Override
public Properties newWorkflowSchedule(Feed feed, Date startDate, String clusterName, String user)
- throws FalconException {
+ throws FalconException {
+
org.apache.falcon.entity.v0.feed.Cluster feedCluster = FeedHelper.getCluster(feed, clusterName);
- if (!startDate.before(feedCluster.getValidity().getEnd()))
- // start time >= end time
- {
+ if (!startDate.before(feedCluster.getValidity().getEnd())) {
return null;
}
@@ -84,6 +86,6 @@ public class OozieFeedWorkflowBuilder extends OozieWorkflowBuilder<Feed> {
public String[] getWorkflowNames(Feed entity) {
return new String[]{
EntityUtil.getWorkflowName(Tag.RETENTION, entity).toString(),
- EntityUtil.getWorkflowName(Tag.REPLICATION, entity).toString()};
+ EntityUtil.getWorkflowName(Tag.REPLICATION, entity).toString(), };
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/afbcea08/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
----------------------------------------------------------------------
diff --git a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
index 3a7f4ae..d3d8e91 100644
--- a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
+++ b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
@@ -41,13 +41,16 @@ import java.util.List;
import static org.testng.Assert.assertEquals;
+/**
+ * Tests for Oozie workflow definition for feed replication & retention.
+ */
public class OozieFeedMapperTest {
private EmbeddedCluster srcMiniDFS;
private EmbeddedCluster trgMiniDFS;
- ConfigurationStore store = ConfigurationStore.get();
- Cluster srcCluster;
- Cluster trgCluster;
- Feed feed;
+ private ConfigurationStore store = ConfigurationStore.get();
+ private Cluster srcCluster;
+ private Cluster trgCluster;
+ private Feed feed;
private static final String SRC_CLUSTER_PATH = "/src-cluster.xml";
private static final String TRG_CLUSTER_PATH = "/trg-cluster.xml";