CRUNCH-677 fix merge mistakes
diff --git a/crunch-core/src/main/java/org/apache/crunch/io/impl/FileTargetImpl.java b/crunch-core/src/main/java/org/apache/crunch/io/impl/FileTargetImpl.java
index ea7e98a..9c9aaef 100644
--- a/crunch-core/src/main/java/org/apache/crunch/io/impl/FileTargetImpl.java
+++ b/crunch-core/src/main/java/org/apache/crunch/io/impl/FileTargetImpl.java
@@ -259,7 +259,7 @@
}
}
- private void handeOutputsDistributedCopy(Configuration conf, Path srcPattern, FileSystem srcFs, FileSystem dstFs,
+ private void handleOutputsDistributedCopy(Configuration conf, Path srcPattern, FileSystem srcFs, FileSystem dstFs,
int maxDistributedCopyTasks) throws IOException {
Path[] srcs = FileUtil.stat2Paths(srcFs.globStatus(srcPattern), srcPattern);
if (srcs.length > 0) {
diff --git a/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatSourceTarget.java b/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatSourceTarget.java
index 39a66cf..37c76fa 100644
--- a/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatSourceTarget.java
+++ b/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatSourceTarget.java
@@ -35,6 +35,7 @@
import org.apache.crunch.types.PType;
import org.apache.crunch.types.writable.Writables;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.StatsSetupConst;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -135,6 +136,18 @@
}
@Override
+ public SourceTarget<HCatRecord> fileSystem(FileSystem fileSystem) {
+ // not currently supported/applicable for HCatalog
+ return this;
+ }
+
+ @Override
+ public FileSystem getFileSystem() {
+ // not currently supported/applicable for HCatalog
+ return null;
+ }
+
+ @Override
public PType<HCatRecord> getType() {
return PTYPE;
}
diff --git a/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatTarget.java b/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatTarget.java
index 114cf55..cb81707 100644
--- a/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatTarget.java
+++ b/crunch-hcatalog/src/main/java/org/apache/crunch/io/hcatalog/HCatTarget.java
@@ -33,6 +33,7 @@
import org.apache.crunch.types.PType;
import org.apache.crunch.types.writable.Writables;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
@@ -171,6 +172,18 @@
}
@Override
+ public Target fileSystem(FileSystem fileSystem) {
+ // not currently supported/applicable for HCatalog
+ return this;
+ }
+
+ @Override
+ public FileSystem getFileSystem() {
+ // not currently supported/applicable for HCatalog
+ return null;
+ }
+
+ @Override
public boolean handleExisting(WriteMode writeMode, long lastModifiedAt, Configuration conf) {
return writeMode == WriteMode.DEFAULT;
}
diff --git a/crunch-kafka/src/main/java/org/apache/crunch/kafka/KafkaSource.java b/crunch-kafka/src/main/java/org/apache/crunch/kafka/KafkaSource.java
index 1614053..fcf002b 100644
--- a/crunch-kafka/src/main/java/org/apache/crunch/kafka/KafkaSource.java
+++ b/crunch-kafka/src/main/java/org/apache/crunch/kafka/KafkaSource.java
@@ -33,6 +33,7 @@
import org.apache.crunch.types.PType;
import org.apache.crunch.types.writable.Writables;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapreduce.Job;
@@ -114,6 +115,18 @@
}
@Override
+ public Source<Pair<BytesWritable, BytesWritable>> fileSystem(FileSystem fileSystem) {
+ // not currently applicable/supported for Kafka
+ return this;
+ }
+
+ @Override
+ public FileSystem getFileSystem() {
+ // not currently applicable/supported for Kafka
+ return null;
+ }
+
+ @Override
public PType<Pair<BytesWritable, BytesWritable>> getType() {
return KAFKA_SOURCE_TYPE;
}
diff --git a/crunch-kafka/src/main/java/org/apache/crunch/kafka/record/KafkaSource.java b/crunch-kafka/src/main/java/org/apache/crunch/kafka/record/KafkaSource.java
index d7fb763..4d59edd 100644
--- a/crunch-kafka/src/main/java/org/apache/crunch/kafka/record/KafkaSource.java
+++ b/crunch-kafka/src/main/java/org/apache/crunch/kafka/record/KafkaSource.java
@@ -27,6 +27,7 @@
import org.apache.crunch.types.Converter;
import org.apache.crunch.types.PType;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapreduce.Job;
@@ -101,6 +102,18 @@
}
@Override
+ public Source<ConsumerRecord<BytesWritable, BytesWritable>> fileSystem(FileSystem fileSystem) {
+ // not currently applicable/supported for Kafka
+ return this;
+ }
+
+ @Override
+ public FileSystem getFileSystem() {
+ // not currently applicable/supported for Kafka
+ return null;
+ }
+
+ @Override
public PType<ConsumerRecord<BytesWritable, BytesWritable>> getType() {
return ConsumerRecordHelper.CONSUMER_RECORD_P_TYPE;
}
