Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99f7ce9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99f7ce9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99f7ce9b Branch: refs/heads/cassandra-2.2 Commit: 99f7ce9bfb03ad5eda21d3604b3844fc193d0f6f Parents: 92e2e4e b757db1 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Thu Jul 2 10:33:51 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Thu Jul 2 10:33:51 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/AtomicBTreeColumns.java | 2 +- .../apache/cassandra/db/ColumnFamilyStore.java | 22 +++++- src/java/org/apache/cassandra/db/Memtable.java | 15 ++-- .../org/apache/cassandra/utils/FBUtilities.java | 10 +++ .../apache/cassandra/utils/memory/HeapPool.java | 4 +- .../utils/memory/MemtableAllocator.java | 39 +++++++---- .../cassandra/utils/memory/MemtablePool.java | 73 ++++++++++++-------- .../utils/memory/NativeAllocatorTest.java | 18 ++++- 9 files changed, 133 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 720133a,25f7c1d..a282fd7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ -2.1.8 +2.2.0-rc2 + * (cqlsh) Allow setting the initial connection timeout (CASSANDRA-9601) + * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675) + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) + * Update cqlsh for UDFs (CASSANDRA-7556) + * Change Windows kernel default timer resolution (CASSANDRA-9634) + * Deprected sstable2json and json2sstable (CASSANDRA-9618) + * Allow native functions in user-defined aggregates (CASSANDRA-9542) + * Don't repair system_distributed by default (CASSANDRA-9621) + * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) + * Rename class for DATE type in Java driver (CASSANDRA-9563) + * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475) + * Fix connection leak in CqlRecordWriter (CASSANDRA-9576) + * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) + * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) + * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) + * Fix deprecated repair JMX API (CASSANDRA-9570) + * Add logback metrics (CASSANDRA-9378) + * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583) +Merged from 2.1: + * Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681) * Update internal python driver for cqlsh (CASSANDRA-9064) * Fix IndexOutOfBoundsException when inserting tuple with too many elements using the string literal notation (CASSANDRA-9559) http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 926cba2,8e67cdc..1374071 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -34,11 -34,8 +34,12 @@@ import com.google.common.base.Throwable import com.google.common.collect.*; import com.google.common.util.concurrent.*; +import org.apache.cassandra.db.lifecycle.SSTableIntervalTree; +import org.apache.cassandra.db.lifecycle.View; +import org.apache.cassandra.db.lifecycle.Tracker; +import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.FSWriteError; + import org.apache.cassandra.utils.memory.MemtablePool; import org.json.simple.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/Memtable.java index ccf92be,9f6cf9b..6e4802f --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@@ -393,10 -379,14 +394,13 @@@ public class Memtable implements Compar if (writer.getFilePointer() > 0) { + logger.info(String.format("Completed flushing %s (%s) for commitlog position %s", + writer.getFilename(), + FBUtilities.prettyPrintMemory(writer.getOnDiskFilePointer()), + context)); + - writer.isolateReferences(); // temp sstables should contain non-repaired data. - ssTable = writer.closeAndOpenReader(); + ssTable = writer.finish(true); - logger.info(String.format("Completed flushing %s (%d bytes) for commitlog position %s", - ssTable.getFilename(), new File(ssTable.getFilename()).length(), context)); } else { http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java index 17edeb0,68eb864..df65572 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@@ -26,9 -28,12 +26,10 @@@ import java.net.* import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; + import java.text.NumberFormat; import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.*; +import java.util.zip.Adler32; import java.util.zip.Checksum; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/cassandra/blob/99f7ce9b/src/java/org/apache/cassandra/utils/memory/HeapPool.java ----------------------------------------------------------------------