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 2015/07/02 20:21:12 UTC
[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/StreamSession.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72bb4c0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72bb4c0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72bb4c0c
Branch: refs/heads/trunk
Commit: 72bb4c0c9fc3aa35e994bcb561898e82d5cf5d36
Parents: 61aeb91 2357589
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Jul 2 19:16:29 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Jul 2 19:16:29 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/db/lifecycle/Helpers.java | 23 +---
.../db/lifecycle/LifecycleTransaction.java | 7 +-
.../apache/cassandra/db/lifecycle/Tracker.java | 11 +-
.../io/sstable/SSTableDeletingTask.java | 36 ++----
.../cassandra/io/sstable/SSTableRewriter.java | 33 +++--
.../io/sstable/format/SSTableReader.java | 128 ++++++++++++-------
.../cassandra/tools/StandaloneScrubber.java | 2 +-
.../cassandra/tools/StandaloneSplitter.java | 2 +-
.../cassandra/tools/StandaloneUpgrader.java | 2 +-
.../cassandra/db/lifecycle/HelpersTest.java | 4 +-
.../cassandra/db/lifecycle/TrackerTest.java | 9 +-
.../io/sstable/SSTableRewriterTest.java | 2 +-
13 files changed, 131 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b7e9733,bc4b57c..80864af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,6 -19,11 +32,8 @@@
* Add logback metrics (CASSANDRA-9378)
* Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583)
Merged from 2.1:
-=======
-2.1.8
+ * Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700)
->>>>>>> cassandra-2.1
* Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681)
* Update internal python driver for cqlsh (CASSANDRA-9064)
* Fix IndexOutOfBoundsException when inserting tuple with too many
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
index 13bfd6d,ec6439c..f0eb67f
--- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
@@@ -43,13 -42,13 +43,13 @@@ public class SSTableDeletingTask implem
// and delete will fail (on Windows) until it is (we only force the unmapping on SUN VMs).
// Additionally, we need to make sure to delete the data file first, so on restart the others
// will be recognized as GCable.
- private static final Set<SSTableDeletingTask> failedTasks = new CopyOnWriteArraySet<>();
+ private static final Queue<SSTableDeletingTask> failedTasks = new ConcurrentLinkedQueue<>();
private static final Blocker blocker = new Blocker();
- private final SSTableReader referent;
private final Descriptor desc;
private final Set<Component> components;
- private Tracker tracker;
+ private final long bytesOnDisk;
+ private final Counter totalDiskSpaceUsed;
/**
* realDescriptor is the actual descriptor for the sstable, the descriptor inside
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72bb4c0c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------