cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.1' into trunk
Date Thu, 03 May 2012 15:42:52 GMT
Updated Branches:
  refs/heads/cassandra-1.1 f960f13a5 -> dfdf89cbc
  refs/heads/trunk fb2bfc984 -> b3b510262


Merge branch 'cassandra-1.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/b3b51026
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3b51026
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3b51026

Branch: refs/heads/trunk
Commit: b3b5102626282d539b0fc94bed5afedfb4444a00
Parents: fb2bfc9 dfdf89c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu May 3 10:42:22 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu May 3 10:42:22 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 +
 .../org/apache/cassandra/config/CFMetaData.java    |    4 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |   73 +++++++--------
 src/java/org/apache/cassandra/cql3/Cql.g           |   61 +++++++++++-
 .../cql3/statements/AlterTableStatement.java       |   29 +------
 .../statements/CreateColumnFamilyStatement.java    |   46 ++++------
 src/java/org/apache/cassandra/db/ColumnFamily.java |    2 +-
 7 files changed, 119 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 502ca93,b13d69b..e6f59d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392)
 +
 +
  1.1.1-dev
+  * include tombstone size in ColumnFamily.size, which can prevent OOM
+    during sudden mass delete operations (CASSANDRA-3741)
   * Open 1 sstableScanner per level for leveled compaction (CASSANDRA-4142)
   * Optimize reads when row deletion timestamps allow us to restrict
     the set of sstables we check (CASSANDRA-4116)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index c034ad2,8c0806f..b44b3ca
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@@ -51,10 -52,10 +51,10 @@@ public class CreateColumnFamilyStatemen
      private AbstractType<?> keyValidator;
  
      private ByteBuffer keyAlias;
 -    private List<ByteBuffer> columnAliases = new ArrayList<ByteBuffer>();
 +    private final List<ByteBuffer> columnAliases = new ArrayList<ByteBuffer>();
      private ByteBuffer valueAlias;
  
-     private final Map<ColumnIdentifier, String> columns = new HashMap<ColumnIdentifier,
String>();
+     private final Map<ColumnIdentifier, AbstractType> columns = new HashMap<ColumnIdentifier,
AbstractType>();
      private final CFPropDefs properties;
  
      public CreateColumnFamilyStatement(CFName name, CFPropDefs properties)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3b51026/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamily.java
index e9fedb4,aa683ea..ec2266b
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@@ -254,12 -258,12 +254,12 @@@ public class ColumnFamily extends Abstr
          return null;
      }
  
 -    int size()
 +    int size(DBTypeSizes typeSizes)
      {
-         int size = 0;
+         int size = DBConstants.longSize + DBConstants.intSize; // tombstone tracking
          for (IColumn column : columns)
          {
 -            size += column.size();
 +            size += column.size(typeSizes);
          }
          return size;
      }


Mime
View raw message