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/04/02 19:27:17 UTC
[7/44] git commit: merge from 1.0
merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2462c6a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2462c6a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2462c6a2
Branch: refs/heads/cassandra-1.1
Commit: 2462c6a2a52e91036286bc256054e2b7d882449a
Parents: ef50e8f 6be7009
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Apr 2 12:18:51 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Apr 2 12:18:51 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 10 ++++++-
conf/cassandra-env.sh | 2 +-
.../cassandra/net/IncomingTcpConnection.java | 21 +++++++--------
.../org/apache/cassandra/cli/CliHelp.yaml | 2 +-
4 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2462c6a2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index efb4ebe,7dae655..7096968
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -55,96 -18,16 +55,104 @@@ Merged from 1.0
* fix totalBytes count for parallel compactions (CASSANDRA-3758)
* fix intermittent NPE in get_slice (CASSANDRA-4095)
* remove unnecessary asserts in native code interfaces (CASSANDRA-4096)
+ * Validate blank keys in CQL to avoid assertion errors (CASSANDRA-3612)
+ * cqlsh: fix bad decoding of some column names (CASSANDRA-4003)
+ * cqlsh: fix incorrect padding with unicode chars (CASSANDRA-4033)
+ * Fix EC2 snitch incorrectly reporting region (CASSANDRA-4026)
+ * Shut down thrift during decommission (CASSANDRA-4086)
+ * Expose nodetool cfhistograms for 2ndary indexes (CASSANDRA-4063)
+ Merged from 0.8:
+ * Fix ConcurrentModificationException in gossiper (CASSANDRA-4019)
+1.1-beta1
+ * (cqlsh)
+ + add SOURCE and CAPTURE commands, and --file option (CASSANDRA-3479)
+ + add ALTER COLUMNFAMILY WITH (CASSANDRA-3523)
+ + bundle Python dependencies with Cassandra (CASSANDRA-3507)
+ + added to Debian package (CASSANDRA-3458)
+ + display byte data instead of erroring out on decode failure
+ (CASSANDRA-3874)
+ * add nodetool rebuild_index (CASSANDRA-3583)
+ * add nodetool rangekeysample (CASSANDRA-2917)
+ * Fix streaming too much data during move operations (CASSANDRA-3639)
+ * Nodetool and CLI connect to localhost by default (CASSANDRA-3568)
+ * Reduce memory used by primary index sample (CASSANDRA-3743)
+ * (Hadoop) separate input/output configurations (CASSANDRA-3197, 3765)
+ * avoid returning internal Cassandra classes over JMX (CASSANDRA-2805)
+ * add row-level isolation via SnapTree (CASSANDRA-2893)
+ * Optimize key count estimation when opening sstable on startup
+ (CASSANDRA-2988)
+ * multi-dc replication optimization supporting CL > ONE (CASSANDRA-3577)
+ * add command to stop compactions (CASSANDRA-1740, 3566, 3582)
+ * multithreaded streaming (CASSANDRA-3494)
+ * removed in-tree redhat spec (CASSANDRA-3567)
+ * "defragment" rows for name-based queries under STCS, again (CASSANDRA-2503)
+ * Recycle commitlog segments for improved performance
+ (CASSANDRA-3411, 3543, 3557, 3615)
+ * update size-tiered compaction to prioritize small tiers (CASSANDRA-2407)
+ * add message expiration logic to OutboundTcpConnection (CASSANDRA-3005)
+ * off-heap cache to use sun.misc.Unsafe instead of JNA (CASSANDRA-3271)
+ * EACH_QUORUM is only supported for writes (CASSANDRA-3272)
+ * replace compactionlock use in schema migration by checking CFS.isValid
+ (CASSANDRA-3116)
+ * recognize that "SELECT first ... *" isn't really "SELECT *" (CASSANDRA-3445)
+ * Use faster bytes comparison (CASSANDRA-3434)
+ * Bulk loader is no longer a fat client, (HADOOP) bulk load output format
+ (CASSANDRA-3045)
+ * (Hadoop) add support for KeyRange.filter
+ * remove assumption that keys and token are in bijection
+ (CASSANDRA-1034, 3574, 3604)
+ * 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)
+ * Remove columns shadowed by a deleted container even when we cannot purge
+ (CASSANDRA-3538)
+ * Improve memtable slice iteration performance (CASSANDRA-3545)
+ * more efficient allocation of small bloom filters (CASSANDRA-3618)
+ * Use separate writer thread in SSTableSimpleUnsortedWriter (CASSANDRA-3619)
+ * fsync the directory after new sstable or commitlog segment are created (CASSANDRA-3250)
+ * fix minor issues reported by FindBugs (CASSANDRA-3658)
+ * global key/row caches (CASSANDRA-3143, 3849)
+ * optimize memtable iteration during range scan (CASSANDRA-3638)
+ * introduce 'crc_check_chance' in CompressionParameters to support
+ a checksum percentage checking chance similarly to read-repair (CASSANDRA-3611)
+ * a way to deactivate global key/row cache on per-CF basis (CASSANDRA-3667)
+ * fix LeveledCompactionStrategy broken because of generation pre-allocation
+ in LeveledManifest (CASSANDRA-3691)
+ * finer-grained control over data directories (CASSANDRA-2749)
+ * Fix ClassCastException during hinted handoff (CASSANDRA-3694)
+ * Upgrade Thrift to 0.7 (CASSANDRA-3213)
+ * Make stress.java insert operation to use microseconds (CASSANDRA-3725)
+ * Allows (internally) doing a range query with a limit of columns instead of
+ rows (CASSANDRA-3742)
+ * Allow rangeSlice queries to be start/end inclusive/exclusive (CASSANDRA-3749)
+ * Fix BulkLoader to support new SSTable layout and add stream
+ throttling to prevent an NPE when there is no yaml config (CASSANDRA-3752)
+ * Allow concurrent schema migrations (CASSANDRA-1391, 3832)
+ * Add SnapshotCommand to trigger snapshot on remote node (CASSANDRA-3721)
+ * Make CFMetaData conversions to/from thrift/native schema inverses
+ (CASSANDRA_3559)
+ * Add initial code for CQL 3.0-beta (CASSANDRA-3781, 3753)
+ * Add wide row support for ColumnFamilyInputFormat (CASSANDRA-3264)
+ * Allow extending CompositeType comparator (CASSANDRA-3657)
+ * Avoids over-paging during get_count (CASSANDRA-3798)
+ * Add new command to rebuild a node without (repair) merkle tree calculations
+ (CASSANDRA-3483, 3922)
+ * respect not only row cache capacity but caching mode when
+ trying to read data (CASSANDRA-3812)
+ * fix system tests (CASSANDRA-3827)
+ * CQL support for altering row key type in ALTER TABLE (CASSANDRA-3781)
+ * turn compression on by default (CASSANDRA-3871)
+ * make hexToBytes refuse invalid input (CASSANDRA-2851)
+ * Make secondary indexes CF inherit compression and compaction from their
+ parent CF (CASSANDRA-3877)
+ * Finish cleanup up tombstone purge code (CASSANDRA-3872)
+ * Avoid NPE on aboarted stream-out sessions (CASSANDRA-3904)
+ * BulkRecordWriter throws NPE for counter columns (CASSANDRA-3906)
+ * Support compression using BulkWriter (CASSANDRA-3907)
+
+
1.0.8
* fix race between cleanup and flush on secondary index CFSes (CASSANDRA-3712)
* avoid including non-queried nodes in rangeslice read repair
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2462c6a2/conf/cassandra-env.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2462c6a2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index f329636,a9a5809..a1140c2
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -97,13 -98,11 +96,11 @@@ public class IncomingTcpConnection exte
// save the endpoint so gossip will reconnect to it
Gossiper.instance.addSavedEndpoint(from);
logger.info("Received " + (isStream ? "streaming " : "") + "connection from newer protocol version. Ignoring");
+ return;
}
- else if (msg != null)
- {
- Gossiper.instance.setVersion(from, version);
- logger.debug("set version for {} to {}", from, version);
- }
+ Gossiper.instance.setVersion(from, version);
+ logger.debug("set version for {} to {}", from, version);
-
+
// loop to get the next message.
while (true)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2462c6a2/src/resources/org/apache/cassandra/cli/CliHelp.yaml
----------------------------------------------------------------------
diff --cc src/resources/org/apache/cassandra/cli/CliHelp.yaml
index 5ddc110,12c7bf7..e22c2e4
--- a/src/resources/org/apache/cassandra/cli/CliHelp.yaml
+++ b/src/resources/org/apache/cassandra/cli/CliHelp.yaml
@@@ -676,9 -703,9 +676,9 @@@ commands
quotes are important (!) in this case)
It is also valid to specify the fully-qualified class name to a class that
- extends org.apache.Cassandra.db.marshal.AbstractType.
+ extends org.apache.cassandra.db.marshal.AbstractType.
- - key_valiation_class: Validator to use for keys.
+ - key_validation_class: Validator to use for keys.
Default is BytesType which applies no validation.
Supported values are: