Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1694437 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1694437 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1694437 Branch: refs/heads/trunk Commit: d16944372c5d929bf3e1434f0e2e4d33e2cd9d07 Parents: d0937cc d8dfeb2 Author: T Jake Luciani <[email protected]> Authored: Fri Feb 3 15:20:26 2017 -0500 Committer: T Jake Luciani <[email protected]> Committed: Fri Feb 3 15:20:26 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 21 ++++++++++++++++++-- .../apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1694437/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 90392b8,d0134e5..2076c8f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -226,9 -195,11 +226,10 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) - * Remove support for non-JavaScript UDFs (CASSANDRA-12883) * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1694437/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 4aa2d3e,1ff956e..039dc33 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -407,14 -394,14 +407,14 @@@ public class ColumnFamilyStore implemen this.keyspace = keyspace; this.metadata = metadata; name = columnFamilyName; - minCompactionThreshold = new DefaultValue<>(metadata.params.compaction.minCompactionThreshold()); - maxCompactionThreshold = new DefaultValue<>(metadata.params.compaction.maxCompactionThreshold()); - crcCheckChance = new DefaultValue<>(metadata.params.crcCheckChance); + minCompactionThreshold = new DefaultValue<>(metadata.get().params.compaction.minCompactionThreshold()); + maxCompactionThreshold = new DefaultValue<>(metadata.get().params.compaction.maxCompactionThreshold()); + crcCheckChance = new DefaultValue<>(metadata.get().params.crcCheckChance); indexManager = new SecondaryIndexManager(this); - viewManager = keyspace.viewManager.forTable(metadata); + viewManager = keyspace.viewManager.forTable(metadata.id); metric = new TableMetrics(this); fileIndexGenerator.set(generation); - sampleLatencyNanos = DatabaseDescriptor.getReadRpcTimeout() / 2; + sampleLatencyNanos = TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getReadRpcTimeout() / 2); logger.info("Initializing {}.{}", keyspace.getName(), name);
