Author: jbellis
Date: Sun May 8 04:56:50 2011
New Revision: 1100679
URL: http://svn.apache.org/viewvc?rev=1100679&view=rev
Log:
rename ColumnDecoder.Key -> ColumnDecoder.KeyValidator
Modified:
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
Modified:
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java?rev=1100679&r1=1100678&r2=1100679&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
(original)
+++
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
Sun May 8 04:56:50 2011
@@ -199,7 +199,7 @@ public class CassandraPreparedStatement
throw new SQLException("Could not find comparator for " + keyspace
+ "." + columnFamily);
left = applySimpleBindings(left, leftType, params);
String right = cql.substring(pivot);
- AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.Key, null);
+ AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.KeyValidator, null);
if (keyVald == null)
throw new SQLException("Could not find key validator for " +
keyspace + "." + columnFamily);
right = applySimpleBindings(right, keyVald, params);
@@ -218,7 +218,7 @@ public class CassandraPreparedStatement
throw new SQLException("Could not find comparator for " + keyspace
+ "." + columnFamily);
left = applySimpleBindings(left, leftType, params);
String right = cql.substring(pivot);
- AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.Key, null);
+ AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.KeyValidator, null);
if (keyVald == null)
throw new SQLException("Could not find key validator for " +
keyspace + "." + columnFamily);
right = applySimpleBindings(right, keyVald, params);
@@ -242,7 +242,7 @@ public class CassandraPreparedStatement
throw new SQLException("Could not find validator for " + keyspace
+ "." + columnFamily);
left = applyDualBindings(left, leftComp, leftVald, params);
String right = cql.substring(pivot);
- AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.Key, null);
+ AbstractType keyVald = connection.decoder.getComparator(keyspace,
columnFamily, ColumnDecoder.Specifier.KeyValidator, null);
if (keyVald == null)
throw new SQLException("Could not find key validator for " +
keyspace + "." + columnFamily);
right = applySimpleBindings(right, keyVald, params);
Modified:
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java?rev=1100679&r1=1100678&r2=1100679&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
(original)
+++
cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
Sun May 8 04:56:50 2011
@@ -47,7 +47,7 @@ class ColumnDecoder
{
Comparator,
Validator,
- Key,
+ KeyValidator,
ColumnSpecific
}
@@ -120,7 +120,7 @@ class ColumnDecoder
{
switch (specifier)
{
- case Key:
+ case KeyValidator:
comparator =
FBUtilities.getComparator(def.getKey_validation_class());
break;
case ColumnSpecific:
