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/01/22 15:52:08 UTC
[1/2] cassandra git commit: Make sure we don't add tmplink sstables
to the compaction strategy
Repository: cassandra
Updated Branches:
refs/heads/trunk 9fcb409f5 -> 10b8a765b
Make sure we don't add tmplink sstables to the compaction strategy
Patch by marcuse; reviewed by ayeschenko for CASSANDRA-8580
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bedeff4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bedeff4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bedeff4
Branch: refs/heads/trunk
Commit: 6bedeff4fd1af436c47e45e239f22668f84702f2
Parents: 8092d2c
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jan 22 15:48:15 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jan 22 15:50:18 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../db/compaction/WrappingCompactionStrategy.java | 11 +++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bedeff4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 54f734c..ad9cb94 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.3
+ * Make sure we don't add tmplink files to the compaction
+ strategy (CASSANDRA-8580)
* (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
* (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
* Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bedeff4/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
index c88bdf0..2f8bd7c 100644
--- a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
@@ -323,10 +323,13 @@ public final class WrappingCompactionStrategy extends AbstractCompactionStrategy
super.startup();
for (SSTableReader sstable : cfs.getSSTables())
{
- if (sstable.isRepaired())
- repaired.addSSTable(sstable);
- else
- unrepaired.addSSTable(sstable);
+ if (sstable.openReason != SSTableReader.OpenReason.EARLY)
+ {
+ if (sstable.isRepaired())
+ repaired.addSSTable(sstable);
+ else
+ unrepaired.addSSTable(sstable);
+ }
}
repaired.startup();
unrepaired.startup();
[2/2] cassandra 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/10b8a765
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10b8a765
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10b8a765
Branch: refs/heads/trunk
Commit: 10b8a765bedc2ae57cd72050f99f89d81068f7f4
Parents: 9fcb409 6bedeff
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jan 22 15:51:25 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jan 22 15:51:25 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../db/compaction/WrappingCompactionStrategy.java | 11 +++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b8a765/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b62282a,ad9cb94..cdcb5cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,9 +1,64 @@@
+3.0
+ * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
+ * Support direct buffer decompression for reads (CASSANDRA-8464)
+ * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
+ * Add role based access control (CASSANDRA-7653)
+ * Group sstables for anticompaction correctly (CASSANDRA-8578)
+ * Add ReadFailureException to native protocol, respond
+ immediately when replicas encounter errors while handling
+ a read request (CASSANDRA-7886)
+ * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
+ * Allow mixing token and partition key restrictions (CASSANDRA-7016)
+ * Support index key/value entries on map collections (CASSANDRA-8473)
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
+ APIs (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * 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)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063, 7813, 7708)
+ * 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)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+
+
2.1.3
+ * Make sure we don't add tmplink files to the compaction
+ strategy (CASSANDRA-8580)
* (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
* (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
- * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
* Add tooling to detect hot partitions (CASSANDRA-7974)
* Fix cassandra-stress user-mode truncation of partition generation (CASSANDRA-8608)
* Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b8a765/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
----------------------------------------------------------------------