cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Mon, 21 Aug 2017 23:01:02 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f8417c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f8417c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f8417c4

Branch: refs/heads/cassandra-3.11
Commit: 7f8417c400ff36be15d7b4d2a5a64706f090e288
Parents: b726f26 ec85b4a
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Aug 21 15:49:38 2017 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Aug 21 15:53:31 2017 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/SystemKeyspace.java | 22 +++++++++------
 .../cassandra/service/StorageService.java       | 28 +++++++++++---------
 .../apache/cassandra/db/SystemKeyspaceTest.java |  6 ++++-
 .../cassandra/gms/FailureDetectorTest.java      |  2 +-
 .../service/LeaveAndBootstrapTest.java          |  9 +++++--
 6 files changed, 43 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7d20ab3,d8b22f0..0520477
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -3.0.15
 +3.11.1
 + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
   * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
   * Fix digest calculation for counter cells (CASSANDRA-13750)
   * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump
to use type.toJSONString() (CASSANDRA-13573)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 6c45329,7ce74a1..ac51662
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -28,19 -29,21 +29,24 @@@ import java.util.stream.Collectors
  import java.util.stream.StreamSupport;
  import javax.management.openmbean.OpenDataException;
  import javax.management.openmbean.TabularData;
+ import java.util.concurrent.Future;
  
  import com.google.common.collect.HashMultimap;
 +import com.google.common.collect.ImmutableMap;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.collect.SetMultimap;
 +import com.google.common.collect.Sets;
  import com.google.common.io.ByteStreams;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
+ import com.google.common.util.concurrent.Futures;
+ 
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.SchemaConstants;
  import org.apache.cassandra.cql3.QueryProcessor;
  import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.cql3.functions.*;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java
index 256569f,d151f59..92f2a56
--- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java
@@@ -29,8 -30,9 +30,10 @@@ import org.apache.commons.io.FileUtils
  import org.junit.BeforeClass;
  import org.junit.Test;
  
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.SchemaConstants;
  import org.apache.cassandra.cql3.QueryProcessor;
  import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/gms/FailureDetectorTest.java
index dca00b1,83c3500..0dff95a
--- a/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java
+++ b/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java
@@@ -45,8 -45,8 +45,8 @@@ public class FailureDetectorTes
      {
          // slow unit tests can cause problems with FailureDetector's GC pause handling
          System.setProperty("cassandra.max_local_pause_in_ms", "20000");
- 
 -        DatabaseDescriptor.setDaemonInitialized();
 +        DatabaseDescriptor.daemonInitialization();
+         DatabaseDescriptor.createAllDirectories();
      }
  
      @Test

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f8417c4/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
index 19f0b7a,91a7ab2..c5f198e
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@@ -22,6 -22,8 +22,7 @@@ package org.apache.cassandra.service
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.*;
+ import java.util.concurrent.ExecutorService;
 -import java.util.concurrent.Future;
  
  import com.google.common.collect.HashMultimap;
  import com.google.common.collect.Multimap;
@@@ -33,7 -35,8 +34,9 @@@ import org.junit.Test
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
  import org.apache.cassandra.Util.PartitionerSwitcher;
 +import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.concurrent.Stage;
+ import org.apache.cassandra.concurrent.StageManager;
  import org.apache.cassandra.config.Schema;
  import org.apache.cassandra.db.SystemKeyspace;
  import org.apache.cassandra.dht.IPartitioner;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message