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/ea443dfe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea443dfe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea443dfe Branch: refs/heads/trunk Commit: ea443dfe3ed8d154c11856bb9f5189afc3f7236f Parents: 7d26815 b869744 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Oct 26 14:03:33 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Thu Oct 26 14:03:33 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 8 ++++++++ conf/cassandra.yaml | 4 ++++ src/java/org/apache/cassandra/config/Config.java | 3 +++ .../cassandra/config/DatabaseDescriptor.java | 5 +++++ .../cql3/statements/CreateViewStatement.java | 17 +++++++++++++++++ 6 files changed, 38 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 532c958,935931c..275294f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -3.0.16 +3.11.2 + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: + * Add flag to disable materialized views, and warnings on creation (CASSANDRA-13959) * Don't let user drop or generally break tables in system_distributed (CASSANDRA-13813) * Provide a JMX call to sync schema with local storage (CASSANDRA-13954) * Mishandling of cells for removed/dropped columns when reading legacy files (CASSANDRA-13939) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 96285c7,60cf77c..f8dd93b --- a/NEWS.txt +++ b/NEWS.txt @@@ -18,10 -18,19 +18,18 @@@ using the provided 'sstableupgrade' too Upgrading --------- - - Nothing specific to this release, but please see previous upgrading sections, - especially if you are upgrading from 2.2. + - Nothing specific to this release, but please see previous upgrading sections. + Materialized Views + ------------------- + - Following a discussion regarding concerns about the design and safety of Materialized Views, the C* development + community no longer recommends them for production use, and considers them experimental. Warnings messages will + now be logged when they are created. (See https://www.mail-archive.com/dev@cassandra.apache.org/msg11511.html) + - An 'enable_materialized_views' flag has been added to cassandra.yaml to allow operators to prevent creation of + views + -3.0.15 -===== +3.11.1 +====== Upgrading --------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Config.java index 9489af9,64d41bb..a01203c --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -323,22 -303,14 +323,25 @@@ public class Confi */ public static final int otc_backlog_expiration_interval_ms_default = 200; public volatile int otc_backlog_expiration_interval_ms = otc_backlog_expiration_interval_ms_default; - + public int windows_timer_interval = 0; + /** + * Size of the CQL prepared statements cache in MB. + * Defaults to 1/256th of the heap size or 10MB, whichever is greater. + */ + public Long prepared_statements_cache_size_mb = null; + /** + * Size of the Thrift prepared statements cache in MB. + * Defaults to 1/256th of the heap size or 10MB, whichever is greater. + */ + public Long thrift_prepared_statements_cache_size_mb = null; + public boolean enable_user_defined_functions = false; public boolean enable_scripted_user_defined_functions = false; + + public boolean enable_materialized_views = true; + /** * Optionally disable asynchronous UDF execution. * Disabling asynchronous UDF execution also implicitly disables the security-manager! http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea443dfe/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java index c503bf9,778a3f4..3d53ac4 --- a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java @@@ -22,8 -22,10 +22,11 @@@ import java.util.* import java.util.stream.Collectors; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
