Merge branch 'cassandra-2.2' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b5ab3a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b5ab3a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b5ab3a4
Branch: refs/heads/trunk
Commit: 3b5ab3a473543e9daa0534a4088d0545920e3286
Parents: 1f9d74c 5a090cc
Author: Marcus Eriksson <[email protected]>
Authored: Mon Jul 13 19:28:12 2015 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Mon Jul 13 19:28:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 9 +--
.../io/sstable/format/SSTableReader.java | 68 ++++++++++++++++----
.../org/apache/cassandra/io/util/FileUtils.java | 23 +++++++
.../apache/cassandra/io/util/SegmentedFile.java | 13 +++-
.../cassandra/service/CassandraDaemon.java | 9 +++
.../cassandra/service/StorageService.java | 7 ++
.../cassandra/utils/JVMStabilityInspector.java | 17 ++++-
8 files changed, 127 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 590084f,3046ceb..bdc30d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,11 +1,30 @@@
+3.0
+ * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
+ * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
+ * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null
(CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499)
+
+
2.2.0-rc3
- * sum() and avg() functions missing for smallint and tinyint types
(CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
Merged from 2.1:
+ * Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
- config file or environment variables (CASSANDRA-9544)
+ config file or environment variables (CASSANDRA-9544)
Merged from 2.0:
* Can't transition from write survey to normal mode (CASSANDRA-9740)
* Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 555140f,822a213..81ec24b
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -454,28 -441,29 +455,36 @@@ public abstract class SSTableReader ext
}
logger.info("Opening {} ({} bytes)", descriptor, new
File(descriptor.filenameFor(Component.DATA)).length());
- SSTableReader sstable = internalOpen(descriptor, components,
metadata, partitioner, System.currentTimeMillis(),
- statsMetadata,
OpenReason.NORMAL);
+ SSTableReader sstable = internalOpen(descriptor,
+ components,
+ metadata,
+ partitioner,
+ System.currentTimeMillis(),
+ statsMetadata,
+ OpenReason.NORMAL,
+ header == null ? null :
header.toHeader(metadata));
+
- // load index and filter
- long start = System.nanoTime();
- sstable.load(validationMetadata);
- logger.debug("INDEX LOAD TIME for {}: {} ms.", descriptor,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start));
+ try
+ {
+ // load index and filter
+ long start = System.nanoTime();
+ sstable.load(validationMetadata);
+ logger.debug("INDEX LOAD TIME for {}: {} ms.", descriptor,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start));
- sstable.setup(!validate);
- if (validate)
- sstable.validate();
+ sstable.setup(!validate);
+ if (validate)
+ sstable.validate();
- if (sstable.getKeyCache() != null)
- logger.debug("key cache contains {}/{} keys",
sstable.getKeyCache().size(), sstable.getKeyCache().getCapacity());
+ if (sstable.getKeyCache() != null)
+ logger.debug("key cache contains {}/{} keys",
sstable.getKeyCache().size(), sstable.getKeyCache().getCapacity());
- return sstable;
+ return sstable;
+ }
+ catch (Throwable t)
+ {
+ sstable.selfRef().release();
+ throw t;
+ }
}
public static void logOpenException(Descriptor descriptor, IOException e)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/io/util/FileUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/io/util/SegmentedFile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b5ab3a4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
