cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/4] git commit: Thrift CQLPreparedResult don't include type arguments
Date Mon, 04 Mar 2013 19:36:33 GMT
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 <sylvain@datastax.com>
Authored: Mon Mar 4 18:55:59 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
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);
         }


Mime
View raw message