You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2016/05/18 21:00:41 UTC
[1/8] cassandra git commit: Don't compute expensive
MaxPurgeableTimestamp until we've verified there's an expired tombstone patch
by jbellis; reviewed by marcuse for CASSANDRA-11834
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.7 424b0b9e0 -> 326a263f4
refs/heads/trunk bc7846680 -> beb6464c0
Don't compute expensive MaxPurgeableTimestamp until we've verified there's an expired tombstone
patch by jbellis; reviewed by marcuse for CASSANDRA-11834
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00f25401
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00f25401
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00f25401
Branch: refs/heads/cassandra-3.7
Commit: 00f25401c9a320c0c2ac94fbb1014f49597026fd
Parents: 9359af2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 18 12:24:23 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 18 12:25:45 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 11 ++++++++---
.../cassandra/db/compaction/LazilyCompactedRow.java | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00f25401/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 68f8dd9..3972248 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,18 @@
2.1.15
- * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-11679)
+ * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an
+ expired tombstone (CASSANDRA-11834)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-11679)
* Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737)
* cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631)
* Make cython optional in pylib/setup.py (CASSANDRA-11630)
- * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628)
+ * Change order of directory searching for cassandra.in.sh to favor local one
+ (CASSANDRA-11628)
* cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633)
* clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574)
* cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
- * Validate levels when building LeveledScanner to avoid overlaps with orphaned sstables (CASSANDRA-9935)
+ * Validate levels when building LeveledScanner to avoid overlaps with orphaned
+ sstables (CASSANDRA-9935)
2.1.14
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00f25401/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 941557b..4ca9829 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -271,7 +271,7 @@ public class LazilyCompactedRow extends AbstractCompactedRow
RangeTombstone t = tombstone;
tombstone = null;
- if (t.timestamp() < getMaxPurgeableTimestamp() && t.data.isGcAble(controller.gcBefore))
+ if (t.data.isGcAble(controller.gcBefore) && t.timestamp() < getMaxPurgeableTimestamp())
{
indexBuilder.tombstoneTracker().update(t, true);
return null;
[5/8] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a5d0a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a5d0a1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a5d0a1e
Branch: refs/heads/cassandra-3.7
Commit: 5a5d0a1eb46dfa308acc9cff28f8c65fbb026b81
Parents: 958183f 2837ec6
Author: Benedict Elliott Smith <be...@vast.com>
Authored: Wed May 18 21:51:40 2016 +0100
Committer: Benedict Elliott Smith <be...@vast.com>
Committed: Wed May 18 21:51:40 2016 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 41 +++++++++-----------
1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a5d0a1e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 98ba781,45486c1..a6d5c17
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1973,35 -2762,30 +1973,32 @@@ public class ColumnFamilyStore implemen
final long truncatedAt;
final ReplayPosition replayAfter;
- synchronized (data)
- if (keyspace.getMetadata().durableWrites || takeSnapshot)
++ if (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot())
+ {
+ replayAfter = forceBlockingFlush();
++ viewManager.forceBlockingFlush();
+ }
+ else
{
- if (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot())
+ // just nuke the memtable data w/o writing to disk first
- Future<ReplayPosition> replayAfterFuture;
- synchronized (data)
++ viewManager.dumpMemtables();
++ try
{
- replayAfter = forceBlockingFlush();
- viewManager.forceBlockingFlush();
- final Flush flush = new Flush(true);
- flushExecutor.execute(flush);
- replayAfterFuture = postFlushExecutor.submit(flush.postFlush);
++ replayAfter = dumpMemtable().get();
+ }
- else
++ catch (Exception e)
+ {
- // just nuke the memtable data w/o writing to disk first
- viewManager.dumpMemtables();
- try
- {
- replayAfter = dumpMemtable().get();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
++ throw new RuntimeException(e);
}
-
- long now = System.currentTimeMillis();
- // make sure none of our sstables are somehow in the future (clock drift, perhaps)
- for (ColumnFamilyStore cfs : concatWithIndexes())
- for (SSTableReader sstable : cfs.data.getSSTables())
- now = Math.max(now, sstable.maxDataAge);
- truncatedAt = now;
- replayAfter = FBUtilities.waitOnFuture(replayAfterFuture);
}
+ long now = System.currentTimeMillis();
+ // make sure none of our sstables are somehow in the future (clock drift, perhaps)
+ for (ColumnFamilyStore cfs : concatWithIndexes())
+ for (SSTableReader sstable : cfs.data.getSSTables())
+ now = Math.max(now, sstable.maxDataAge);
+ truncatedAt = now;
+
Runnable truncateRunnable = new Runnable()
{
public void run()
[8/8] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/beb6464c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beb6464c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/beb6464c
Branch: refs/heads/trunk
Commit: beb6464c0523155b03cd426f32fae8020d72df0f
Parents: bc78466 326a263
Author: Benedict Elliott Smith <be...@vast.com>
Authored: Wed May 18 22:00:27 2016 +0100
Committer: Benedict Elliott Smith <be...@vast.com>
Committed: Wed May 18 22:00:27 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/8] cassandra git commit: Fix deadlock on truncation with secondary
index.
Posted by be...@apache.org.
Fix deadlock on truncation with secondary index.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2837ec65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2837ec65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2837ec65
Branch: refs/heads/cassandra-3.7
Commit: 2837ec65b91abd78ec1bb37f1d69565b976e42e6
Parents: be65393
Author: Branimir Lambov <br...@datastax.com>
Authored: Tue May 17 12:22:21 2016 +0300
Committer: Benedict Elliott Smith <be...@vast.com>
Committed: Wed May 18 21:49:39 2016 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 32 +++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2837ec65/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 88e22c0..45486c1 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2762,28 +2762,30 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
final long truncatedAt;
final ReplayPosition replayAfter;
- synchronized (data)
+ if (keyspace.getMetadata().durableWrites || takeSnapshot)
{
- if (keyspace.getMetadata().durableWrites || takeSnapshot)
- {
- replayAfter = forceBlockingFlush();
- }
- else
+ replayAfter = forceBlockingFlush();
+ }
+ else
+ {
+ // just nuke the memtable data w/o writing to disk first
+ Future<ReplayPosition> replayAfterFuture;
+ synchronized (data)
{
- // just nuke the memtable data w/o writing to disk first
final Flush flush = new Flush(true);
flushExecutor.execute(flush);
- replayAfter = FBUtilities.waitOnFuture(postFlushExecutor.submit(flush.postFlush));
+ replayAfterFuture = postFlushExecutor.submit(flush.postFlush);
}
-
- long now = System.currentTimeMillis();
- // make sure none of our sstables are somehow in the future (clock drift, perhaps)
- for (ColumnFamilyStore cfs : concatWithIndexes())
- for (SSTableReader sstable : cfs.data.getSSTables())
- now = Math.max(now, sstable.maxDataAge);
- truncatedAt = now;
+ replayAfter = FBUtilities.waitOnFuture(replayAfterFuture);
}
+ long now = System.currentTimeMillis();
+ // make sure none of our sstables are somehow in the future (clock drift, perhaps)
+ for (ColumnFamilyStore cfs : concatWithIndexes())
+ for (SSTableReader sstable : cfs.data.getSSTables())
+ now = Math.max(now, sstable.maxDataAge);
+ truncatedAt = now;
+
Runnable truncateRunnable = new Runnable()
{
public void run()
[3/8] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/958183fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/958183fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/958183fa
Branch: refs/heads/cassandra-3.7
Commit: 958183fadab6a67abf8831fa8e92751039a2ef58
Parents: f73b485 be65393
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 18 12:30:54 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 18 12:30:54 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/8] cassandra git commit: merge from 2.1
Posted by be...@apache.org.
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be653932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be653932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be653932
Branch: refs/heads/cassandra-3.7
Commit: be653932d883134ec6ebecd5b9ad1dbb64bda64a
Parents: 89344f1 00f2540
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 18 12:28:45 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 18 12:30:14 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be653932/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index befb520,3972248..103d057
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,24 @@@
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
-
-2.1.15
+2.2.7
++ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
+ * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
+ * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
+ * JSON datetime formatting needs timezone (CASSANDRA-11137)
+ * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
+ * Add missing files to debian packages (CASSANDRA-11642)
+ * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
+ * cqlsh: COPY FROM should use regular inserts for single statement batches and
+ report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
+ * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
+ * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
+Merged from 2.1:
+ * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an
+ expired tombstone (CASSANDRA-11834)
- * Fix paging on DISTINCT queries repeats result when first row in partition changes
- (CASSANDRA-11679)
* Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737)
* cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631)
* Make cython optional in pylib/setup.py (CASSANDRA-11630)
@@@ -25,62 -11,21 +27,63 @@@
* cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633)
* clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574)
* cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
+ * (cqlsh) Fix potential COPY deadlock when parent process is terminating child
+ processes (CASSANDRA-11505)
- * Validate levels when building LeveledScanner to avoid overlaps with orphaned sstables (CASSANDRA-9935)
+ * Validate levels when building LeveledScanner to avoid overlaps with orphaned
+ sstables (CASSANDRA-9935)
-2.1.14
- * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
- going (CASSANDRA-10979)
- * (cqlsh) Fix potential COPY deadlock when parent process is terminating child
- processes (CASSANDRA-11505)
- * Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
+2.2.6
+ * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339)
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
+ * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
+ * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
+ * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
+ * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
+ * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
+ * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
+ * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
+ * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
+ * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
+ * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
+ * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
+ * Fix bloom filter sizing with LCS (CASSANDRA-11344)
+ * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
+ * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
+ * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301)
+ * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
+ * Fix filtering on non-primary key columns for thrift static column families
+ (CASSANDRA-6377)
+ * Only log yaml config once, at startup (CASSANDRA-11217)
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
+ * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
+ * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-10010)
+Merged from 2.1:
* Checking if an unlogged batch is local is inefficient (CASSANDRA-11529)
* Fix paging for COMPACT tables without clustering columns (CASSANDRA-11467)
- * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448)
- * Backport CASSANDRA-10859 (CASSANDRA-11415)
- * COPY FROM fails when importing blob (CASSANDRA-11375)
+ * Add a -j parameter to scrub/cleanup/upgradesstables to state how
+ many threads to use (CASSANDRA-11179)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
[7/8] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/326a263f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/326a263f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/326a263f
Branch: refs/heads/trunk
Commit: 326a263f4b1cc576226d89bcfbb561385ba54e10
Parents: 424b0b9 5a5d0a1
Author: Benedict Elliott Smith <be...@vast.com>
Authored: Wed May 18 22:00:16 2016 +0100
Committer: Benedict Elliott Smith <be...@vast.com>
Committed: Wed May 18 22:00:16 2016 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 41 +++++++++-----------
1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/326a263f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
[6/8] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/326a263f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/326a263f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/326a263f
Branch: refs/heads/cassandra-3.7
Commit: 326a263f4b1cc576226d89bcfbb561385ba54e10
Parents: 424b0b9 5a5d0a1
Author: Benedict Elliott Smith <be...@vast.com>
Authored: Wed May 18 22:00:16 2016 +0100
Committer: Benedict Elliott Smith <be...@vast.com>
Committed: Wed May 18 22:00:16 2016 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 41 +++++++++-----------
1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/326a263f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------