Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD016D505 for ; Tue, 21 May 2013 18:54:13 +0000 (UTC) Received: (qmail 30840 invoked by uid 500); 21 May 2013 18:54:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30663 invoked by uid 500); 21 May 2013 18:54:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 29626 invoked by uid 99); 21 May 2013 18:54:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 18:54:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B2E1089145E; Tue, 21 May 2013 18:54:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 21 May 2013 18:54:15 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/11] git commit: Remove buggy thrift max message length option patch by jbellis; reviewed by tjake for CASSANDRA-5529 Remove buggy thrift max message length option patch by jbellis; reviewed by tjake for CASSANDRA-5529 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9879fa61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9879fa61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9879fa61 Branch: refs/heads/cassandra-1.1 Commit: 9879fa6122d325951d98f8bc601ff64dd04c2c67 Parents: 7d2ce5f Author: Jonathan Ellis Authored: Tue May 21 13:36:26 2013 -0500 Committer: Jonathan Ellis Committed: Tue May 21 13:50:45 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + conf/cassandra.yaml | 6 +---- src/java/org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 10 -------- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 4 +- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 2 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 15 ++--------- .../apache/cassandra/thrift/CassandraDaemon.java | 2 +- .../apache/cassandra/thrift/TBinaryProtocol.java | 19 --------------- 9 files changed, 12 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9879fa61/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 256e69a..69df3de 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.1.12 + * Remove buggy thrift max message length option (CASSANDRA-5529) * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) @@ -6,6 +7,7 @@ * Fix Bound intersection computation (CASSANDRA-5551) * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + 1.1.11 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9879fa61/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 37f41fb..027479d 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -330,15 +330,11 @@ rpc_server_type: sync # rpc_send_buff_size_in_bytes: # rpc_recv_buff_size_in_bytes: -# Frame size for thrift (maximum field length). +# Frame size for thrift (maximum message length). # 0 disables TFramedTransport in favor of TSocket. This option # is deprecated; we strongly recommend using Framed mode. thrift_framed_transport_size_in_mb: 15 -# The max length of a thrift message, including all fields and -# internal thrift overhead. -thrift_max_message_length_in_mb: 16 - # Set to true to have Cassandra create a hard link to each sstable # flushed or streamed locally in a backups/ subdirectory of the # Keyspace data. Removing these links is the operator's http://git-wip-us.apache.org/repos/asf/cassandra/blob/9879fa61/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index a08a694..11beea6 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -77,7 +77,9 @@ public class Config public Integer rpc_send_buff_size_in_bytes; public Integer rpc_recv_buff_size_in_bytes; + @Deprecated public Integer thrift_max_message_length_in_mb = 16; + public Integer thrift_framed_transport_size_in_mb = 15; public Boolean snapshot_before_compaction = false; public Boolean auto_snapshot = true; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9879fa61/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 0c460dc..f55c89a 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -316,11 +316,6 @@ public class DatabaseDescriptor if (conf.thrift_framed_transport_size_in_mb <= 0) throw new ConfigurationException("thrift_framed_transport_size_in_mb must be positive"); - if (conf.thrift_framed_transport_size_in_mb > 0 && conf.thrift_max_message_length_in_mb < conf.thrift_framed_transport_size_in_mb) - { - throw new ConfigurationException("thrift_max_message_length_in_mb must be greater than thrift_framed_transport_size_in_mb when using TFramedTransport"); - } - /* end point snitch */ if (conf.endpoint_snitch == null) { @@ -582,11 +577,6 @@ public class DatabaseDescriptor return authority; } - public static int getThriftMaxMessageLength() - { - return conf.thrift_max_message_length_in_mb * 1024 * 1024; - } - public static int getThriftFramedTransportSize() { return conf.thrift_framed_transport_size_in_mb * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9879fa61/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java index caea616..3818e53 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java @@ -118,7 +118,7 @@ public class ColumnFamilyOutputFormat extends OutputFormat 0) - setReadLength(readLength); - } - public TBinaryProtocol(TTransport trans, boolean strictRead, boolean strictWrite) { super(trans); @@ -64,11 +50,6 @@ public class TBinaryProtocol extends org.apache.thrift.protocol.TBinaryProtocol super(strictRead, strictWrite, 0); } - public Factory(boolean strictRead, boolean strictWrite, int readLength) - { - super(strictRead, strictWrite, readLength); - } - public TProtocol getProtocol(TTransport trans) { TBinaryProtocol protocol = new TBinaryProtocol(trans, strictRead_, strictWrite_);