cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 21 May 2014 15:54:41 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java


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

Branch: refs/heads/trunk
Commit: e024a1cc2ba9e50f1272ad76cb34582e38c256be
Parents: 82be86a 2635632
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed May 21 17:49:40 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed May 21 17:49:40 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  1 +
 .../apache/cassandra/db/marshal/DateType.java   | 38 +---------
 .../cassandra/db/marshal/TimeUUIDType.java      |  6 +-
 .../cassandra/db/marshal/TimestampType.java     | 43 +----------
 .../apache/cassandra/db/marshal/UUIDType.java   | 38 ++--------
 .../serializers/TimestampSerializer.java        | 68 ++++++++++++++---
 .../apache/cassandra/service/CacheService.java  | 11 +++
 .../cassandra/db/RecoveryManagerTest.java       |  3 +
 .../serializers/TimestampSerializerTest.java    | 77 ++++++++++++++++++++
 10 files changed, 166 insertions(+), 122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0b8be6e,bddb1d1..209ff70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -57,7 -32,27 +57,10 @@@ Merged from 2.0
   * Re-add parameter columns to tracing session (CASSANDRA-6942)
   * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
 - * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
 - * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
 - * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
 - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
 - * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
 - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
 - * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
 - * Fix disabling autocompaction (CASSANDRA-7187)
 - * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
 - * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
 - * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
 - * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
 - * Fix the InvertedIndex trigger example (CASSANDRA-7211)
 - * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
 - * reduce garbage on codec flag deserialization (CASSANDRA-7244) 
 - * Proper null handle for IF with map element access (CASSANDRA-7155)
 - * Improve compaction visibility (CASSANDRA-7242)
   * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
+  * Invalid key cache entries on DROP (CASSANDRA-6525)
+  * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
++ * Add missing iso8601 patterns for date strings (6973)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 3786ef5,709935a..4d334e7
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -372,7 -337,14 +372,8 @@@ public class ColumnFamilyStore implemen
          data.unreferenceSSTables();
          indexManager.invalidate();
  
 -        for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
 -            if (key.cfId == metadata.cfId)
 -                invalidateCachedRow(key);
 -
 -        String ksname = keyspace.getName();
 -        for (KeyCacheKey key : CacheService.instance.keyCache.getKeySet())
 -            if (key.getPathInfo().left.equals(ksname) && key.getPathInfo().right.equals(name))
 -                CacheService.instance.keyCache.remove(key);
 +        CacheService.instance.invalidateRowCacheForCf(metadata.cfId);
++        CacheService.instance.invalidateKeyCacheForCf(metadata.cfId);
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/src/java/org/apache/cassandra/db/marshal/UUIDType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CacheService.java
index 78f6d66,f626e17..f51a166
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@@ -283,6 -236,6 +283,17 @@@ public class CacheService implements Ca
          keyCache.clear();
      }
  
++    public void invalidateKeyCacheForCf(UUID cfId)
++    {
++        Iterator<KeyCacheKey> keyCacheIterator = keyCache.getKeySet().iterator();
++        while (keyCacheIterator.hasNext())
++        {
++            KeyCacheKey key = keyCacheIterator.next();
++            if (key.cfId.equals(cfId))
++                keyCacheIterator.remove();
++        }
++    }
++
      public void invalidateRowCache()
      {
          rowCache.clear();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e024a1cc/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index e812dfb,d14d184..687df5a
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@@ -20,8 -20,10 +20,9 @@@ package org.apache.cassandra.db
  
  import java.io.IOException;
  import java.util.Date;
 -import java.util.concurrent.ExecutionException;
  import java.util.concurrent.TimeUnit;
  
+ import org.apache.cassandra.OrderedJUnit4ClassRunner;
  import org.apache.cassandra.Util;
  import org.junit.Assert;
  import org.junit.Test;
@@@ -32,8 -35,9 +34,9 @@@ import org.apache.cassandra.db.commitlo
  
  import static org.apache.cassandra.Util.column;
  import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
 +import static org.apache.cassandra.Util.cellname;
  
+ @RunWith(OrderedJUnit4ClassRunner.class)
  public class RecoveryManagerTest extends SchemaLoader
  {
      @Test


Mime
View raw message