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/866a8943 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/866a8943 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/866a8943 Branch: refs/heads/cassandra-3.11 Commit: 866a89435f9d6453b611a9fdbc84a50377d19c2a Parents: 85e402a ef5ce7c Author: Benedict Elliott Smith <bened...@apache.org> Authored: Thu Dec 6 15:41:11 2018 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Thu Dec 6 15:41:11 2018 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 2 +- .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 5 ++ .../org/apache/cassandra/transport/Message.java | 76 ++++++++++++++++---- .../org/apache/cassandra/transport/Server.java | 2 +- 6 files changed, 72 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Config.java index a01203c,130ff08..603d851 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -133,32 -126,33 +133,33 @@@ public class Confi /* intentionally left set to true, despite being set to false in stock 2.2 cassandra.yaml we don't want to surprise Thrift users who have the setting blank in the yaml during 2.1->2.2 upgrade */ - public Boolean start_rpc = true; + public boolean start_rpc = true; public String rpc_address; public String rpc_interface; - public Boolean rpc_interface_prefer_ipv6 = false; + public boolean rpc_interface_prefer_ipv6 = false; public String broadcast_rpc_address; - public Integer rpc_port = 9160; - public Integer rpc_listen_backlog = 50; + public int rpc_port = 9160; + public int rpc_listen_backlog = 50; public String rpc_server_type = "sync"; - public Boolean rpc_keepalive = true; - public Integer rpc_min_threads = 16; - public Integer rpc_max_threads = Integer.MAX_VALUE; + public boolean rpc_keepalive = true; + public int rpc_min_threads = 16; + public int rpc_max_threads = Integer.MAX_VALUE; public Integer rpc_send_buff_size_in_bytes; public Integer rpc_recv_buff_size_in_bytes; - public Integer internode_send_buff_size_in_bytes; - public Integer internode_recv_buff_size_in_bytes; + public int internode_send_buff_size_in_bytes = 0; + public int internode_recv_buff_size_in_bytes = 0; - public Boolean start_native_transport = false; - public Integer native_transport_port = 9042; + public boolean start_native_transport = false; + public int native_transport_port = 9042; public Integer native_transport_port_ssl = null; - public Integer native_transport_max_threads = 128; - public Integer native_transport_max_frame_size_in_mb = 256; - public volatile Long native_transport_max_concurrent_connections = -1L; - public volatile Long native_transport_max_concurrent_connections_per_ip = -1L; + public int native_transport_max_threads = 128; + public int native_transport_max_frame_size_in_mb = 256; + public volatile long native_transport_max_concurrent_connections = -1L; + public volatile long native_transport_max_concurrent_connections_per_ip = -1L; + public boolean native_transport_flush_in_batches_legacy = true; @Deprecated - public Integer thrift_max_message_length_in_mb = 16; + public int thrift_max_message_length_in_mb = 16; /** * Max size of values in SSTables, in MegaBytes. * Default is the same as the native protocol frame limit: 256Mb. http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866a8943/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
