Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/tools/SSTableExport.java src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f3d1e22 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f3d1e22 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f3d1e22 Branch: refs/heads/trunk Commit: 6f3d1e225da27924a2d4333086b11ed805a84ee1 Parents: b324759 83b9740 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Oct 12 14:50:01 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Oct 12 14:50:01 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/CassandraDaemon.java | 30 +++++----- .../cassandra/tools/SSTableExpiredBlockers.java | 4 +- .../cassandra/tools/SSTableLevelResetter.java | 2 + .../cassandra/tools/SSTableMetadataViewer.java | 2 + .../cassandra/tools/SSTableOfflineRelevel.java | 3 + .../tools/SSTableRepairedAtSetter.java | 2 + .../cassandra/tools/StandaloneScrubber.java | 2 + .../cassandra/tools/StandaloneSplitter.java | 2 + .../cassandra/tools/StandaloneUpgrader.java | 2 + .../cassandra/tools/StandaloneVerifier.java | 2 + src/java/org/apache/cassandra/tools/Util.java | 58 ++++++++++++++++++++ 12 files changed, 96 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f40c12c,efae4ab..f72929f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,26 +1,47 @@@ -2.2.3 +3.0 + * Only include modified cell data in indexing deltas (CASSANDRA-10438) + * Do not load keyspace when creating sstable writer (CASSANDRA-10443) + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413) + * Re-populate token metadata after commit log recovery (CASSANDRA-10293) + * Provide additional metrics for materialized views (CASSANDRA-10323) + * Flush system schema tables after local schema changes (CASSANDRA-10429) +Merged from 2.2: + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412) * Preserve case of quoted Role & User names (CASSANDRA-10394) * cqlsh pg-style-strings broken (CASSANDRA-10484) - * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400) + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) Merged from 2.1: - * Fix mmap file segment seeking to EOF (CASSANDRA-10478) * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) * Mark nodes as dead even if they've already left (CASSANDRA-10205) - * Update internal python driver used by cqlsh (CASSANDRA-10161) -2.2.2 - * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) + +3.0.0-rc1 + * Fix mixed version read request compatibility for compact static tables + (CASSANDRA-10373) + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354) + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key + columns (CASSANDRA-9664) + * Move crc_check_chance out of compression options (CASSANDRA-9839) + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301) + * Transfer hints to a different node on decommission (CASSANDRA-10198) + * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338) + * Add custom query expressions to SELECT (CASSANDRA-10217) + * Fix minor bugs in MV handling (CASSANDRA-10362) + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124) + * Improve MV schema representation (CASSANDRA-9921) + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230) + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) + * Give index implementations more control over rebuild operations (CASSANDRA-10312) + * Update index file format (CASSANDRA-10314) + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) + * CFS.loadNewSSTables() broken for pre-3.0 sstables + * Cache selected index in read command to reduce lookups (CASSANDRA-10215) + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) +Merged from 2.2: * Configurable page size in cqlsh (CASSANDRA-9855) * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) - * Cancel transaction for sstables we wont redistribute index summary - for (CASSANDRA-10270) - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) - * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) - * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) - * Fix repair hang when snapshot failed (CASSANDRA-10057) - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks - (CASSANDRA-10199) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) Merged from 2.1: * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/SSTableLevelResetter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/StandaloneSplitter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/src/java/org/apache/cassandra/tools/StandaloneVerifier.java ----------------------------------------------------------------------