Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c94a9f23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c94a9f23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c94a9f23 Branch: refs/heads/trunk Commit: c94a9f2362a8f87e9b1ec048a54ec570c61b29fe Parents: 6d15a6d 71b1c4a Author: Yuki Morishita <yu...@apache.org> Authored: Wed Feb 24 11:55:18 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Feb 24 11:55:18 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 + .../org/apache/cassandra/config/CFMetaData.java | 8 +- .../db/rows/AbstractRangeTombstoneMarker.java | 4 + .../apache/cassandra/db/rows/AbstractRow.java | 12 +- .../apache/cassandra/db/rows/Unfiltered.java | 1 + .../io/sstable/format/SSTableReader.java | 8 + .../io/sstable/format/big/BigTableReader.java | 13 +- .../io/sstable/format/big/BigTableScanner.java | 5 + .../apache/cassandra/tools/JsonTransformer.java | 501 +++++++++++++++++++ .../apache/cassandra/tools/SSTableExport.java | 242 +++++++++ .../io/sstable/SSTableScannerTest.java | 8 +- tools/bin/sstabledump | 52 ++ tools/bin/sstabledump.bat | 48 ++ 14 files changed, 896 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3aa62ae,aefc02e..50a298e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ -3.0.4 +3.4 + * Extract LoaderOptions to be able to be used from outside (CASSANDRA-10637) + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205) + * fix TrackerTest to handle new notifications (CASSANDRA-11178) + * add SASI validation for partitioner and complex columns (CASSANDRA-11169) + * Add caching of encrypted credentials in PasswordAuthenticator (CASSANDRA-7715) + * fix SASI memtable switching on flush (CASSANDRA-11159) + * Remove duplicate offline compaction tracking (CASSANDRA-11148) + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130) + * Support long name output for nodetool commands (CASSANDRA-7950) + * Encrypted hints (CASSANDRA-11040) + * SASI index options validation (CASSANDRA-11136) + * Optimize disk seek using min/max column name meta data when the LIMIT clause is used + (CASSANDRA-8180) + * Add LIKE support to CQL3 (CASSANDRA-11067) + * Generic Java UDF types (CASSANDRA-10819) + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) +Merged from 3.0: + * Add sstabledump tool (CASSANDRA-7464) * Introduce backpressure for hints (CASSANDRA-10972) * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) * Prevent logging in sandboxed state (CASSANDRA-11033) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 68ccefb,5fca578..d554ac2 --- a/NEWS.txt +++ b/NEWS.txt @@@ -18,10 -18,8 +18,12 @@@ using the provided 'sstableupgrade' too New features ------------ - - sstabledump tool is added to be 3.0 version of former sstable2json. The tool only - supports v3.0+ SSTables. See tool's help for more detail. + - Internal authentication now supports caching of encrypted credentials. + Reference cassandra.yaml:credentials_validity_in_ms + - Remote configuration of auth caches via JMX can be disabled using the + the system property cassandra.disable_auth_caches_remote_configuration ++ - sstabledump tool is added to be 3.0 version of former sstable2json. The tool only ++ supports v3.0+ SSTables. See tool's help for more detail. Upgrading --------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/src/java/org/apache/cassandra/db/rows/Unfiltered.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java index 7abf728,dbab0f4..53566dc --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java @@@ -24,10 -24,8 +24,10 @@@ import org.apache.cassandra.db.* import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.columniterator.SSTableIterator; import org.apache.cassandra.db.columniterator.SSTableReversedIterator; +import org.apache.cassandra.db.rows.Rows; +import org.apache.cassandra.db.rows.UnfilteredRowIterator; +import org.apache.cassandra.db.rows.UnfilteredRowIterators; - import org.apache.cassandra.dht.IPartitioner; + import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.Component; http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java ----------------------------------------------------------------------
