Author: jbellis
Date: Fri Dec 3 14:23:44 2010
New Revision: 1041833
URL: http://svn.apache.org/viewvc?rev=1041833&view=rev
Log:
fix cli case sensitivity for index queries
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-1809'
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1041833&r1=1041832&r2=1041833&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
Fri Dec 3 14:23:44 2010
@@ -468,7 +468,7 @@ public class CliClient extends CliUserHe
return;
IndexClause clause = new IndexClause();
- String columnFamily = statement.getChild(0).getText();
+ String columnFamily = CliCompiler.getColumnFamily(statement,
keyspacesMap.get(keySpace).cf_defs);
// ^(CONDITIONS ^(CONDITION $column $value) ...)
Tree conditions = statement.getChild(1);
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1041833&r1=1041832&r2=1041833&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/cli/CliTest.java
Fri Dec 3 14:23:44 2010
@@ -41,6 +41,8 @@ public class CliTest extends CleanupHelp
"get CF1[hello][world];",
"set CF1[hello][world2] = 15;",
"get CF1 where world2 = long(15);",
+ "get cF1 where world2 = long(15);",
+ "get Cf1 where world2 = long(15);",
"set CF1['hello'][time_spent_uuid] =
timeuuid(a8098c1a-f86e-11da-bd1a-00112444be1e);",
"create column family CF2 with comparator=IntegerType;",
"set CF2['key'][98349387493847748398334] = 'some text';",
