cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Mon, 17 Dec 2012 10:33:59 GMT
Updated Branches:
  refs/heads/trunk b5d07e582 -> df1df221e


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java


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

Branch: refs/heads/trunk
Commit: df1df221e4872646af90c90513e72f574b4cb782
Parents: b5d07e5 10959ef
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Dec 17 11:33:51 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Dec 17 11:33:51 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   99 +++++----------
 src/java/org/apache/cassandra/db/DefsTable.java    |    5 +-
 src/java/org/apache/cassandra/db/Memtable.java     |   12 --
 src/java/org/apache/cassandra/db/Table.java        |    6 +-
 .../apache/cassandra/service/StorageService.java   |    6 +-
 .../org/apache/cassandra/streaming/StreamOut.java  |    6 +-
 7 files changed, 36 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 47c1160,bc043c8..8133f78
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -732,11 -685,11 +705,11 @@@ public class ColumnFamilyStore implemen
  
          if (clean)
          {
 -            logger.debug("forceFlush requested but everything is clean in {}", columnFamily);
 +            logger.debug("forceFlush requested but everything is clean in {}", name);
-             return null;
+             return Futures.immediateCheckedFuture(null);
          }
  
-         return maybeSwitchMemtable(getMemtableThreadSafe(), true);
+         return switchMemtable(true, false);
      }
  
      public void forceBlockingFlush() throws ExecutionException, InterruptedException

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1df221/src/java/org/apache/cassandra/streaming/StreamOut.java
----------------------------------------------------------------------


Mime
View raw message