Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/add839d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/add839d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/add839d3 Branch: refs/heads/trunk Commit: add839d3173c9de8d6267791464f4130ce8fa771 Parents: 480cd39 cdba5aa Author: Benedict Elliott Smith <[email protected]> Authored: Fri Dec 12 13:44:52 2014 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Dec 12 13:44:52 2014 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/StressAction.java | 11 ++- .../apache/cassandra/stress/StressMetrics.java | 4 +- .../cassandra/stress/settings/CliOption.java | 1 + .../stress/settings/SettingsCommand.java | 4 +- .../stress/settings/SettingsSamples.java | 94 ++++++++++++++++++++ .../stress/settings/StressSettings.java | 7 +- .../cassandra/stress/util/SampleOfLongs.java | 59 +++++------- .../org/apache/cassandra/stress/util/Timer.java | 28 +++--- .../apache/cassandra/stress/util/Timing.java | 26 +++--- .../cassandra/stress/util/TimingInterval.java | 4 +- 11 files changed, 168 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/add839d3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 06cd2ca,fa42e85..ed31d5b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,5 +1,46 @@@ +3.0 + * Support for user-defined aggregation functions (CASSANDRA-8053) + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419) + * Refactor SelectStatement, return IN results in natural order instead + of IN value list order (CASSANDRA-7981) + * Support UDTs, tuples, and collections in user-defined + functions (CASSANDRA-7563) + * Fix aggregate fn results on empty selection, result column name, + and cqlsh parsing (CASSANDRA-8229) + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063, 7813) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * Improve concurrency of repair (CASSANDRA-6455, 8208) + + 2.1.3 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926) * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383) * Make read "defrag" async to reclaim memtables (CASSANDRA-8459) * Remove tmplink files for offline compactions (CASSANDRA-8321) http://git-wip-us.apache.org/repos/asf/cassandra/blob/add839d3/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java index 7dba724,3a4a4a3..5cd50de --- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java @@@ -27,10 -27,9 +27,9 @@@ import java.util.List import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadFactory; - import java.util.concurrent.TimeUnit; +import com.google.common.util.concurrent.Uninterruptibles; import org.apache.commons.lang3.time.DurationFormatUtils; - import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.stress.settings.SettingsLog; import org.apache.cassandra.stress.settings.StressSettings;
