Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30412b08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30412b08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30412b08 Branch: refs/heads/cassandra-3.11 Commit: 30412b08c0eb4a5cc5296725c7359f2741483ea2 Parents: 92e3042 40ad3cf Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Tue Jun 6 11:56:34 2017 -0700 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Tue Jun 6 11:57:16 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/metrics/TableMetrics.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30412b08/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 61bff07,63bb33c..2ffa526 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,5 +1,42 @@@ -3.0.14 +3.11.0 + * Fix formatting of duration columns in CQLSH (CASSANDRA-13549) + * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302) + * Allow CONTAINS statements filtering on the partition key and itâs parts (CASSANDRA-13275) + * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229) + * Fix duration type validation to prevent overflow (CASSANDRA-13218) + * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228) + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369) + * UDA fails without input rows (CASSANDRA-13399) + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188) + * V5 protocol flags decoding broken (CASSANDRA-13443) + * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) + * Add charset to Analyser input stream (CASSANDRA-13151) + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820) + * cdc column addition strikes again (CASSANDRA-13382) + * Fix static column indexes (CASSANDRA-13277) + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298) + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370) + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247) + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) + * Support unaligned memory access for AArch64 (CASSANDRA-13326) + * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417) + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) + * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) +Merged from 3.0: + * Failed unregistering mbean during drop keyspace (CASSANDRA-13346) * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542) * Fix the reported number of sstable data files accessed per read (CASSANDRA-13120) * Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559) http://git-wip-us.apache.org/repos/asf/cassandra/blob/30412b08/src/java/org/apache/cassandra/metrics/TableMetrics.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/metrics/TableMetrics.java index 0a726d4,a493836..7a84eca --- a/src/java/org/apache/cassandra/metrics/TableMetrics.java +++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java @@@ -708,10 -659,14 +708,14 @@@ public class TableMetric { for(Map.Entry<String, String> entry : all.entrySet()) { - final CassandraMetricsRegistry.MetricName name = factory.createMetricName(entry.getKey()); + CassandraMetricsRegistry.MetricName name = factory.createMetricName(entry.getKey()); + CassandraMetricsRegistry.MetricName alias = aliasFactory.createMetricName(entry.getValue()); - allTableMetrics.get(entry.getKey()).remove(Metrics.getMetrics().get(name.getMetricName())); - Metrics.remove(name, alias); + final Metric metric = Metrics.getMetrics().get(name.getMetricName()); + if (metric != null) - { // Metric will be null if it's a view metric we are releasing. Views have null for ViewLockAcquireTime and ViewLockReadTime - final CassandraMetricsRegistry.MetricName alias = aliasFactory.createMetricName(entry.getValue()); ++ { // Metric will be null if it's a view metric we are releasing. Views have null for ViewLockAcquireTime and ViewLockReadTime + allTableMetrics.get(entry.getKey()).remove(metric); + Metrics.remove(name, alias); + } } readLatency.release(); writeLatency.release(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
