You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/10/06 12:45:22 UTC

[1/2] git commit: Track added size correctly

Repository: cassandra
Updated Branches:
  refs/heads/trunk 50c5da991 -> 68371c655


Track added size correctly

Patch by marcuse; reviewed by jbellis for CASSANDRA-7239


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

Branch: refs/heads/trunk
Commit: 6c3a3e130130e2823ba71ecd8a0e2680de23efd5
Parents: aca80da
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Oct 3 11:05:54 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Oct 6 12:43:19 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/db/DataTracker.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c3a3e13/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index beab957..7cce86e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Properly track added size (CASSANDRA-7239)
  * Allow compilation in java 8 (CASSANDRA-7208)
  * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
  * Release references to overlapping sstables during compaction (CASSANDRA-7819)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c3a3e13/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index 8d66e2a..f09c725 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -264,7 +264,7 @@ public class DataTracker
     {
         replace(sstables, Collections.<SSTableReader>emptyList());
         notifySSTablesChanged(sstables, allReplacements, compactionType);
-        for (SSTableReader sstable : sstables)
+        for (SSTableReader sstable : allReplacements)
         {
             long bytesOnDisk = sstable.bytesOnDisk();
             cfstore.metric.totalDiskSpaceUsed.inc(bytesOnDisk);


[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by ma...@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/68371c65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68371c65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68371c65

Branch: refs/heads/trunk
Commit: 68371c655c4a6f4590c3fd9200a0042009ca7e5a
Parents: 50c5da9 6c3a3e1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Oct 6 12:44:48 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Oct 6 12:44:48 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/db/DataTracker.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/68371c65/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc9a32f,7cce86e..8ecafd5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 +3.0
 + * Improve query to read paxos table on propose (CASSANDRA-7929)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Optimize java source-based UDF invocation (CASSANDRA-7924)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 +
 +
  2.1.1
+  * Properly track added size (CASSANDRA-7239)
   * Allow compilation in java 8 (CASSANDRA-7208)
   * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
   * Release references to overlapping sstables during compaction (CASSANDRA-7819)