svn commit: r1179360 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt bin/cassandra.in.sh src/java/org/apache/cassandra/cql/QueryProcessor.java

[jbellis]

Author: jbellis
Date: Wed Oct  5 18:19:54 2011
New Revision: 1179360

URL: http://svn.apache.org/viewvc?rev=1179360&view=rev
Log:
fix type information returned for wildcard queries
patch by pyaskevich; reviewed by jbellis for CASSANDRA-3311

Modified:
    cassandra/branches/cassandra-1.0.0/CHANGES.txt
    cassandra/branches/cassandra-1.0.0/bin/cassandra.in.sh
    
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/QueryProcessor.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1179360&r1=1179359&r2=1179360&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Wed Oct  5 18:19:54 2011
@@ -16,6 +16,8 @@
  * Fix missing fields in CLI `show schema` output (CASSANDRA-3304)
  * Fix broken CompressedRandomAccessReaderTest (CASSANDRA-3298)
  * Nodetool no longer leaks threads and closes JMX connections (CASSANDRA-3309)
+ * (CQL) fix type information returned for wildcard queries (CASSANDRA-3311)
+
 
 1.0.0-rc2
  * Log a meaningful warning when a node receives a message for a repair session

Modified: cassandra/branches/cassandra-1.0.0/bin/cassandra.in.sh
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/bin/cassandra.in.sh?rev=1179360&r1=1179359&r2=1179360&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/bin/cassandra.in.sh (original)
+++ cassandra/branches/cassandra-1.0.0/bin/cassandra.in.sh Wed Oct  5 18:19:54 
2011
@@ -39,3 +39,4 @@ CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 for jar in $CASSANDRA_HOME/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
+echo $CLASSPATH
\ No newline at end of file

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1179360&r1=1179359&r2=1179360&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
 Wed Oct  5 18:19:54 2011
@@ -586,6 +586,11 @@ public class QueryProcessor
                         {
                             if (c.isMarkedForDelete())
                                 continue;
+
+                            ColumnDefinition cd = 
metadata.getColumnDefinition(c.name());
+                            if (cd != null)
+                                result.schema.value_types.put(c.name(), 
TypeParser.getShortName(cd.getValidator()));
+
                             thriftColumns.add(thriftify(c));
                         }
                     }