[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2f0da07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2f0da07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2f0da07 Branch: refs/heads/trunk Commit: a2f0da07315a13cd24a6f253b63c4bed6bfe6ed3 Parents: 98c4a7c c4de752 Author: Aleksey YeschenkoAuthored: Fri Sep 18 12:40:25 2015 +0100 Committer: Aleksey Yeschenko Committed: Fri Sep 18 12:40:25 2015 +0100 -- CHANGES.txt | 1 + .../locator/GossipingPropertyFileSnitch.java | 14 +- .../apache/cassandra/locator/PropertyFileSnitch.java | 14 +- .../org/apache/cassandra/locator/TokenMetadata.java | 2 ++ .../locator/YamlFileNetworkTopologySnitch.java| 10 ++ .../org/apache/cassandra/service/StorageService.java | 3 ++- 6 files changed, 29 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f0da07/CHANGES.txt -- diff --cc CHANGES.txt index 166106d,658c19f..f629050 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,50 -1,8 +1,51 @@@ -2.0.17 +2.1.10 + * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339) + * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359) + * Fix NPE in nodetool compactionhistory (CASSANDRA-9758) + * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410) + * BATCH statement is broken in cqlsh (CASSANDRA-10272) + * Added configurable warning threshold for GC duration (CASSANDRA-8907) + * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066) + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations + have completed, regardless of the occurence of exceptions (CASSANDRA-10274) + * Fix handling of streaming EOF (CASSANDRA-10206) + * Only check KeyCache when it is enabled + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) + * (cqlsh) update list of CQL keywords (CASSANDRA-9232) +Merged from 2.0: + * Fix rare race where older gossip states can be shadowed (CASSANDRA-10366) * Fix consolidating racks violating the RF contract (CASSANDRA-10238) * Disallow decommission when node is in drained state (CASSANDRA-8741) - * Backport CASSANDRA-8013 to 2.0 (CASSANDRA-10144) + + +2.1.9 + * Avoid race condition during read repair (CASSANDRA-9460) + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898) + * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168) + * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004) + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) + * Write hints for paxos commits (CASSANDRA-7342) + * (cqlsh) Fix timestamps before 1970 on Windows, always + use UTC for timestamp display (CASSANDRA-1) + * (cqlsh) Avoid overwriting new config file with old config + when both exist (CASSANDRA-9777) + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) + * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) + * Fix handling of enable/disable autocompaction (CASSANDRA-9899) + * Commit log segment recycling is disabled by default (CASSANDRA-9896) + * Add consistency level to tracing ouput (CASSANDRA-9827) + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582) + * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837) + * 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) + * Remove repair snapshot leftover on startup (CASSANDRA-7357) + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735) + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757) + * Fix nodetool info error when the node is not joined (CASSANDRA-9031) +Merged from 2.0: * Make getFullyExpiredSSTables less expensive (CASSANDRA-9882) * Add tool to find why expired sstables are not getting dropped (CASSANDRA-10015) * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f0da07/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java -- diff --cc src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index da43600,dd1637d..f3f38a0 ---
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b1d59e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b1d59e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b1d59e1 Branch: refs/heads/trunk Commit: 4b1d59e13143f5a55478a7cfcaca61ba22259f9f Parents: b8b4eb7 257cdaa Author: Aleksey YeschenkoAuthored: Wed Sep 16 11:44:28 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Sep 16 11:44:28 2015 +0100 -- CHANGES.txt | 1 + .../locator/GossipingPropertyFileSnitch.java| 1 + .../cassandra/locator/PropertyFileSnitch.java | 1 + .../apache/cassandra/locator/TokenMetadata.java | 142 + .../locator/YamlFileNetworkTopologySnitch.java | 1 + .../cassandra/service/StorageService.java | 16 ++ .../cassandra/locator/TokenMetadataTest.java| 209 ++- 7 files changed, 333 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b1d59e1/CHANGES.txt -- diff --cc CHANGES.txt index 5f11049,3c47427..12523be --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,7 +1,47 @@@ -2.0.17 +2.1.10 + * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410) + * BATCH statement is broken in cqlsh (CASSANDRA-10272) + * Added configurable warning threshold for GC duration (CASSANDRA-8907) + * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066) + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations + have completed, regardless of the occurence of exceptions (CASSANDRA-10274) + * Fix handling of streaming EOF (CASSANDRA-10206) + * Only check KeyCache when it is enabled + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) + * (cqlsh) update list of CQL keywords (CASSANDRA-9232) +Merged from 2.0: + * Fix consolidating racks violating the RF contract (CASSANDRA-10238) * Disallow decommission when node is in drained state (CASSANDRA-8741) - * Backport CASSANDRA-8013 to 2.0 (CASSANDRA-10144) + + +2.1.9 + * Avoid race condition during read repair (CASSANDRA-9460) + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898) + * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168) + * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004) + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) + * Write hints for paxos commits (CASSANDRA-7342) + * (cqlsh) Fix timestamps before 1970 on Windows, always + use UTC for timestamp display (CASSANDRA-1) + * (cqlsh) Avoid overwriting new config file with old config + when both exist (CASSANDRA-9777) + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) + * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) + * Fix handling of enable/disable autocompaction (CASSANDRA-9899) + * Commit log segment recycling is disabled by default (CASSANDRA-9896) + * Add consistency level to tracing ouput (CASSANDRA-9827) + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582) + * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837) + * 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) + * Remove repair snapshot leftover on startup (CASSANDRA-7357) + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735) + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757) + * Fix nodetool info error when the node is not joined (CASSANDRA-9031) +Merged from 2.0: * Make getFullyExpiredSSTables less expensive (CASSANDRA-9882) * Add tool to find why expired sstables are not getting dropped (CASSANDRA-10015) * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b1d59e1/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java -- diff --cc src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 2c0980a,dd1637d..da43600 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@@ -72,24 -62,7 +72,25 @@@ public class GossipingPropertyFileSnitc } catch (ConfigurationException e)
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe800525 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe800525 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe800525 Branch: refs/heads/trunk Commit: fe80052571079b2468dd5265504cd6caee92bc69 Parents: c457dce 517058f Author: Tyler HobbsAuthored: Thu Sep 3 15:03:37 2015 -0500 Committer: Tyler Hobbs Committed: Thu Sep 3 15:03:37 2015 -0500 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df9e798d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df9e798d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df9e798d Branch: refs/heads/trunk Commit: df9e798de6eb4b47eacab209f82bc7e72347946a Parents: 755a6b2 500c035 Author: Marcus Eriksson marc...@apache.org Authored: Thu Aug 20 18:15:43 2015 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Aug 20 18:15:43 2015 +0200 -- doc/cql3/CQL.textile | 29 - 1 file changed, 16 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9e798d/doc/cql3/CQL.textile --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/755a6b24 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/755a6b24 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/755a6b24 Branch: refs/heads/trunk Commit: 755a6b244c7c0db34044f03b9a62c2070e033a78 Parents: 26ff150 17042f1 Author: Marcus Eriksson marc...@apache.org Authored: Tue Aug 18 10:51:38 2015 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Aug 18 10:51:38 2015 +0200 -- .../DateTieredCompactionStrategy.java | 7 +++ .../DateTieredCompactionStrategyOptions.java| 21 .../DateTieredCompactionStrategyTest.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/755a6b24/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java -- diff --cc src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java index 41c304b,2e43352..a8e2aff --- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java @@@ -36,11 -36,9 +36,10 @@@ public class DateTieredCompactionStrate { private static final Logger logger = LoggerFactory.getLogger(DateTieredCompactionStrategy.class); -protected DateTieredCompactionStrategyOptions options; +private final DateTieredCompactionStrategyOptions options; protected volatile int estimatedRemainingTasks; +private final SetSSTableReader sstables = new HashSet(); - @VisibleForTesting - long lastExpiredCheck; + private long lastExpiredCheck; public DateTieredCompactionStrategy(ColumnFamilyStore cfs, MapString, String options) { @@@ -79,14 -80,14 +78,14 @@@ */ private ListSSTableReader getNextBackgroundSSTables(final int gcBefore) { -if (!isEnabled() || cfs.getSSTables().isEmpty()) +if (cfs.getSSTables().isEmpty()) return Collections.emptyList(); -SetSSTableReader uncompacting = cfs.getUncompactingSSTables(); +SetSSTableReader uncompacting = Sets.intersection(sstables, cfs.getUncompactingSSTables()); SetSSTableReader expired = Collections.emptySet(); - // we only check for expired sstables every 10 minutes due to it being an expensive operation - if (System.currentTimeMillis() - lastExpiredCheck TimeUnit.MINUTES.toMillis(10)) + // we only check for expired sstables every 10 minutes (by default) due to it being an expensive operation + if (System.currentTimeMillis() - lastExpiredCheck options.expiredSSTableCheckFrequency) { // Find fully expired SSTables. Those will be included no matter what. expired = CompactionController.getFullyExpiredSSTables(cfs, uncompacting, cfs.getOverlappingSSTables(uncompacting), gcBefore); http://git-wip-us.apache.org/repos/asf/cassandra/blob/755a6b24/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java index cea835f,6d9bfc2..f05bf44 --- a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java @@@ -305,12 -305,10 +305,12 @@@ public class DateTieredCompactionStrate options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, 30); options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY, MILLISECONDS); options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, Double.toString((1d / (24 * 60 * 60; + options.put(DateTieredCompactionStrategyOptions.EXPIRED_SSTABLE_CHECK_FREQUENCY_SECONDS_KEY, 0); DateTieredCompactionStrategy dtcs = new DateTieredCompactionStrategy(cfs, options); +for (SSTableReader sstable : cfs.getSSTables()) +dtcs.addSSTable(sstable); dtcs.startup(); assertNull(dtcs.getNextBackgroundTask((int) (System.currentTimeMillis() / 1000))); - dtcs.lastExpiredCheck = 0; Thread.sleep(2000); AbstractCompactionTask t = dtcs.getNextBackgroundTask((int) (System.currentTimeMillis()/1000)); assertNotNull(t);
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26ff1507 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26ff1507 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26ff1507 Branch: refs/heads/trunk Commit: 26ff15070eb67779050975a9ae07053f4b5e5b04 Parents: 7a6a509 f53aacb Author: Marcus Eriksson marc...@apache.org Authored: Mon Aug 17 08:30:17 2015 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Aug 17 08:30:17 2015 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 55 +--- .../DateTieredCompactionStrategy.java | 13 - .../DateTieredCompactionStrategyTest.java | 1 + 4 files changed, 60 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26ff1507/CHANGES.txt -- diff --cc CHANGES.txt index 5a76978,905445e..4626899 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,5 +1,28 @@@ -2.0.17 +2.1.9 + * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004) + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) + * Write hints for paxos commits (CASSANDRA-7342) + * (cqlsh) Fix timestamps before 1970 on Windows, always + use UTC for timestamp display (CASSANDRA-1) + * (cqlsh) Avoid overwriting new config file with old config + when both exist (CASSANDRA-9777) + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) + * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) + * Fix handling of enable/disable autocompaction (CASSANDRA-9899) + * Commit log segment recycling is disabled by default (CASSANDRA-9896) + * Add consistency level to tracing ouput (CASSANDRA-9827) + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582) + * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837) + * 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) + * Remove repair snapshot leftover on startup (CASSANDRA-7357) + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735) + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757) + * Fix nodetool info error when the node is not joined (CASSANDRA-9031) +Merged from 2.0: + * Make getFullyExpiredSSTables less expensive (CASSANDRA-9882) * Add tool to find why expired sstables are not getting dropped (CASSANDRA-10015) * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129) * Don't cast expected bf size to an int (CASSANDRA-9959) http://git-wip-us.apache.org/repos/asf/cassandra/blob/26ff1507/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 7364528,eb688f7..25b3e57 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1367,20 -1025,59 +1367,59 @@@ public class ColumnFamilyStore implemen // a normal compaction won't ever have an empty sstables list, but we create a skeleton // compaction controller for streaming, and that passes an empty list. -if (sstables.isEmpty()) +if (!sstables.iterator().hasNext()) return ImmutableSet.of(); - DataTracker.SSTableIntervalTree tree = data.getView().intervalTree; - - SetSSTableReader results = null; - for (SSTableReader sstable : sstables) -ListSSTableReader sortedByFirst = new ArrayList(sstables); ++ListSSTableReader sortedByFirst = Lists.newArrayList(sstables); + Collections.sort(sortedByFirst, new ComparatorSSTableReader() + { + @Override + public int compare(SSTableReader o1, SSTableReader o2) + { + return o1.first.compareTo(o2.first); + } + }); + ListIntervalRowPosition, SSTableReader intervals = new ArrayList(); + DecoratedKey first = null, last = null; + /* + normalize the intervals covered by the sstables + assume we have sstables like this (brackets representing first/last key in the sstable); + [ ] [ ][ ] [ ] +[ ] [ ] + then we can, instead of
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/972ae147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972ae147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972ae147 Branch: refs/heads/cassandra-2.2 Commit: 972ae147247a0e4c2bba3a3c2853c2209e93cd95 Parents: 012b987 50e5802 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Aug 11 16:32:47 2015 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Aug 11 16:32:47 2015 -0500 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/012b987e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/012b987e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/012b987e Branch: refs/heads/trunk Commit: 012b987e267bdfb39b44c8afd4f4ccbb48a1ddf4 Parents: 76e8eb8 028e7cb Author: Marcus Eriksson marc...@apache.org Authored: Tue Aug 11 09:46:33 2015 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Aug 11 10:11:15 2015 +0200 -- CHANGES.txt | 1 + .../cassandra/tools/SSTableExpiredBlockers.java | 136 +++ .../cassandra/db/compaction/TTLExpiryTest.java | 29 tools/bin/sstableexpiredblockers| 54 tools/bin/sstableexpiredblockers.bat| 23 5 files changed, 243 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/012b987e/CHANGES.txt -- diff --cc CHANGES.txt index 462de44,7d84538..f7fb63c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ -2.0.17 +2.1.9 + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) + * Write hints for paxos commits (CASSANDRA-7342) + * (cqlsh) Fix timestamps before 1970 on Windows, always + use UTC for timestamp display (CASSANDRA-1) + * (cqlsh) Avoid overwriting new config file with old config + when both exist (CASSANDRA-9777) + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) + * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) + * Fix handling of enable/disable autocompaction (CASSANDRA-9899) + * Commit log segment recycling is disabled by default (CASSANDRA-9896) + * Add consistency level to tracing ouput (CASSANDRA-9827) + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582) + * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837) + * 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) + * Remove repair snapshot leftover on startup (CASSANDRA-7357) + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735) + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757) + * Fix nodetool info error when the node is not joined (CASSANDRA-9031) +Merged from 2.0: + * Add tool to find why expired sstables are not getting dropped (CASSANDRA-10015) * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129) * Don't cast expected bf size to an int (CASSANDRA-9959) * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793) http://git-wip-us.apache.org/repos/asf/cassandra/blob/012b987e/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java -- diff --cc src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java index 000,b5fa779..b4f7063 mode 00,100644..100644 --- a/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java +++ b/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java @@@ -1,0 -1,135 +1,136 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.cassandra.tools; + + import java.io.IOException; + import java.io.PrintStream; + import java.util.Collections; + import java.util.HashSet; + import java.util.Map; + import java.util.Set; + + import com.google.common.base.Throwables; + import com.google.common.collect.ArrayListMultimap; + import com.google.common.collect.Multimap; + + import org.apache.cassandra.config.CFMetaData; + import org.apache.cassandra.config.DatabaseDescriptor; + import
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ae58ef3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ae58ef3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ae58ef3 Branch: refs/heads/cassandra-3.0 Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1 Parents: 07a7e80 de84a5c Author: blerer benjamin.le...@datastax.com Authored: Sun Aug 9 22:04:32 2015 +0200 Committer: blerer benjamin.le...@datastax.com Committed: Sun Aug 9 22:04:56 2015 +0200 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83c0e01a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83c0e01a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83c0e01a Branch: refs/heads/cassandra-2.2 Commit: 83c0e01aa84a6cbfe36a89ef13027a78567df70a Parents: 0452e74 23e66a9 Author: T Jake Luciani j...@apache.org Authored: Thu Jun 18 14:32:10 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Thu Jun 18 14:32:10 2015 -0400 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0f96e1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0f96e1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0f96e1d Branch: refs/heads/cassandra-2.2 Commit: c0f96e1d46d664a9d4ca7f982d21cdfcaed1a24a Parents: 14a3324 9b10928 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Jun 2 14:51:20 2015 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Jun 2 14:51:20 2015 +0200 -- CHANGES.txt | 1 + .../io/sstable/SSTableIdentityIterator.java | 10 +++ .../cassandra/io/sstable/SSTableReader.java | 68 ++-- .../compaction/BlacklistingCompactionsTest.java | 17 +++-- 4 files changed, 69 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f96e1d/CHANGES.txt -- diff --cc CHANGES.txt index 71ce442,1aad965..4a7e174 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ -2.0.16: +2.1.6 + * Consistent error message when a table mixes counter and non-counter + columns (CASSANDRA-9492) + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: + * Always mark sstable suspect when corrupted (CASSANDRA-9478) * Add database users and permissions to CQL3 documentation (CASSANDRA-7558) * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969) * Fix bad condition in RangeTombstoneList (CASSANDRA-9485) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f96e1d/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java -- diff --cc src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java index b784a7e,8b45005..498ad26 --- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java @@@ -79,17 -95,18 +82,18 @@@ public class SSTableIdentityIterator im this.filename = filename; this.key = key; this.dataSize = dataSize; -this.expireBefore = (int)(System.currentTimeMillis() / 1000); this.flag = flag; this.validateColumns = checkData; -this.dataVersion = sstable == null ? Descriptor.Version.CURRENT : sstable.descriptor.version; + this.sstable = sstable; +Descriptor.Version dataVersion = sstable == null ?
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89f2c1de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89f2c1de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89f2c1de Branch: refs/heads/trunk Commit: 89f2c1de63a75871367aee0f22985c8d2c4f9930 Parents: 1a77a69 31a1828 Author: T Jake Luciani j...@apache.org Authored: Mon Mar 16 11:49:39 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Mon Mar 16 11:49:39 2015 -0400 -- --
[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java -- diff --cc src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java index 83d8f3a,0886edc..cc162d4 --- a/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java +++ b/src/java/org/apache/cassandra/utils/AlwaysPresentFilter.java @@@ -30,7 -31,13 +30,13 @@@ public class AlwaysPresentFilter implem public void clear() { } -public void close() throws IOException { } +public void close() { } public long serializedSize() { return 0; } + + @Override + public long offHeapSize() + { + return 0; + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/IFilter.java -- diff --cc src/java/org/apache/cassandra/utils/IFilter.java index 91c0e36,aed5f39..60c0590 --- a/src/java/org/apache/cassandra/utils/IFilter.java +++ b/src/java/org/apache/cassandra/utils/IFilter.java @@@ -30,5 -30,9 +30,11 @@@ public interface IFilter extends Closea long serializedSize(); +void close(); ++ + /** + * Returns the amount of memory in bytes used off heap. + * @return the amount of memory in bytes used off heap + */ + long offHeapSize(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/IBitSet.java -- diff --cc src/java/org/apache/cassandra/utils/obs/IBitSet.java index 96aac6b,47ba492..ed7e54b --- a/src/java/org/apache/cassandra/utils/obs/IBitSet.java +++ b/src/java/org/apache/cassandra/utils/obs/IBitSet.java @@@ -50,5 -50,9 +50,11 @@@ public interface IBitSet extends Closea public void clear(); +public void close(); ++ + /** + * Returns the amount of memory in bytes used off heap. + * @return the amount of memory in bytes used off heap + */ + public long offHeapSize(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java --