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 2015/05/08 10:46:05 UTC
[1/2] cassandra git commit: Avoid potential overlap in LCS with
single-partition sstables
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 09ccf60ed -> e2ad784c7
Avoid potential overlap in LCS with single-partition sstables
Patch by marcuse; reviewed by yukim for CASSANDRA-9322
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/917068dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/917068dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/917068dc
Branch: refs/heads/cassandra-2.1
Commit: 917068dcbfb9909b5f1695dc18e9a7b250264b42
Parents: 58de86b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 7 13:56:51 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri May 8 10:40:15 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/917068dc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8473777..1540d28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Avoid potential overlap in LCS with single-partition sstables (CASSANDRA-9322)
* Log warning message when a table is queried before the schema has fully
propagated (CASSANDRA-9136)
* Overload SecondaryIndex#indexes to accept the column definition (CASSANDRA-9314)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/917068dc/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 867b5ce..81c65e4 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -353,6 +353,8 @@ public class LeveledManifest
if (max == null || candidate.last.compareTo(max) > 0)
max = candidate.last;
}
+ if (min == null || max == null || min.equals(max)) // single partition sstables - we cannot include a high level sstable.
+ return candidates;
Set<SSTableReader> compacting = cfs.getDataTracker().getCompacting();
Range<RowPosition> boundaries = new Range<>(min, max);
for (SSTableReader sstable : getLevel(i))
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2ad784c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2ad784c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2ad784c
Branch: refs/heads/cassandra-2.1
Commit: e2ad784c73f6084de072b01d4652812c226b19be
Parents: 09ccf60 917068d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri May 8 10:44:34 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri May 8 10:44:34 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 098cfe0,1540d28..37f0117
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
-2.0.15:
+2.1.6
+ * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
+ * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
+ * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057)
+ * Add support for top-k custom 2i queries (CASSANDRA-8717)
+ * Fix error when dropping table during compaction (CASSANDRA-9251)
+ * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773)
+ * Add support for rate limiting log messages (CASSANDRA-9029)
+ * Log the partition key with tombstone warnings (CASSANDRA-8561)
+ * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
+ * Fix PITR commitlog replay (CASSANDRA-9195)
+ * GCInspector logs very different times (CASSANDRA-9124)
+ * Fix deleting from an empty list (CASSANDRA-9198)
+ * Update tuple and collection types that use a user-defined type when that UDT
+ is modified (CASSANDRA-9148, CASSANDRA-9192)
+ * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
+ * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
+Merged from 2.0:
+ * Avoid potential overlap in LCS with single-partition sstables (CASSANDRA-9322)
* Log warning message when a table is queried before the schema has fully
propagated (CASSANDRA-9136)
* Overload SecondaryIndex#indexes to accept the column definition (CASSANDRA-9314)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------