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 76790D947 for ; Mon, 4 Mar 2013 19:36:34 +0000 (UTC) Received: (qmail 90538 invoked by uid 500); 4 Mar 2013 19:36:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90479 invoked by uid 500); 4 Mar 2013 19:36:34 -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 90371 invoked by uid 99); 4 Mar 2013 19:36:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Mar 2013 19:36:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD3F33147A9; Mon, 4 Mar 2013 19:36:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: Thrift CQLPreparedResult don't include type arguments Message-Id: <20130304193633.CD3F33147A9@tyr.zones.apache.org> Date: Mon, 4 Mar 2013 19:36:33 +0000 (UTC) Thrift CQLPreparedResult don't include type arguments patch by slebresne; reviewed by jbellis for CASSANDRA-5311 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7e10828 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7e10828 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7e10828 Branch: refs/heads/trunk Commit: b7e10828fb4ec14ffebfd7b60775ea8844438542 Parents: 3c6f87e Author: Sylvain Lebresne Authored: Mon Mar 4 18:55:59 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 4 18:55:59 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../transport/messages/ResultMessage.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7e10828/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bd7bf09..04dcee7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285) * Handle null values when executing prepared statement (CASSANDRA-5081) * Add netty to pom dependencies (CASSANDRA-5181) + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311) Merged from 1.1: * nodetool: ability to repair specific range (CASSANDRA-5280) * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7e10828/src/java/org/apache/cassandra/transport/messages/ResultMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index 57ba7dd..43caace 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -294,7 +294,7 @@ public abstract class ResultMessage extends Message.Response for (ColumnSpecification name : metadata.names) { namesString.add(name.toString()); - typesString.add(TypeParser.getShortName(name.type)); + typesString.add(name.type.toString()); } return new CqlPreparedResult(thriftStatementId, metadata.names.size()).setVariable_types(typesString).setVariable_names(namesString); }