Permalink
Browse files

2.0 serial steps support (hadoop only). rmv unused import.

  • Loading branch information...
1 parent 6985fea commit 472cf5abd36544fa973b9ea90b14cf4a487761a7 @klovett klovett committed Nov 30, 2011
Showing with 4 additions and 5 deletions.
  1. +4 −3 src/java/cascading/load/Main.java
  2. +0 −2 src/java/cascading/load/common/CascadeLoadPlatform.java
@@ -24,6 +24,7 @@
import cascading.flow.FlowConnector;
import cascading.load.common.CascadeLoadPlatform;
import cascading.flow.hadoop.HadoopFlowProcess;
+import cascading.flow.hadoop.HadoopFlow;
import cascading.load.countsort.CountSort;
import cascading.load.countsort.StaggeredSort;
import cascading.load.countsort.FullTupleGroup;
@@ -256,14 +257,14 @@ protected Properties getDefaultProperties() throws IOException
String[] split = property.split( "=" );
properties.setProperty( split[ 0 ], split[ 1 ] );
}
+
+ if( options.getMaxConcurrentSteps() != -1 )
+ HadoopFlow.setMaxConcurrentSteps( properties, options.getMaxConcurrentSteps() );
}
if( options.getMaxConcurrentFlows() != -1 )
Cascade.setMaxConcurrentFlows( properties, options.getMaxConcurrentFlows() );
- if( options.getMaxConcurrentSteps() != -1 )
- Flow.setMaxConcurrentSteps( properties, options.getMaxConcurrentSteps() );
-
FlowConnector.setApplicationJarClass( properties, Main.class );
return properties;
@@ -39,8 +39,6 @@
import cascading.flow.local.LocalFlowConnector;
import cascading.scheme.local.LocalScheme;
-import org.apache.hadoop.mapred.JobConf;
-
/**
* Provides access to Cascading platform (local or hadoop) specific implementation objects.
*

0 comments on commit 472cf5a

Please sign in to comment.