cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/3] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Date Tue, 08 Nov 2016 17:13:04 GMT
Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 472f61613e4bf2a2f492f49300e6e3d06c5ad728
Parents: 92594d8 3de6e9d
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Tue Nov 8 18:01:55 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Tue Nov 8 18:01:55 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                              | 1 +
 test/unit/org/apache/cassandra/Util.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d3043b8,b550885..cc5b003
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.2.9
 +3.0.10
 + * Batch with multiple conditional updates for the same partition causes AssertionError
(CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time (CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column (CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL value for LWTs
on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that generated the
byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
 + * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised after node startup
(CASSANDRA-12813)
   * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/test/unit/org/apache/cassandra/Util.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/Util.java
index d04ca9b,f6b4771..e8b42bc
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@@ -28,29 -27,21 +28,31 @@@ import java.nio.ByteBuffer
  import java.util.*;
  import java.util.concurrent.Callable;
  import java.util.concurrent.Future;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.function.Supplier;
  
 -import com.google.common.base.Supplier;
 +import com.google.common.base.Function;
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.Iterators;
 +import org.apache.commons.lang3.StringUtils;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
+ 
  import org.apache.cassandra.db.*;
 -import org.apache.cassandra.db.composites.*;
 +import org.apache.cassandra.db.Directories.DataDirectory;
  import org.apache.cassandra.db.compaction.AbstractCompactionTask;
  import org.apache.cassandra.db.compaction.CompactionManager;
 -import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 -import org.apache.cassandra.db.filter.IDiskAtomFilter;
 -import org.apache.cassandra.db.filter.QueryFilter;
 -import org.apache.cassandra.db.filter.SliceQueryFilter;
 -import org.apache.cassandra.db.filter.NamesQueryFilter;
  import org.apache.cassandra.db.marshal.AbstractType;
 -import org.apache.cassandra.dht.*;
 +import org.apache.cassandra.db.partitions.*;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.dht.IPartitioner;
++
  import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.dht.Token;
  import org.apache.cassandra.gms.ApplicationState;
  import org.apache.cassandra.gms.Gossiper;
  import org.apache.cassandra.gms.VersionedValue;


Mime
View raw message