cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Sat, 28 Dec 2013 17:59:56 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

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/0e0884f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e0884f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e0884f5

Branch: refs/heads/trunk
Commit: 0e0884f50338d83de7779d8b5ddd8d66e281586b
Parents: 6a211f4 8a51a72
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Dec 28 20:58:55 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Dec 28 20:58:55 2013 +0300

----------------------------------------------------------------------
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e0884f5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a04c9e2,3841397..cbd9d2e
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -340,6 -300,16 +331,16 @@@ public class ColumnFamilyStore implemen
              // this shouldn't block anything.
              logger.warn("Failed unregistering mbean: " + mbeanName, e);
          }
+ 
+         compactionStrategy.shutdown();
+ 
 -        SystemTable.removeTruncationRecord(metadata.cfId);
++        SystemKeyspace.removeTruncationRecord(metadata.cfId);
+         data.unreferenceSSTables();
+         indexManager.invalidate();
+ 
+         for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
+             if (key.cfId == metadata.cfId)
+                 invalidateCachedRow(key);
      }
  
      /**


Mime
View raw message