Updated Branches: refs/heads/trunk 18b49021b -> 413a177df
Fix broken merge. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/413a177d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/413a177d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/413a177d Branch: refs/heads/trunk Commit: 413a177dfca61123813ec3e77592210d3c33fa74 Parents: 18b4902 Author: Brandon Williams <[email protected]> Authored: Mon Aug 20 15:45:54 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Aug 20 15:45:54 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/413a177d/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java index a1b2171..b872082 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java @@ -33,6 +33,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.*; import org.apache.thrift.TException; import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; import javax.security.auth.login.LoginException; @@ -62,6 +63,8 @@ public class ColumnFamilyOutputFormat extends OutputFormat<ByteBuffer,List<Mutat { public static final String BATCH_THRESHOLD = "mapreduce.output.columnfamilyoutputformat.batch.threshold"; public static final String QUEUE_SIZE = "mapreduce.output.columnfamilyoutputformat.queue.size"; + private static final Logger logger = LoggerFactory.getLogger(ColumnFamilyOutputFormat.class); + /** * Check for validity of the output-specification for the job.
