You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/15 21:21:24 UTC
[1/3] git commit: Invalidate all caches on table drop
Repository: cassandra
Updated Branches:
refs/heads/trunk 7879b2fe9 -> 5233948d1
Invalidate all caches on table drop
patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-7561
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23233b38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23233b38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23233b38
Branch: refs/heads/trunk
Commit: 23233b384aede963c883a937adf94859edbd7f02
Parents: 561f6ef
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 15 22:14:17 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 15 22:16:58 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++-------
src/java/org/apache/cassandra/service/CacheService.java | 11 +++++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23233b38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfe9c47..5b5283f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-rc6
+ * Invalidate all caches on table drop (CASSANDRA-7561)
* Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
* Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
* Add tracing entries about concurrent range requests (CASSANDRA-7599)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23233b38/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a0860a7..4842285 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -372,8 +372,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
data.unreferenceSSTables();
indexManager.invalidate();
- CacheService.instance.invalidateRowCacheForCf(metadata.cfId);
- CacheService.instance.invalidateKeyCacheForCf(metadata.cfId);
+ invalidateCaches();
}
/**
@@ -2286,15 +2285,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
private void invalidateCaches()
{
+ CacheService.instance.invalidateKeyCacheForCf(metadata.cfId);
CacheService.instance.invalidateRowCacheForCf(metadata.cfId);
-
if (metadata.isCounter())
- for (CounterCacheKey key : CacheService.instance.counterCache.getKeySet())
- if (key.cfId == metadata.cfId)
- CacheService.instance.counterCache.remove(key);
+ CacheService.instance.invalidateCounterCacheForCf(metadata.cfId);
}
-
/**
* @return true if @param key is contained in the row cache
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23233b38/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java
index f51a166..1b93c2c 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -310,6 +310,17 @@ public class CacheService implements CacheServiceMBean
}
}
+ public void invalidateCounterCacheForCf(UUID cfId)
+ {
+ Iterator<CounterCacheKey> counterCacheIterator = counterCache.getKeySet().iterator();
+ while (counterCacheIterator.hasNext())
+ {
+ CounterCacheKey counterCacheKey = counterCacheIterator.next();
+ if (counterCacheKey.cfId.equals(cfId))
+ counterCacheIterator.remove();
+ }
+ }
+
public void invalidateCounterCache()
{
counterCache.clear();
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea686198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea686198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea686198
Branch: refs/heads/trunk
Commit: ea686198fdecc1c251f05c443b2c0c5878dbbdd1
Parents: eab1584 23233b3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 15 22:20:29 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 15 22:20:29 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++-------
src/java/org/apache/cassandra/service/CacheService.java | 11 +++++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea686198/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ced91fd,5b5283f..9e9b805
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,5 +1,33 @@@
+2.1.1
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
2.1.0-rc6
+ * Invalidate all caches on table drop (CASSANDRA-7561)
* Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
* Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
* Add tracing entries about concurrent range requests (CASSANDRA-7599)
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5233948d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5233948d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5233948d
Branch: refs/heads/trunk
Commit: 5233948d124824edd8483a649aa6fec82f2259b1
Parents: 7879b2f ea68619
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 15 22:21:14 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 15 22:21:14 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++-------
src/java/org/apache/cassandra/service/CacheService.java | 11 +++++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5233948d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5233948d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------