cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 16 Sep 2015 02:24:02 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0afe4bee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0afe4bee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0afe4bee

Branch: refs/heads/cassandra-3.0
Commit: 0afe4beebafc00c920f05a88e7eec96f2bf306ee
Parents: 753a943 8cad732
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Sep 15 21:23:47 2015 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Sep 15 21:23:47 2015 -0500

----------------------------------------------------------------------
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 59 ++++++--------------
 1 file changed, 16 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0afe4bee/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 70429a8,36da92d..7699f29
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@@ -18,46 -18,16 +18,18 @@@
  package org.apache.cassandra.hadoop.cql3;
  
  import java.io.IOException;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.Random;
- import java.util.Set;
- import java.util.concurrent.Callable;
- import java.util.concurrent.ExecutorService;
- import java.util.concurrent.Future;
- import java.util.concurrent.LinkedBlockingQueue;
- import java.util.concurrent.ThreadPoolExecutor;
- import java.util.concurrent.TimeUnit;
- 
++import java.util.*;
++import java.util.concurrent.*
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
- import com.datastax.driver.core.Host;
- import com.datastax.driver.core.Metadata;
- import com.datastax.driver.core.ResultSet;
- import com.datastax.driver.core.Session;
- import com.datastax.driver.core.TokenRange;
 -import org.apache.cassandra.hadoop.HadoopCompat;
 -import org.apache.cassandra.hadoop.AbstractColumnFamilyInputFormat;
 -import org.apache.cassandra.hadoop.ReporterWrapper;
 -import org.apache.hadoop.mapred.InputSplit;
 -import org.apache.hadoop.mapred.JobConf;
 -import org.apache.hadoop.mapred.RecordReader;
 -import org.apache.hadoop.mapred.Reporter;
 -import org.apache.hadoop.mapreduce.TaskAttemptContext;
 -import org.apache.hadoop.mapreduce.TaskAttemptID;
++import com.datastax.driver.core.*;
 +import org.apache.cassandra.db.SystemKeyspace;
- import org.apache.cassandra.dht.ByteOrderedPartitioner;
- import org.apache.cassandra.dht.IPartitioner;
- import org.apache.cassandra.dht.OrderPreservingPartitioner;
- import org.apache.cassandra.dht.Range;
- import org.apache.cassandra.dht.Token;
- import org.apache.cassandra.hadoop.ColumnFamilySplit;
- import org.apache.cassandra.hadoop.ConfigHelper;
- import org.apache.cassandra.hadoop.HadoopCompat;
- import org.apache.cassandra.thrift.KeyRange;
++import org.apache.cassandra.dht.*;
++import org.apache.cassandra.hadoop.*;
 +import org.apache.hadoop.conf.Configuration;
- import org.apache.hadoop.mapred.InputSplit;
- import org.apache.hadoop.mapred.JobConf;
- import org.apache.hadoop.mapred.RecordReader;
- import org.apache.hadoop.mapred.Reporter;
- import org.apache.hadoop.mapreduce.JobContext;
- import org.apache.hadoop.mapreduce.TaskAttemptContext;
- import org.apache.hadoop.mapreduce.TaskAttemptID;
++import org.apache.hadoop.mapred.*;
++import org.apache.hadoop.mapreduce.*;
  
  import com.datastax.driver.core.Row;
  


Mime
View raw message