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/2922dbe4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2922dbe4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2922dbe4 Branch: refs/heads/trunk Commit: 2922dbe4baf6d9964a178540f5e16ee927d42d77 Parents: 77db8b0 05a3961 Author: Jonathan Ellis <[email protected]> Authored: Thu Apr 4 12:12:35 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Apr 4 12:12:35 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 14 +++++- src/java/org/apache/cassandra/cql3/Constants.java | 32 +++++++++++++ src/java/org/apache/cassandra/cql3/Cql.g | 3 + src/java/org/apache/cassandra/cql3/Lists.java | 36 ++++++++++----- src/java/org/apache/cassandra/cql3/Maps.java | 19 ++++---- src/java/org/apache/cassandra/cql3/Sets.java | 5 ++- src/java/org/apache/cassandra/cql3/Term.java | 3 +- .../compress/CompressedFileStreamTask.java | 4 +- 8 files changed, 89 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2922dbe4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 004607e,c1e2540..4ad46e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,8 +1,39 @@@ +2.0 + * 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) + + 1.2.4 + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2922dbe4/src/java/org/apache/cassandra/cql3/Constants.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2922dbe4/src/java/org/apache/cassandra/cql3/Lists.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/Lists.java index a457740,36694e5..e4ecb5e --- a/src/java/org/apache/cassandra/cql3/Lists.java +++ b/src/java/org/apache/cassandra/cql3/Lists.java @@@ -255,12 -258,14 +258,14 @@@ public abstract class List public void execute(ByteBuffer rowKey, ColumnFamily cf, ColumnNameBuilder prefix, UpdateParameters params) throws InvalidRequestException { - Term.Terminal index = idx.bind(params.variables); - Term.Terminal value = t.bind(params.variables); - assert index instanceof Constants.Value && value instanceof Constants.Value; + ByteBuffer index = idx.bindAndGet(params.variables); + ByteBuffer value = t.bindAndGet(params.variables); + + if (index == null) + throw new InvalidRequestException("Invalid null value for list index"); - List<Pair<ByteBuffer, IColumn>> existingList = params.getPrefetchedList(rowKey, columnName.key); + List<Pair<ByteBuffer, Column>> existingList = params.getPrefetchedList(rowKey, columnName.key); - int idx = ByteBufferUtil.toInt(((Constants.Value)index).bytes); + int idx = ByteBufferUtil.toInt(index); if (idx < 0 || idx >= existingList.size()) throw new InvalidRequestException(String.format("List index %d out of bound, list has size %d", idx, existingList.size())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/2922dbe4/src/java/org/apache/cassandra/streaming/compress/CompressedFileStreamTask.java ----------------------------------------------------------------------
