Updated Branches: refs/heads/cassandra-1.1 988ea81d4 -> 93bd3d896 refs/heads/trunk 1078e6f51 -> 5df3f13b6
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5df3f13b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5df3f13b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5df3f13b Branch: refs/heads/trunk Commit: 5df3f13b6ca993c9987c4e4b0319e01ff3895d54 Parents: 1078e6f 93bd3d8 Author: Jonathan Ellis <[email protected]> Authored: Thu Sep 27 09:30:28 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Sep 27 09:30:28 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnSerializer.java | 5 -- src/java/org/apache/cassandra/db/RowMutation.java | 46 +++++++++++++++ .../cassandra/locator/NetworkTopologyStrategy.java | 3 +- 4 files changed, 50 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 576f7a6,e48fbfd..f50f368 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,85 -1,5 +1,86 @@@ +1.2-beta2 + * optimize single-row PK lookups (CASSANDRA-4710) + * adjust blockFor calculation to account for pending ranges due to node + movement (CASSANDRA-833) + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649) + * (CQL3) Make prepared statement global instead of per connection (CASSANDRA-4449) + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685) + * (CQL3) Fix validation when using counter and regular columns in the same table + (CASSANDRA-4706) + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648 + * ) + +1.2-beta1 + * add atomic_batch_mutate (CASSANDRA-4542, -4635) + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632) + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477) + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487) + * add Murmur3Partitioner and make it default for new installations (CASSANDRA-3772, 4621) + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497) + * Finer grained exceptions hierarchy and provides error code with exceptions (CASSANDRA-3979) + * Adds events push to binary protocol (CASSANDRA-4480) + * Rewrite nodetool help (CASSANDRA-2293) + * Make CQL3 the default for CQL (CASSANDRA-4640) + * update stress tool to be able to use CQL3 (CASSANDRA-4406) + * Accept all thrift update on CQL3 cf but don't expose their metadata (CASSANDRA-4377) + * Replace Throttle with Guava's RateLimiter for HintedHandOff (CASSANDRA-4541) + * fix counter add/get using CQL2 and CQL3 in stress tool (CASSANDRA-4633) + * Add sstable count per level to cfstats (CASSANDRA-4537) + * (cql3) Add ALTER KEYSPACE statement (CASSANDRA-4611) + * (cql3) Allow defining default consistency levels (CASSANDRA-4448) + * (cql3) Fix queries using LIMIT missing results (CASSANDRA-4579) + * fix cross-version gossip messaging (CASSANDRA-4576) + + 1.1.6 + * NTS will default unconfigured DC replicas to zero (CASSANDRA-4675) * use default consistency level in counter validation if none is explicitly provide (CASSANDRA-4700) * Improve IAuthority interface by introducing fine-grained http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/src/java/org/apache/cassandra/db/ColumnSerializer.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnSerializer.java index 55cffe8,b6c71bb..19ec602 --- a/src/java/org/apache/cassandra/db/ColumnSerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnSerializer.java @@@ -106,15 -117,10 +106,10 @@@ public class ColumnSerializer implement else { long ts = dis.readLong(); - long now = FBUtilities.timestampMicros(); - - if (ts > now) // fixing the timestamp from the future to be 'now' in micros - ts = now; // helps with CASSANDRA-4561 as remote nodes can send schema with wrong nanoTime() timestamps - ByteBuffer value = ByteBufferUtil.readWithLength(dis); - return (b & COUNTER_UPDATE_MASK) != 0 + return (mask & COUNTER_UPDATE_MASK) != 0 ? new CounterUpdateColumn(name, value, ts) - : ((b & DELETION_MASK) == 0 + : ((mask & DELETION_MASK) == 0 ? new Column(name, value, ts) : new DeletedColumn(name, value, ts)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java ----------------------------------------------------------------------
