You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/02/01 20:27:07 UTC
[4/16] git commit: merge from 0.8
merge from 0.8
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d8ef13c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d8ef13c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d8ef13c
Branch: refs/heads/trunk
Commit: 2d8ef13cce98c166aa175508b6c127efb7f6e9ae
Parents: 505e196 359391f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 1 13:11:54 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 1 13:11:54 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 15 +++++++++++++++
.../apache/cassandra/db/commitlog/CommitLog.java | 3 ++-
2 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d8ef13c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 078de4f,513d0ab..b201961
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,87 -1,15 +1,102 @@@
-0.8.10
+1.0.8
+ * Log active compactions in StatusLogger (CASSANDRA-3703)
+ * Compute more accurate compaction score per level (CASSANDRA-3790)
+ * Return InvalidRequest when using a keyspace that doesn't exist
+ (CASSANDRA-3764)
+ * disallow user modification of System keyspace (CASSANDRA-3738)
+ * allow using sstable2json on secondary index data (CASSANDRA-3738)
+ * (cqlsh) add DESCRIBE COLUMNFAMILIES (CASSANDRA-3586)
+ * (cqlsh) format blobs correctly and use colors to improve output
+ readability (CASSANDRA-3726)
+ * synchronize BiMap of bootstrapping tokens (CASSANDRA-3417)
+ * show index options in CLI (CASSANDRA-3809)
+Merged from 0.8:
+ * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
+ case (CASSANDRA-3251)
+ * fix thread safety issues in commitlog replay, primarily affecting
+ systems with many (100s) of CF definitions (CASSANDRA-3751)
+
+
+1.0.7
+ * fix regression in HH page size calculation (CASSANDRA-3624)
+ * retry failed stream on IOException (CASSANDRA-3686)
+ * allow configuring bloom_filter_fp_chance (CASSANDRA-3497)
+ * attempt hint delivery every ten minutes, or when failure detector
+ notifies us that a node is back up, whichever comes first. hint
+ handoff throttle delay default changed to 1ms, from 50 (CASSANDRA-3554)
+ * add nodetool setstreamthroughput (CASSANDRA-3571)
+ * fix assertion when dropping a columnfamily with no sstables (CASSANDRA-3614)
+ * more efficient allocation of small bloom filters (CASSANDRA-3618)
+ * CLibrary.createHardLinkWithExec() to check for errors (CASSANDRA-3101)
+ * Avoid creating empty and non cleaned writer during compaction (CASSANDRA-3616)
+ * stop thrift service in shutdown hook so we can quiesce MessagingService
+ (CASSANDRA-3335)
+ * (CQL) compaction_strategy_options and compression_parameters for
+ CREATE COLUMNFAMILY statement (CASSANDRA-3374)
+ * Reset min/max compaction threshold when creating size tiered compaction
+ strategy (CASSANDRA-3666)
+ * Don't ignore IOException during compaction (CASSANDRA-3655)
+ * Fix assertion error for CF with gc_grace=0 (CASSANDRA-3579)
+ * Shutdown ParallelCompaction reducer executor after use (CASSANDRA-3711)
+ * Avoid < 0 value for pending tasks in leveled compaction (CASSANDRA-3693)
+ * (Hadoop) Support TimeUUID in Pig CassandraStorage (CASSANDRA-3327)
+ * Check schema is ready before continuing boostrapping (CASSANDRA-3629)
+ * Catch overflows during parsing of chunk_length_kb (CASSANDRA-3644)
+ * Improve stream protocol mismatch errors (CASSANDRA-3652)
+ * Avoid multiple thread doing HH to the same target (CASSANDRA-3681)
+ * Add JMX property for rp_timeout_in_ms (CASSANDRA-2940)
+ * Allow DynamicCompositeType to compare component of different types
+ (CASSANDRA-3625)
+ * Flush non-cfs backed secondary indexes (CASSANDRA-3659)
+ * Secondary Indexes should report memory consumption (CASSANDRA-3155)
+ * fix for SelectStatement start/end key are not set correctly
+ when a key alias is involved (CASSANDRA-3700)
+ * fix CLI `show schema` command insert of an extra comma in
+ column_metadata (CASSANDRA-3714)
+Merged from 0.8:
+ * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
* prevent new nodes from thinking down nodes are up forever (CASSANDRA-3626)
* use correct list of replicas for LOCAL_QUORUM reads when read repair
is disabled (CASSANDRA-3696)
* block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733)
+
+
+1.0.6
+ * (CQL) fix cqlsh support for replicate_on_write (CASSANDRA-3596)
+ * fix adding to leveled manifest after streaming (CASSANDRA-3536)
+ * filter out unavailable cipher suites when using encryption (CASSANDRA-3178)
+ * (HADOOP) add old-style api support for CFIF and CFRR (CASSANDRA-2799)
+ * Support TimeUUIDType column names in Stress.java tool (CASSANDRA-3541)
+ * (CQL) INSERT/UPDATE/DELETE/TRUNCATE commands should allow CF names to
+ be qualified by keyspace (CASSANDRA-3419)
+ * always remove endpoints from delevery queue in HH (CASSANDRA-3546)
+ * fix race between cf flush and its 2ndary indexes flush (CASSANDRA-3547)
+ * fix potential race in AES when a repair fails (CASSANDRA-3548)
+ * fix default value validation usage in CLI SET command (CASSANDRA-3553)
+ * Optimize componentsFor method for compaction and startup time
+ (CASSANDRA-3532)
+ * (CQL) Proper ColumnFamily metadata validation on CREATE COLUMNFAMILY
+ (CASSANDRA-3565)
+ * fix compression "chunk_length_kb" option to set correct kb value for
+ thrift/avro (CASSANDRA-3558)
+ * fix missing response during range slice repair (CASSANDRA-3551)
+ * 'describe ring' moved from CLI to nodetool and available through JMX (CASSANDRA-3220)
+ * add back partitioner to sstable metadata (CASSANDRA-3540)
+ * fix NPE in get_count for counters (CASSANDRA-3601)
+Merged from 0.8:
++||||||| merged common ancestors
++
++
++0.8.9
++ * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
++=======
++ * block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733)
+ * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
+ case (CASSANDRA-3251)
+
+ 0.8.9
+ * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
++>>>>>>> cassandra-0.8
* remove invalid assertion that table was opened before dropping it
(CASSANDRA-3580)
* range and index scans now only send requests to enough replicas to
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d8ef13c/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 4766b17,ba1ebf0..c4942d2
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -48,10 -48,8 +48,11 @@@ import org.apache.cassandra.service.Sto
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
+ import org.cliffc.high_scale_lib.NonBlockingHashSet;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
/*
* Commit Log tracks every write operation into the system. The aim
* of the commit log is to be able to successfully recover data that was