cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/8] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 30 Mar 2012 14:55:57 GMT
Updated Branches:
  refs/heads/trunk 3f7c7323b -> 38515b19a


Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
	src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	src/java/org/apache/cassandra/net/IncomingTcpConnection.java
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java


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

Branch: refs/heads/trunk
Commit: 38515b19a78ee2e1db69fd194e95135100ba34e9
Parents: 3f7c732 7935448
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Mar 30 16:55:43 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 30 16:55:43 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 ++
 NEWS.txt                                           |    3 +-
 conf/cassandra.yaml                                |    4 ---
 examples/client_only/conf/cassandra.yaml           |    4 ---
 src/java/org/apache/cassandra/cli/Cli.g            |    4 +-
 src/java/org/apache/cassandra/cli/CliClient.java   |   20 ++++++++++----
 src/java/org/apache/cassandra/config/Config.java   |    2 -
 .../cassandra/config/DatabaseDescriptor.java       |   10 -------
 .../db/compaction/AbstractCompactionIterable.java  |   13 ++++++++-
 .../db/compaction/CompactionIterable.java          |    7 +----
 .../db/compaction/ParallelCompactionIterable.java  |    4 +--
 .../org/apache/cassandra/gms/FailureDetector.java  |    2 +-
 12 files changed, 35 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
index 4f9a6d1,eb88489..ba4e3c2
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
@@@ -34,10 -38,9 +34,9 @@@ import org.apache.cassandra.utils.Merge
  
  public class CompactionIterable extends AbstractCompactionIterable
  {
 -    private static Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
 +    private static final Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
  
      private long row;
-     private final List<SSTableScanner> scanners;
  
      private static final Comparator<IColumnIterator> comparator = new Comparator<IColumnIterator>()
      {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
index eed60c5,764a549..a04bb91
--- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
@@@ -54,9 -57,8 +54,8 @@@ import org.apache.cassandra.utils.*
   */
  public class ParallelCompactionIterable extends AbstractCompactionIterable
  {
 -    private static Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class);
 +    private static final Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class);
  
-     private final List<SSTableScanner> scanners;
      private final int maxInMemorySize;
  
      public ParallelCompactionIterable(OperationType type, Iterable<SSTableReader>
sstables, CompactionController controller) throws IOException

http://git-wip-us.apache.org/repos/asf/cassandra/blob/38515b19/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/FailureDetector.java
index 42892e1,2f03e8c..e21a69d
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@@ -197,10 -197,10 +197,10 @@@ public class FailureDetector implement
  
      public void forceConviction(InetAddress ep)
      {
 -        logger_.debug("Forcing conviction of {}", ep);
 -        for ( IFailureDetectionEventListener listener : fdEvntListeners_ )
 +        logger.debug("Forcing conviction of {}", ep);
-         for ( IFailureDetectionEventListener listener : fdEvntListeners )
++        for (IFailureDetectionEventListener listener : fdEvntListeners)
          {
 -            listener.convict(ep, phiConvictThreshold_);
 +            listener.convict(ep, phiConvictThreshold);
          }
      }
  


Mime
View raw message