cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [16/16] git commit: Merge branch 'cassandra-2.0' into trunk
Date Fri, 06 Dec 2013 15:52:33 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: e6170fef991dfad99cb6e094498c5a10fe129592
Parents: c00e05b f2a82ee
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Dec 6 09:52:08 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Dec 6 09:52:08 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |    1 +
 interface/cassandra.thrift                      |    5 +
 .../org/apache/cassandra/thrift/Cassandra.java  | 2250 +++++++++++++-----
 .../cassandra/thrift/cassandraConstants.java    |    2 +-
 .../hadoop/AbstractColumnFamilyInputFormat.java |   10 +-
 .../cassandra/service/StorageService.java       |   69 +-
 .../cassandra/thrift/CassandraServer.java       |   13 +
 7 files changed, 1728 insertions(+), 622 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6170fef/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6170fef/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 9e0a801,6c45a35..746666b
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@@ -132,8 -127,9 +127,9 @@@ public abstract class AbstractColumnFam
          keyspace = ConfigHelper.getInputKeyspace(context.getConfiguration());
          cfName = ConfigHelper.getInputColumnFamily(context.getConfiguration());
          partitioner = ConfigHelper.getInputPartitioner(context.getConfiguration());
 -        logger.debug("partitioner is " + partitioner);
 +        logger.debug("partitioner is {}", partitioner);
  
+ 
          // cannonical ranges, split into pieces, fetching the splits in parallel
          ExecutorService executor = new ThreadPoolExecutor(0, 128, 60L, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>());
          List<InputSplit> splits = new ArrayList<InputSplit>();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6170fef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index c16d906,c341684..e1392c6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -38,7 -37,9 +38,8 @@@ import javax.management.ObjectName
  import static java.nio.charset.StandardCharsets.ISO_8859_1;
  
  import com.google.common.annotations.VisibleForTesting;
+ import com.google.common.base.Predicate;
  import com.google.common.collect.*;
 -import com.google.common.util.concurrent.AtomicDouble;
  import com.google.common.util.concurrent.FutureCallback;
  import com.google.common.util.concurrent.Futures;
  import com.google.common.util.concurrent.Uninterruptibles;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6170fef/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message