cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/10] git commit: merge from 1.1
Date Thu, 06 Dec 2012 22:15:41 GMT
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/b537567b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b537567b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b537567b

Branch: refs/heads/cassandra-1.2
Commit: b537567b379e098329da10a534d16e856918b6fc
Parents: 7322f82 8d55474
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Dec 6 16:15:13 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Dec 6 16:15:13 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../apache/cassandra/service/MigrationManager.java |   43 +++++++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a3187d,5d1fd8d..385dca6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,13 +1,54 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
++Merged from 1.1
+  * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries (CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
     (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 80f8cd9,102ea12..4cffdfc
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -21,8 -25,6 +21,13 @@@ import java.io.*
  import java.net.InetAddress;
  import java.nio.ByteBuffer;
  import java.util.*;
++<<<<<<< HEAD
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.CopyOnWriteArrayList;
++||||||| merged common ancestors
++import java.util.concurrent.Callable;
++=======
++>>>>>>> cassandra-1.1
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.Future;
  import java.util.ArrayList;
@@@ -101,10 -92,10 +107,10 @@@ public class MigrationManager implement
      public void onRemove(InetAddress endpoint)
      {}
  
-     private static void rectifySchema(UUID theirVersion, final InetAddress endpoint)
+     private static void maybeScheduleSchemaPull(final UUID theirVersion, final InetAddress
endpoint)
      {
          // Can't request migrations from nodes with versions younger than 1.1.7
 -        if (Gossiper.instance.getVersion(endpoint) < MessagingService.VERSION_117)
 +        if (MessagingService.instance().getVersion(endpoint) < MessagingService.VERSION_117)
              return;
  
          if (Schema.instance.getVersion().equals(theirVersion))


Mime
View raw message