Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33eada06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33eada06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33eada06
Branch: refs/heads/trunk
Commit: 33eada06a6dd3529da644377dba180795f522176
Parents: 4dd7faa 732c43b
Author: Benedict Elliott Smith
Authored: Mon Dec 10 15:07:18 2018 +
Committer: Benedict Elliott Smith
Committed: Mon Dec 10 15:07:18 2018 +
--
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 8 ++--
.../compaction/AbstractCompactionStrategy.java | 5 ++-
.../db/compaction/AbstractStrategyHolder.java | 3 +-
.../db/compaction/CompactionStrategyHolder.java | 5 ++-
.../compaction/CompactionStrategyManager.java | 5 ++-
.../db/compaction/PendingRepairHolder.java | 5 ++-
.../db/lifecycle/LifecycleNewTracker.java | 47
.../db/lifecycle/LifecycleTransaction.java | 7 ++-
.../apache/cassandra/db/lifecycle/LogFile.java | 24 --
.../cassandra/db/lifecycle/LogTransaction.java | 4 +-
.../CassandraEntireSSTableStreamReader.java | 5 ++-
.../db/streaming/CassandraStreamReader.java | 5 ++-
.../db/streaming/CassandraStreamReceiver.java | 47
.../io/sstable/SimpleSSTableMultiWriter.java| 16 +++
.../sstable/format/RangeAwareSSTableWriter.java | 12 ++---
.../io/sstable/format/SSTableWriter.java| 20 -
.../io/sstable/format/big/BigFormat.java| 6 +--
.../io/sstable/format/big/BigTableWriter.java | 6 +--
.../format/big/BigTableZeroCopyWriter.java | 5 ++-
.../locator/AbstractReplicationStrategy.java| 2 +-
.../cassandra/streaming/StreamReceiveTask.java | 2 +-
.../unit/org/apache/cassandra/db/ScrubTest.java | 5 ++-
23 files changed, 166 insertions(+), 79 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33eada06/CHANGES.txt
--
diff --cc CHANGES.txt
index 75b05ea,20da1fa..b8410b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -338,7 -2,9 +338,8 @@@
* Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
* Correct sstable sorting for garbagecollect and levelled compaction
(CASSANDRA-14870)
Merged from 3.0:
+ * Streaming needs to synchronise access to LifecycleTransaction
(CASSANDRA-14554)
* Fix cassandra-stress write hang with default options (CASSANDRA-14616)
- * Differentiate between slices and RTs when decoding legacy bounds
(CASSANDRA-14919)
* Netty epoll IOExceptions caused by unclean client disconnects being logged
at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty
(CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts
in some cases (CASSANDRA-14894)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33eada06/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c5149cf,700c1cc..cc6af6f
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -497,15 -507,15 +497,15 @@@ public class ColumnFamilyStore implemen
return directories;
}
- public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, int
sstableLevel, SerializationHeader header, LifecycleTransaction txn)
-public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount, long repairedAt, int sstableLevel, SerializationHeader header,
LifecycleNewTracker lifecycleNewTracker)
++public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, int
sstableLevel, SerializationHeader header, LifecycleNewTracker
lifecycleNewTracker)
{
-MetadataCollector collector = new
MetadataCollector(metadata.comparator).sstableLevel(sstableLevel);
-return createSSTableMultiWriter(descriptor, keyCount, repairedAt,
collector, header, lifecycleNewTracker);
+MetadataCollector collector = new
MetadataCollector(metadata().comparator).sstableLevel(sstableLevel);
- return createSSTableMultiWriter(descriptor, keyCount, repairedAt,
pendingRepair, isTransient, collector, header, txn);
++return createSSTableMultiWriter(descriptor, keyCount, repairedAt,
pendingRepair, isTransient, collector, header, lifecycleNewTracker);
}
-
