[07/10] git commit: merge from 1.2
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0ff52e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0ff52e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0ff52e5 Branch: refs/heads/trunk Commit: c0ff52e5b4e19be0a8a594942b0e9c7e454e1735 Parents: a212516 b684937 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Feb 19 16:15:10 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Feb 19 16:15:10 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/CHANGES.txt -- diff --cc CHANGES.txt index 83b03de,11fcf18..4fffb9a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,7 +1,25 @@@ -1.2.16 +2.0.6 + * Allow repairing between specific replicas (CASSANDRA-6440) + * Allow per-dc enabling of hints (CASSANDRA-6157) + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) + * Fix EstimatedHistogram races (CASSANDRA-6682) + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) + * Improve nodetool cfhistograms formatting (CASSANDRA-6360) + * Expose bulk loading progress over JMX (CASSANDRA-4757) + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) + * Make commitlog failure handling configurable (CASSANDRA-6364) + * Avoid overlaps in LCS (CASSANDRA-6688) + * Improve support for paginating over composites (CASSANDRA-4851) + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707) + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566) + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714) +Merged from 1.2: + * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) - * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 - (CASSANDRA-6732) * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/src/java/org/apache/cassandra/service/StorageService.java --
[07/10] git commit: merge from 1.2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dc4c16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc4c16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dc4c16d
Branch: refs/heads/trunk
Commit: 9dc4c16d7e535eaed36ad112986304812d6147be
Parents: c8b220b 572cddc
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 21 12:31:17 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 21 12:31:17 2013 -0500
--
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dc4c16d/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
--
diff --cc src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index 2f5e5ca,fb32043..438d90f
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@@ -117,13 -117,13 +117,13 @@@ public class OffHeapBitSet implements I
return type.sizeof((int) bytes.size()) + bytes.size();
}
-public static OffHeapBitSet deserialize(DataInput dis) throws IOException
+public static OffHeapBitSet deserialize(DataInput in) throws IOException
{
- int byteCount = in.readInt() * 8;
-long byteCount = dis.readInt() * 8L;
++long byteCount = in.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i byteCount;)
+ for (long i = 0; i byteCount;)
{
-long v = dis.readLong();
+long v = in.readLong();
memory.setByte(i++, (byte) (v 0));
memory.setByte(i++, (byte) (v 8));
memory.setByte(i++, (byte) (v 16));
[07/10] git commit: merge from 1.2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df9d61c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df9d61c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df9d61c9
Branch: refs/heads/trunk
Commit: df9d61c98ff007e26e9a7dcd793e13e056e696c8
Parents: 5bf1fc1 bc98886
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 19 18:03:51 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 19 18:03:51 2013 -0500
--
CHANGES.txt | 5 +
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++
2 files changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9d61c9/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c2b924,bc3f2c6..83966d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,8 +1,34 @@@
-1.2.9
++2.0.0
++Merged from 1.2:
+ * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
- * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
- (CASSANDRA-5800)
- * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
++
++
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
+ * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
+ * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
+ * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
+Merged from 1.2:
+ * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
+ * cqlsh: add support for multiline comments (CASSANDRA-5798)
+ * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
+ (CASSANDRA-5856)
+
+
+2.0.0-rc1
+ * improve DecimalSerializer performance (CASSANDRA-5837)
+ * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
+ * fix schema-related trigger issues (CASSANDRA-5774)
+ * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
+ * Fix assertion error during repair (CASSANDRA-5801)
+ * Fix range tombstone bug (CASSANDRA-5805)
+ * DC-local CAS (CASSANDRA-5797)
+ * Add a native_protocol_version column to the system.local table
(CASSANRDA-5819)
+ * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
+ * Fix buffer underflow on socket close (CASSANDRA-5792)
+Merged from 1.2:
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9d61c9/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 4a62d85,06b1739..814790a
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -590,7 -593,9 +590,9 @@@ public class SSTableReader extends SSTa
public long getBloomFilterSerializedSize()
{
+ if (bf instanceof AlwaysPresentFilter)
+ return 0;
-return FilterFactory.serializedSize(bf,
descriptor.version.filterType);
+return FilterFactory.serializedSize(bf);
}
/**
