Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b67666
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b67666
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b67666
Branch: refs/heads/trunk
Commit: c7b67666d8665f13a66aba218c64c5979c3f20bf
Parents: 405c251 8b96334
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu May 16 11:42:42 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu May 16 11:42:42 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 90 ++++++++++-----
.../org/apache/cassandra/streaming/StreamOut.java | 31 +++++-
.../cassandra/streaming/StreamingRepairTask.java | 7 +-
4 files changed, 94 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 543765c,619e415..8d1410e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,6 +1,54 @@@
+2.0
+ * JEMalloc support for off-heap allocation (CASSANDRA-3997)
+ * Single-pass compaction (CASSANDRA-4180)
+ * Removed token range bisection (CASSANDRA-5518)
+ * Removed compatibility with pre-1.2.5 sstables and network messages
+ (CASSANDRA-5511)
+ * removed PBSPredictor (CASSANDRA-5455)
+ * CAS support (CASSANDRA-5062, 5441, 5443)
+ * Leveled compaction performs size-tiered compactions in L0
+ (CASSANDRA-5371, 5439)
+ * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339)
+ * Log when a node is down longer than the hint window (CASSANDRA-4554)
+ * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917)
+ * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407)
+ * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
+ * Change Message IDs to ints (CASSANDRA-5307)
+ * Move sstable level information into the Stats component, removing the
+ need for a separate Manifest file (CASSANDRA-4872)
+ * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
+ * make index_interval configurable per columnfamily (CASSANDRA-3961)
+ * add default_time_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+ * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
+ * upgrade thrift to 0.9.0 (CASSANDRA-3719)
+ * drop unnecessary keyspace parameter from user-defined compaction API
+ (CASSANDRA-5139)
+ * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
+ * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
+ * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
+ * Allow custom configuration loader (CASSANDRA-5045)
+ * Remove memory emergency pressure valve logic (CASSANDRA-3534)
+ * Reduce request latency with eager retry (CASSANDRA-4705)
+ * cqlsh: Remove ASSUME command (CASSANDRA-5331)
+ * Rebuild BF when loading sstables if bloom_filter_fp_chance
+ has changed since compaction (CASSANDRA-5015)
+ * remove row-level bloom filters (CASSANDRA-4885)
+ * Change Kernel Page Cache skipping into row preheating (disabled by default)
+ (CASSANDRA-4937)
+ * Improve repair by deciding on a gcBefore before sending
+ out TreeRequests (CASSANDRA-4932)
+ * Add an official way to disable compactions (CASSANDRA-5074)
+ * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919)
+ * Add binary protocol versioning (CASSANDRA-5436)
+ * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530)
+ * Add alias support to SELECT statement (CASSANDRA-5075)
+ * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541)
+
+
1.2.6
* Write row markers when serializing schema (CASSANDRA-5572)
+ * Check only SSTables for the requested range when streaming (CASSANDRA-5569)
1.2.5
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 05784ce,055c415..36c1db0
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1461,9 -1413,9 +1495,9 @@@ public class ColumnFamilyStore implemen
final RowPosition startWith = range.left;
final RowPosition stopAt = range.right;
- QueryFilter filter = new QueryFilter(null, new
QueryPath(columnFamily, superColumn, null), columnFilter);
+ QueryFilter filter = new QueryFilter(null, name, columnFilter);
- final ViewFragment view = markReferenced(startWith, stopAt);
+ final ViewFragment view = markReferenced(range);
Tracing.trace("Executing seq scan across {} sstables for {}",
view.sstables.size(), range.getString(metadata.getKeyValidator()));
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/src/java/org/apache/cassandra/streaming/StreamOut.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/src/java/org/apache/cassandra/streaming/StreamingRepairTask.java
----------------------------------------------------------------------
