cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/4] git commit: merge from 1.0
Date Thu, 09 Feb 2012 21:36:48 GMT
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/a5764082
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5764082
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5764082

Branch: refs/heads/trunk
Commit: a57640822daa8dfe7df01cb59a6fe69f7a519808
Parents: db3f908 c3dc789
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Feb 9 15:35:48 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Feb 9 15:35:48 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    7 ++++---
 .../service/RangeSliceResponseResolver.java        |   10 +++++++---
 .../org/apache/cassandra/service/StorageProxy.java |    3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5764082/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fe04571,0875da5..8b97c73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,80 -1,8 +1,81 @@@
 +1.1-dev
 + * 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)
 + * 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 key_validation_class in ALTER TABLE (CASSANDRA-3781)
 + * turn compression on by default (CASSANDRA-3871)
- Merged from 1.0:
-  * Only snapshot CF being compacted for snapshot_before_compaction 
-    (CASSANDRA-3803)
 +
 +
  1.0.8
+  * avoid including non-queried nodes in rangeslice read repair
+    (CASSANDRA-3843)
+  * Only snapshot CF being compacted for snapshot_before_compaction 
+    (CASSANDRA-3803)
   * 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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5764082/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 532992a,27db551..310836e
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -860,15 -811,18 +860,16 @@@ public class StorageProxy implements St
                  }
                  else
                  {
 -                    RangeSliceCommand c2 = new RangeSliceCommand(command.keyspace, command.column_family,
command.super_column, command.predicate, range, command.max_keys);
 -
                      // collect replies and resolve according to consistency level
-                     RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(nodeCmd.keyspace,
liveEndpoints);
 -                    RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(command.keyspace);
 -                    ReadCallback<Iterable<Row>> handler = getReadCallback(resolver,
command, consistency_level, liveEndpoints);
++                    RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(nodeCmd.keyspace);
 +                    ReadCallback<Iterable<Row>> handler = getReadCallback(resolver,
nodeCmd, consistency_level, liveEndpoints);
                      handler.assureSufficientLiveNodes();
+                     resolver.setSources(handler.endpoints);
                      for (InetAddress endpoint : handler.endpoints)
                      {
 -                        MessagingService.instance().sendRR(c2, endpoint, handler);
 +                        MessagingService.instance().sendRR(nodeCmd, endpoint, handler);
                          if (logger.isDebugEnabled())
 -                            logger.debug("reading " + c2 + " from " + endpoint);
 +                            logger.debug("reading " + nodeCmd + " from " + endpoint);
                      }
  
                      try


Mime
View raw message