You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/09/06 15:28:33 UTC
svn commit: r1165661 - in /cassandra/trunk: ./
drivers/java/src/org/apache/cassandra/cql/jdbc/
drivers/java/test/org/apache/cassandra/cql/
src/java/org/apache/cassandra/cql/jdbc/
src/java/org/apache/cassandra/cql/term/ src/java/org/apache/cassandra/db/...
Author: jbellis
Date: Tue Sep 6 13:28:31 2011
New Revision: 1165661
URL: http://svn.apache.org/viewvc?rev=1165661&view=rev
Log:
move *Term to Jdbc*
Added:
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcType.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AsciiTerm.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/AsciiTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/BooleanTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/BytesTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/DateTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/DoubleTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/FloatTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/IntegerTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/TimeUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/UTF8Term.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/UUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/LexicalUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/LongTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/MarshalException.java
- copied, changed from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/MarshalException.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
Modified:
cassandra/trunk/build.xml
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/TypedColumn.java
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/AsciiTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/BooleanTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/BytesTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/CounterColumnTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/DateTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/DoubleTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/FloatTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/IntegerTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/LexicalUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/LongTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/MarshalException.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/TimeUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/TypesMap.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/UTF8Term.java
cassandra/trunk/src/java/org/apache/cassandra/cql/term/UUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UUIDType.java
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
Modified: cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Tue Sep 6 13:28:31 2011
@@ -771,7 +771,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
file="${build.dir}/${ant.project.name}-cookie-${version}.pom"/>
<jar jarfile="${build.dir}/${ant.project.name}-cookie-${version}.jar">
<fileset dir="${build.classes.main}">
- <include name="org/apache/cassandra/cql/term/*" />
+ <include name="org/apache/cassandra/cql/jdbc/*" />
<include name="org/apache/cassandra/utils/ByteBufferUtil*.class" />
<include name="org/apache/cassandra/utils/UUIDGen*.class" />
</fileset>
Modified: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java Tue Sep 6 13:28:31 2011
@@ -30,7 +30,6 @@ import java.sql.*;
import java.sql.Date;
import java.util.*;
-import org.apache.cassandra.cql.term.CounterColumnTerm;
import org.apache.cassandra.thrift.Column;
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.CqlRow;
@@ -999,7 +998,7 @@ class CResultSet extends AbstractResultS
public boolean isAutoIncrement(int column) throws SQLException
{
checkIndex(column);
- return values.get(column - 1).getValueType() instanceof CounterColumnTerm; // todo: check Value is correct.
+ return values.get(column - 1).getValueType() instanceof JdbcCounterColumn; // todo: check Value is correct.
}
public boolean isCaseSensitive(int column) throws SQLException
Modified: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java Tue Sep 6 13:28:31 2011
@@ -26,8 +26,6 @@ import static org.apache.cassandra.cql.j
import static org.apache.cassandra.cql.jdbc.Utils.NO_COMPARATOR;
import static org.apache.cassandra.cql.jdbc.Utils.NO_VALIDATOR;
-import org.apache.cassandra.cql.term.AbstractTerm;
-
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
@@ -88,7 +86,7 @@ class CassandraPreparedStatement extends
}
// null type means just call param.toString() and quote it (default for keys).
- private static String applySimpleBindings(String q, AbstractTerm type, ParameterIterator params) throws SQLException
+ private static String applySimpleBindings(String q, AbstractJdbcType type, ParameterIterator params) throws SQLException
{
assert type != null;
// we need to keep track of whether or not we are between quotes and ignore any question marks within them
@@ -125,7 +123,7 @@ class CassandraPreparedStatement extends
return sb.toString();
}
- private static String applyDualBindings(String q, AbstractTerm ltype, AbstractTerm rtype, ParameterIterator params) throws SQLException
+ private static String applyDualBindings(String q, AbstractJdbcType ltype, AbstractJdbcType rtype, ParameterIterator params) throws SQLException
{
StringBuffer sb = new StringBuffer();
boolean between = false;
@@ -144,7 +142,7 @@ class CassandraPreparedStatement extends
try
{
Object param = params.nextParam();
- AbstractTerm type = left ? ltype : rtype;
+ AbstractJdbcType type = left ? ltype : rtype;
String stringParam = makeCqlString(type.toString(param));
if (type.needsQuotes())
stringParam = "'" + stringParam + "'";
@@ -191,12 +189,12 @@ class CassandraPreparedStatement extends
ParameterIterator params = new ParameterIterator();
String left = cql.substring(0, pivot);
- AbstractTerm leftType = connection.decoder.getComparator(keyspace, columnFamily);
+ AbstractJdbcType leftType = connection.decoder.getComparator(keyspace, columnFamily);
if (leftType == null) throw new SQLDataException(String.format(NO_COMPARATOR, keyspace, columnFamily));
left = applySimpleBindings(left, leftType, params);
String right = cql.substring(pivot);
- AbstractTerm keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
+ AbstractJdbcType keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
if (keyVald == null) throw new SQLDataException(String.format(NO_VALIDATOR, keyspace, columnFamily));
right = applySimpleBindings(right, keyVald, params);
return left + right;
@@ -211,12 +209,12 @@ class CassandraPreparedStatement extends
ParameterIterator params = new ParameterIterator();
String left = cql.substring(0, pivot);
- AbstractTerm leftType = connection.decoder.getComparator(keyspace, columnFamily);
+ AbstractJdbcType leftType = connection.decoder.getComparator(keyspace, columnFamily);
if (leftType == null) throw new SQLDataException(String.format(NO_COMPARATOR, keyspace, columnFamily));
left = applySimpleBindings(left, leftType, params);
String right = cql.substring(pivot);
- AbstractTerm keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
+ AbstractJdbcType keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
if (keyVald == null) throw new SQLDataException(String.format(NO_VALIDATOR, keyspace, columnFamily));
right = applySimpleBindings(right, keyVald, params);
return left + right;
@@ -233,15 +231,15 @@ class CassandraPreparedStatement extends
ParameterIterator params = new ParameterIterator();
String left = cql.substring(0, pivot);
- AbstractTerm leftComp = connection.decoder.getComparator(keyspace, columnFamily);
+ AbstractJdbcType leftComp = connection.decoder.getComparator(keyspace, columnFamily);
if (leftComp == null) throw new SQLDataException(String.format(NO_COMPARATOR, keyspace, columnFamily));
- AbstractTerm leftVald = connection.decoder.getComparator(keyspace, columnFamily);
+ AbstractJdbcType leftVald = connection.decoder.getComparator(keyspace, columnFamily);
if (leftVald == null) throw new SQLDataException(String.format(NO_VALIDATOR, keyspace, columnFamily));
left = applyDualBindings(left, leftComp, leftVald, params);
String right = cql.substring(pivot);
- AbstractTerm keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
+ AbstractJdbcType keyVald = connection.decoder.getKeyValidator(keyspace, columnFamily);
if (keyVald == null) throw new SQLDataException(String.format(NO_VALIDATOR, keyspace, columnFamily));
right = applySimpleBindings(right, keyVald, params);
return left + right;
Modified: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java Tue Sep 6 13:28:31 2011
@@ -20,9 +20,6 @@ package org.apache.cassandra.cql.jdbc;
*
*/
-import org.apache.cassandra.cql.term.AbstractTerm;
-import org.apache.cassandra.cql.term.AsciiTerm;
-import org.apache.cassandra.cql.term.TypesMap;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -76,14 +73,14 @@ class ColumnDecoder
metadata.put(String.format("%s.%s", ks.getName(), cf.getName()), new CFamMeta(cf));
}
- protected AbstractTerm<?> getComparator(String keyspace, String columnFamily)
+ protected AbstractJdbcType<?> getComparator(String keyspace, String columnFamily)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace, columnFamily));
- AbstractTerm<?> type = (cf != null) ? TypesMap.getTermForComparator(cf.comparator) : null;
+ AbstractJdbcType<?> type = (cf != null) ? TypesMap.getTermForComparator(cf.comparator) : null;
return (type == null) ? null : type;
}
- private AbstractTerm<?> getNameType(String keyspace, String columnFamily, ByteBuffer name)
+ private AbstractJdbcType<?> getNameType(String keyspace, String columnFamily, ByteBuffer name)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace, columnFamily));
try
@@ -98,7 +95,7 @@ class ColumnDecoder
return TypesMap.getTermForComparator(cf.comparator);
}
- private AbstractTerm<?> getValueType(String keyspace, String columnFamily, ByteBuffer name)
+ private AbstractJdbcType<?> getValueType(String keyspace, String columnFamily, ByteBuffer name)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace, columnFamily));
if (cf == null)
@@ -114,21 +111,21 @@ class ColumnDecoder
// not be the key name
}
- AbstractTerm<?> type = TypesMap.getTermForComparator(cf.columnMeta.get(name));
+ AbstractJdbcType<?> type = TypesMap.getTermForComparator(cf.columnMeta.get(name));
return (type != null) ? type : TypesMap.getTermForComparator(cf.defaultValidator);
}
- public AbstractTerm<?> getKeyValidator(String keyspace, String columnFamily)
+ public AbstractJdbcType<?> getKeyValidator(String keyspace, String columnFamily)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace, columnFamily));
- AbstractTerm<?> type = (cf != null) ? TypesMap.getTermForComparator(cf.keyValidator) : null;
+ AbstractJdbcType<?> type = (cf != null) ? TypesMap.getTermForComparator(cf.keyValidator) : null;
return (type == null) ? null : type;
}
/** uses the AbstractType to map a column name to a string. */
public String colNameAsString(String keyspace, String columnFamily, ByteBuffer name)
{
- AbstractTerm<?> comparator = getNameType(keyspace, columnFamily, name);
+ AbstractJdbcType<?> comparator = getNameType(keyspace, columnFamily, name);
return comparator.getString(name);
}
Modified: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/TypedColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/TypedColumn.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/TypedColumn.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/TypedColumn.java Tue Sep 6 13:28:31 2011
@@ -21,7 +21,6 @@ package org.apache.cassandra.cql.jdbc;
*/
-import org.apache.cassandra.cql.term.AbstractTerm;
import org.apache.cassandra.thrift.Column;
@@ -34,9 +33,9 @@ public class TypedColumn
// (a good example is byte buffers).
private final Object value;
private final String nameString;
- private final AbstractTerm<?> nameType, valueType;
+ private final AbstractJdbcType<?> nameType, valueType;
- public TypedColumn(Column column, AbstractTerm<?> comparator, AbstractTerm<?> validator)
+ public TypedColumn(Column column, AbstractJdbcType<?> comparator, AbstractJdbcType<?> validator)
{
rawColumn = column;
this.value = column.value == null ? null : validator.compose(column.value);
@@ -65,12 +64,12 @@ public class TypedColumn
return valueType.getString(rawColumn.value);
}
- public AbstractTerm getNameType()
+ public AbstractJdbcType getNameType()
{
return nameType;
}
- public AbstractTerm getValueType()
+ public AbstractJdbcType getValueType()
{
return valueType;
}
Modified: cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java (original)
+++ cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java Tue Sep 6 13:28:31 2011
@@ -31,11 +31,11 @@ import java.util.Iterator;
import java.util.List;
import org.apache.cassandra.cql.jdbc.CassandraResultSet;
-import org.apache.cassandra.cql.term.AsciiTerm;
-import org.apache.cassandra.cql.term.BytesTerm;
-import org.apache.cassandra.cql.term.IntegerTerm;
-import org.apache.cassandra.cql.term.LongTerm;
-import org.apache.cassandra.cql.term.UTF8Term;
+import org.apache.cassandra.cql.jdbc.AsciiTerm;
+import org.apache.cassandra.cql.jdbc.JdbcBytes;
+import org.apache.cassandra.cql.jdbc.JdbcInteger;
+import org.apache.cassandra.cql.jdbc.LongTerm;
+import org.apache.cassandra.cql.jdbc.JdbcUTF8;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -141,9 +141,9 @@ public class JdbcDriverTest extends Embe
ResultSetMetaData md = rs.getMetaData();
assert md.getColumnCount() == 3;
- expectedMetaData(md, 1, BigInteger.class.getName(), "JdbcInteger", "Keyspace1", "1", Types.BIGINT, IntegerTerm.class.getSimpleName(), true, false);
- expectedMetaData(md, 2, BigInteger.class.getName(), "JdbcInteger", "Keyspace1", "2", Types.BIGINT, IntegerTerm.class.getSimpleName(), true, false);
- expectedMetaData(md, 3, String.class.getName(), "JdbcInteger", "Keyspace1", "42", Types.VARCHAR, UTF8Term.class.getSimpleName(), false, true);
+ expectedMetaData(md, 1, BigInteger.class.getName(), "JdbcInteger", "Keyspace1", "1", Types.BIGINT, JdbcInteger.class.getSimpleName(), true, false);
+ expectedMetaData(md, 2, BigInteger.class.getName(), "JdbcInteger", "Keyspace1", "2", Types.BIGINT, JdbcInteger.class.getSimpleName(), true, false);
+ expectedMetaData(md, 3, String.class.getName(), "JdbcInteger", "Keyspace1", "42", Types.VARCHAR, JdbcUTF8.class.getSimpleName(), false, true);
rs = stmt.executeQuery("select key, 1, 2, 42 from JdbcInteger where key='" + key + "'");
assert rs.next();
@@ -159,9 +159,9 @@ public class JdbcDriverTest extends Embe
assert rs.getInt("fortytwo") == 4242L;
md = rs.getMetaData();
- expectedMetaData(md, 1, String.class.getName(), "JdbcUtf8", "Keyspace1", "a", Types.VARCHAR, UTF8Term.class.getSimpleName(), false, true);
- expectedMetaData(md, 2, String.class.getName(), "JdbcUtf8", "Keyspace1", "b", Types.VARCHAR, UTF8Term.class.getSimpleName(), false, true);
- expectedMetaData(md, 3, BigInteger.class.getName(), "JdbcUtf8", "Keyspace1", "fortytwo", Types.BIGINT, IntegerTerm.class.getSimpleName(), true, false);
+ expectedMetaData(md, 1, String.class.getName(), "JdbcUtf8", "Keyspace1", "a", Types.VARCHAR, JdbcUTF8.class.getSimpleName(), false, true);
+ expectedMetaData(md, 2, String.class.getName(), "JdbcUtf8", "Keyspace1", "b", Types.VARCHAR, JdbcUTF8.class.getSimpleName(), false, true);
+ expectedMetaData(md, 3, BigInteger.class.getName(), "JdbcUtf8", "Keyspace1", "fortytwo", Types.BIGINT, JdbcInteger.class.getSimpleName(), true, false);
}
@Test
@@ -207,8 +207,8 @@ public class JdbcDriverTest extends Embe
expectedMetaData(md, 2, String.class.getName(), "JdbcAscii", "Keyspace1", "b", Types.VARCHAR, AsciiTerm.class.getSimpleName(), false, true);
md = rs1.getMetaData();
assert md.getColumnCount() == 2;
- expectedMetaData(md, 1, String.class.getName(), "JdbcUtf8", "Keyspace1", "a", Types.VARCHAR, UTF8Term.class.getSimpleName(), false, true);
- expectedMetaData(md, 2, String.class.getName(), "JdbcUtf8", "Keyspace1", "b", Types.VARCHAR, UTF8Term.class.getSimpleName(), false, true);
+ expectedMetaData(md, 1, String.class.getName(), "JdbcUtf8", "Keyspace1", "a", Types.VARCHAR, JdbcUTF8.class.getSimpleName(), false, true);
+ expectedMetaData(md, 2, String.class.getName(), "JdbcUtf8", "Keyspace1", "b", Types.VARCHAR, JdbcUTF8.class.getSimpleName(), false, true);
for (int i = 0; i < 2; i++)
{
@@ -223,7 +223,7 @@ public class JdbcDriverTest extends Embe
i + 1,
String.class.getName(),
Types.VARCHAR,
- UTF8Term.class.getSimpleName(),
+ JdbcUTF8.class.getSimpleName(),
false,
true);
@@ -256,11 +256,11 @@ public class JdbcDriverTest extends Embe
assert Arrays.equals(bb, rs.getBytes(FBUtilities.bytesToHex(b)));
ResultSetMetaData md = rs.getMetaData();
assert md.getColumnCount() == 2;
- expectedMetaData(md, 1, ByteBuffer.class.getName(), "JdbcBytes", "Keyspace1", FBUtilities.bytesToHex(a), Types.BINARY, BytesTerm.class.getSimpleName(), false, false);
- expectedMetaData(md, 2, ByteBuffer.class.getName(), "JdbcBytes", "Keyspace1", FBUtilities.bytesToHex(b), Types.BINARY, BytesTerm.class.getSimpleName(), false, false);
+ expectedMetaData(md, 1, ByteBuffer.class.getName(), "JdbcBytes", "Keyspace1", FBUtilities.bytesToHex(a), Types.BINARY, JdbcBytes.class.getSimpleName(), false, false);
+ expectedMetaData(md, 2, ByteBuffer.class.getName(), "JdbcBytes", "Keyspace1", FBUtilities.bytesToHex(b), Types.BINARY, JdbcBytes.class.getSimpleName(), false, false);
for (int i = 0; i < md.getColumnCount(); i++)
- expectedMetaData(md, i + 1, ByteBuffer.class.getName(), Types.BINARY, BytesTerm.class.getSimpleName(), false, false);
+ expectedMetaData(md, i + 1, ByteBuffer.class.getName(), Types.BINARY, JdbcBytes.class.getSimpleName(), false, false);
}
@Test
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcType.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcType.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcType.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/AbstractTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcType.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ package org.apache.cassandra.cql.term;
import java.nio.ByteBuffer;
-public abstract class AbstractTerm<T>
+public abstract class AbstractJdbcType<T>
{
public abstract boolean isCaseSensitive();
public abstract int getScale(T obj);
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AsciiTerm.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/AsciiTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AsciiTerm.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AsciiTerm.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/AsciiTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/AsciiTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/AsciiTerm.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@ import org.apache.cassandra.utils.ByteBu
import com.google.common.base.Charsets;
-public class AsciiTerm extends AbstractTerm<String>
+public class AsciiTerm extends AbstractJdbcType<String>
{
public static final AsciiTerm instance = new AsciiTerm();
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/BooleanTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/BooleanTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/BooleanTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,11 +24,11 @@ package org.apache.cassandra.cql.term;
import java.nio.ByteBuffer;
import java.sql.Types;
-public class BooleanTerm extends AbstractTerm<Boolean>
+public class JdbcBoolean extends AbstractJdbcType<Boolean>
{
- public static final BooleanTerm instance = new BooleanTerm();
+ public static final JdbcBoolean instance = new JdbcBoolean();
- BooleanTerm() {}
+ JdbcBoolean() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/BytesTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/BytesTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/BytesTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,11 +27,11 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class BytesTerm extends AbstractTerm<ByteBuffer>
+public class JdbcBytes extends AbstractJdbcType<ByteBuffer>
{
- public static final BytesTerm instance = new BytesTerm();
+ public static final JdbcBytes instance = new JdbcBytes();
- BytesTerm() {}
+ JdbcBytes() {}
public boolean isCaseSensitive()
{
Added: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java?rev=1165661&view=auto
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java (added)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java Tue Sep 6 13:28:31 2011
@@ -0,0 +1,8 @@
+package org.apache.cassandra.cql.jdbc;
+
+public class JdbcCounterColumn extends LongTerm
+{
+ public static final JdbcCounterColumn instance = new JdbcCounterColumn();
+
+ JdbcCounterColumn() {}
+}
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/DateTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/DateTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/DateTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@ import java.util.Date;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class DateTerm extends AbstractTerm<Date>
+public class JdbcDate extends AbstractJdbcType<Date>
{
public static final String[] iso8601Patterns = new String[] {
"yyyy-MM-dd HH:mm",
@@ -45,9 +45,9 @@ public class DateTerm extends AbstractTe
static final String DEFAULT_FORMAT = iso8601Patterns[3];
static final SimpleDateFormat FORMATTER = new SimpleDateFormat(DEFAULT_FORMAT);
- public static final DateTerm instance = new DateTerm();
+ public static final JdbcDate instance = new JdbcDate();
- DateTerm() {}
+ JdbcDate() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/DoubleTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/DoubleTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/DoubleTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,11 +26,11 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class DoubleTerm extends AbstractTerm<Double>
+public class JdbcDouble extends AbstractJdbcType<Double>
{
- public static final DoubleTerm instance = new DoubleTerm();
+ public static final JdbcDouble instance = new JdbcDouble();
- DoubleTerm() {}
+ JdbcDouble() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/FloatTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/FloatTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/FloatTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,11 +26,11 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class FloatTerm extends AbstractTerm<Float>
+public class JdbcFloat extends AbstractJdbcType<Float>
{
- public static final FloatTerm instance = new FloatTerm();
+ public static final JdbcFloat instance = new JdbcFloat();
- FloatTerm() {}
+ JdbcFloat() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/IntegerTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/IntegerTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/IntegerTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,11 +27,11 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class IntegerTerm extends AbstractTerm<BigInteger>
+public class JdbcInteger extends AbstractJdbcType<BigInteger>
{
- public static final IntegerTerm instance = new IntegerTerm();
+ public static final JdbcInteger instance = new JdbcInteger();
- IntegerTerm() {}
+ JdbcInteger() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/TimeUUIDTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/TimeUUIDTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/TimeUUIDTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,11 +26,11 @@ import java.util.UUID;
import org.apache.cassandra.utils.UUIDGen;
-public class TimeUUIDTerm extends AbstractUUIDTerm
+public class JdbcTimeUUID extends JdbcLong
{
- public static final TimeUUIDTerm instance = new TimeUUIDTerm();
+ public static final JdbcTimeUUID instance = new JdbcTimeUUID();
- TimeUUIDTerm() {}
+ JdbcTimeUUID() {}
public String getString(ByteBuffer bytes)
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/UTF8Term.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/UTF8Term.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/UTF8Term.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,11 +27,11 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class UTF8Term extends AbstractTerm<String>
+public class JdbcUTF8 extends AbstractJdbcType<String>
{
- public static final UTF8Term instance = new UTF8Term();
+ public static final JdbcUTF8 instance = new JdbcUTF8();
- public UTF8Term() {}
+ public JdbcUTF8() {}
public boolean isCaseSensitive()
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/UUIDTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/UUIDTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/UUIDTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,11 +24,11 @@ package org.apache.cassandra.cql.term;
import java.nio.ByteBuffer;
import java.util.UUID;
-public class UUIDTerm extends AbstractUUIDTerm
+public class JdbcUUID extends JdbcLong
{
- public static final UUIDTerm instance = new UUIDTerm();
+ public static final JdbcUUID instance = new JdbcUUID();
- UUIDTerm() {}
+ JdbcUUID() {}
public UUID compose(ByteBuffer bytes)
{
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/LexicalUUIDTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/LexicalUUIDTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/LexicalUUIDTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@ import java.util.UUID;
import org.apache.cassandra.utils.UUIDGen;
-public class LexicalUUIDTerm extends AbstractUUIDTerm
+public class LexicalUUIDTerm extends JdbcLong
{
public static final LexicalUUIDTerm instance = new LexicalUUIDTerm();
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/LongTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/LongTerm.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/LongTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@ import java.sql.Types;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class LongTerm extends AbstractTerm<Long>
+public class LongTerm extends AbstractJdbcType<Long>
{
public static final LongTerm instance = new LongTerm();
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/MarshalException.java (from r1165660, cassandra/trunk/src/java/org/apache/cassandra/cql/term/MarshalException.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/MarshalException.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/MarshalException.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/term/MarshalException.java&r1=1165660&r2=1165661&rev=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/term/MarshalException.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/MarshalException.java Tue Sep 6 13:28:31 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.term;
+package org.apache.cassandra.cql.jdbc;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Added: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java?rev=1165661&view=auto
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java (added)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java Tue Sep 6 13:28:31 2011
@@ -0,0 +1,34 @@
+package org.apache.cassandra.cql.jdbc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TypesMap
+{
+ private final static Map<String, AbstractJdbcType<?>> map = new HashMap<String, AbstractJdbcType<?>>();
+
+ static
+ {
+ map.put("org.apache.cassandra.db.marshal.AsciiType", AsciiTerm.instance);
+ map.put("org.apache.cassandra.db.marshal.BooleanType", JdbcBoolean.instance);
+ map.put("org.apache.cassandra.db.marshal.BytesType", JdbcBytes.instance);
+ map.put("org.apache.cassandra.db.marshal.ColumnCounterType", JdbcCounterColumn.instance);
+ map.put("org.apache.cassandra.db.marshal.DateType", JdbcDate.instance);
+ map.put("org.apache.cassandra.db.marshal.DoubleType", JdbcDouble.instance);
+ map.put("org.apache.cassandra.db.marshal.FloatType", JdbcFloat.instance);
+ map.put("org.apache.cassandra.db.marshal.IntegerType", JdbcInteger.instance);
+ map.put("org.apache.cassandra.db.marshal.LexicalUUIDType", LexicalUUIDTerm.instance);
+ map.put("org.apache.cassandra.db.marshal.LongType", LongTerm.instance);
+ map.put("org.apache.cassandra.db.marshal.TimeUUIDType", JdbcTimeUUID.instance);
+ map.put("org.apache.cassandra.db.marshal.UTF8Type", JdbcUTF8.instance);
+ map.put("org.apache.cassandra.db.marshal.UUIDType", JdbcUUID.instance);
+ }
+
+ public static AbstractJdbcType<?> getTermForComparator(String comparator)
+ {
+ // If not fully qualified, assume it's the short name for a built-in.
+ if ((comparator != null) && (!comparator.contains(".")))
+ return map.get("org.apache.cassandra.db." + comparator);
+ return map.get(comparator);
+ }
+}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java Tue Sep 6 13:28:31 2011
@@ -22,12 +22,10 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.sql.Types;
import com.google.common.base.Charsets;
-import org.apache.cassandra.cql.term.AsciiTerm;
+import org.apache.cassandra.cql.jdbc.AsciiTerm;
import org.apache.cassandra.utils.ByteBufferUtil;
public class AsciiType extends AbstractType<String>
@@ -42,7 +40,7 @@ public class AsciiType extends AbstractT
{
return AsciiTerm.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BooleanType.java Tue Sep 6 13:28:31 2011
@@ -21,9 +21,8 @@ package org.apache.cassandra.db.marshal;
*/
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.BooleanTerm;
+import org.apache.cassandra.cql.jdbc.JdbcBoolean;
import org.apache.cassandra.utils.ByteBufferUtil;
public class BooleanType extends AbstractType<Boolean>
@@ -34,7 +33,7 @@ public class BooleanType extends Abstrac
public Boolean compose(ByteBuffer bytes)
{
- return BooleanTerm.instance.compose(bytes);
+ return JdbcBoolean.instance.compose(bytes);
}
public ByteBuffer decompose(Boolean value)
@@ -58,9 +57,9 @@ public class BooleanType extends Abstrac
{
try
{
- return BooleanTerm.instance.getString(bytes);
+ return JdbcBoolean.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java Tue Sep 6 13:28:31 2011
@@ -22,9 +22,8 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.BytesTerm;
+import org.apache.cassandra.cql.jdbc.JdbcBytes;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
@@ -36,7 +35,7 @@ public class BytesType extends AbstractT
public ByteBuffer compose(ByteBuffer bytes)
{
- return BytesTerm.instance.compose(bytes);
+ return JdbcBytes.instance.compose(bytes);
}
public ByteBuffer decompose(ByteBuffer value)
@@ -61,7 +60,7 @@ public class BytesType extends AbstractT
public String getString(ByteBuffer bytes)
{
- return BytesTerm.instance.getString(bytes);
+ return JdbcBytes.instance.getString(bytes);
}
public ByteBuffer fromString(String source)
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DateType.java Tue Sep 6 13:28:31 2011
@@ -19,14 +19,14 @@ package org.apache.cassandra.db.marshal;
* under the License.
*
*/
-import static org.apache.cassandra.cql.term.DateTerm.iso8601Patterns;
+import static org.apache.cassandra.cql.jdbc.JdbcDate.iso8601Patterns;
import java.nio.ByteBuffer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.cassandra.cql.term.DateTerm;
+import org.apache.cassandra.cql.jdbc.JdbcDate;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.time.DateUtils;
@@ -42,7 +42,7 @@ public class DateType extends AbstractTy
public Date compose(ByteBuffer bytes)
{
- return DateTerm.instance.compose(bytes);
+ return JdbcDate.instance.compose(bytes);
}
public ByteBuffer decompose(Date value)
@@ -70,9 +70,9 @@ public class DateType extends AbstractTy
{
try
{
- return DateTerm.instance.getString(bytes);
+ return JdbcDate.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/DoubleType.java Tue Sep 6 13:28:31 2011
@@ -21,9 +21,8 @@ package org.apache.cassandra.db.marshal;
*/
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.DoubleTerm;
+import org.apache.cassandra.cql.jdbc.JdbcDouble;
import org.apache.cassandra.utils.ByteBufferUtil;
public class DoubleType extends AbstractType<Double>
@@ -34,7 +33,7 @@ public class DoubleType extends Abstract
public Double compose(ByteBuffer bytes)
{
- return DoubleTerm.instance.compose(bytes);
+ return JdbcDouble.instance.compose(bytes);
}
public ByteBuffer decompose(Double value)
@@ -61,9 +60,9 @@ public class DoubleType extends Abstract
{
try
{
- return DoubleTerm.instance.getString(bytes);
+ return JdbcDouble.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/FloatType.java Tue Sep 6 13:28:31 2011
@@ -21,9 +21,8 @@ package org.apache.cassandra.db.marshal;
*/
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.FloatTerm;
+import org.apache.cassandra.cql.jdbc.JdbcFloat;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -35,7 +34,7 @@ public class FloatType extends AbstractT
public Float compose(ByteBuffer bytes)
{
- return FloatTerm.instance.compose(bytes);
+ return JdbcFloat.instance.compose(bytes);
}
public ByteBuffer decompose(Float value)
@@ -62,9 +61,9 @@ public class FloatType extends AbstractT
{
try
{
- return FloatTerm.instance.getString(bytes);
+ return JdbcFloat.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java Tue Sep 6 13:28:31 2011
@@ -21,9 +21,8 @@ package org.apache.cassandra.db.marshal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.IntegerTerm;
+import org.apache.cassandra.cql.jdbc.JdbcInteger;
import org.apache.cassandra.utils.ByteBufferUtil;
public final class IntegerType extends AbstractType<BigInteger>
@@ -60,7 +59,7 @@ public final class IntegerType extends A
public BigInteger compose(ByteBuffer bytes)
{
- return IntegerTerm.instance.compose(bytes);
+ return JdbcInteger.instance.compose(bytes);
}
public ByteBuffer decompose(BigInteger value)
@@ -128,7 +127,7 @@ public final class IntegerType extends A
public String getString(ByteBuffer bytes)
{
- return IntegerTerm.instance.getString(bytes);
+ return JdbcInteger.instance.getString(bytes);
}
public ByteBuffer fromString(String source) throws MarshalException
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java Tue Sep 6 13:28:31 2011
@@ -24,7 +24,7 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.cassandra.cql.term.LexicalUUIDTerm;
+import org.apache.cassandra.cql.jdbc.LexicalUUIDTerm;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.UUIDGen;
@@ -64,7 +64,7 @@ public class LexicalUUIDType extends Abs
{
return LexicalUUIDTerm.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java Tue Sep 6 13:28:31 2011
@@ -22,9 +22,8 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
-import java.sql.Types;
-import org.apache.cassandra.cql.term.LongTerm;
+import org.apache.cassandra.cql.jdbc.LongTerm;
import org.apache.cassandra.utils.ByteBufferUtil;
public class LongType extends AbstractType<Long>
@@ -68,7 +67,7 @@ public class LongType extends AbstractTy
{
return LongTerm.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java Tue Sep 6 13:28:31 2011
@@ -26,13 +26,13 @@ import java.text.ParseException;
import java.util.UUID;
import java.util.regex.Pattern;
-import org.apache.cassandra.cql.term.TimeUUIDTerm;
+import org.apache.cassandra.cql.jdbc.JdbcTimeUUID;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.lang.time.DateUtils;
-import static org.apache.cassandra.cql.term.DateTerm.iso8601Patterns;
+import static org.apache.cassandra.cql.jdbc.JdbcDate.iso8601Patterns;
public class TimeUUIDType extends AbstractType<UUID>
{
@@ -44,7 +44,7 @@ public class TimeUUIDType extends Abstra
public UUID compose(ByteBuffer bytes)
{
- return TimeUUIDTerm.instance.compose(bytes);
+ return JdbcTimeUUID.instance.compose(bytes);
}
public ByteBuffer decompose(UUID value)
@@ -101,9 +101,9 @@ public class TimeUUIDType extends Abstra
{
try
{
- return TimeUUIDTerm.instance.getString(bytes);
+ return JdbcTimeUUID.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java Tue Sep 6 13:28:31 2011
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
import com.google.common.base.Charsets;
-import org.apache.cassandra.cql.term.UTF8Term;
+import org.apache.cassandra.cql.jdbc.JdbcUTF8;
import org.apache.cassandra.utils.ByteBufferUtil;
public class UTF8Type extends AbstractType<String>
@@ -35,7 +35,7 @@ public class UTF8Type extends AbstractTy
public String compose(ByteBuffer bytes)
{
- return UTF8Term.instance.compose(bytes);
+ return JdbcUTF8.instance.compose(bytes);
}
public ByteBuffer decompose(String value)
@@ -52,9 +52,9 @@ public class UTF8Type extends AbstractTy
{
try
{
- return UTF8Term.instance.getString(bytes);
+ return JdbcUTF8.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UUIDType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UUIDType.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UUIDType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UUIDType.java Tue Sep 6 13:28:31 2011
@@ -25,13 +25,13 @@ import java.nio.ByteBuffer;
import java.text.ParseException;
import java.util.UUID;
-import org.apache.cassandra.cql.term.UUIDTerm;
+import org.apache.cassandra.cql.jdbc.JdbcUUID;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.lang.time.DateUtils;
-import static org.apache.cassandra.cql.term.DateTerm.iso8601Patterns;
+import static org.apache.cassandra.cql.jdbc.JdbcDate.iso8601Patterns;
/**
* Compares UUIDs using the following criteria:<br>
@@ -162,7 +162,7 @@ public class UUIDType extends AbstractTy
public UUID compose(ByteBuffer bytes)
{
- return UUIDTerm.instance.compose(bytes);
+ return JdbcUUID.instance.compose(bytes);
}
public void validate(ByteBuffer bytes)
@@ -177,9 +177,9 @@ public class UUIDType extends AbstractTy
{
try
{
- return UUIDTerm.instance.getString(bytes);
+ return JdbcUUID.instance.getString(bytes);
}
- catch (org.apache.cassandra.cql.term.MarshalException e)
+ catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
throw new MarshalException(e.getMessage());
}
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java?rev=1165661&r1=1165660&r2=1165661&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java Tue Sep 6 13:28:31 2011
@@ -23,7 +23,7 @@ package org.apache.cassandra.db.marshal;
import com.google.common.base.Charsets;
-import org.apache.cassandra.cql.term.*;
+import org.apache.cassandra.cql.jdbc.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
import org.junit.Test;
@@ -45,7 +45,7 @@ public class RoundTripTest
assert IntegerType.instance.fromString(IntegerType.instance.getString(ByteBuffer.wrap(bi.toByteArray())))
.equals(ByteBuffer.wrap(bi.toByteArray()));
assert IntegerType.instance.compose(ByteBuffer.wrap(bi.toByteArray())).equals(bi);
- assert IntegerTerm.instance.toString(bi).equals("1");
+ assert JdbcInteger.instance.toString(bi).equals("1");
}
@Test
@@ -74,12 +74,12 @@ public class RoundTripTest
public void testBytes()
{
byte[] v = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
- assert BytesTerm.instance.toString(BytesType.instance.fromString(FBUtilities.bytesToHex(v)))
+ assert JdbcBytes.instance.toString(BytesType.instance.fromString(FBUtilities.bytesToHex(v)))
.equals(FBUtilities.bytesToHex(v));
- assert BytesType.instance.fromString(BytesTerm.instance.toString(ByteBuffer.wrap(v)))
+ assert BytesType.instance.fromString(JdbcBytes.instance.toString(ByteBuffer.wrap(v)))
.equals(ByteBuffer.wrap(v));
assert BytesType.instance.compose(ByteBuffer.wrap(v)).equals(ByteBuffer.wrap(v));
- assert BytesTerm.instance.toString(ByteBuffer.wrap(v)).equals(FBUtilities.bytesToHex(v));
+ assert JdbcBytes.instance.toString(ByteBuffer.wrap(v)).equals(FBUtilities.bytesToHex(v));
}
@Test
@@ -105,7 +105,7 @@ public class RoundTripTest
assert TimeUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.decompose(uuid))).equals(uuid);
assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString(uuid.toString())));
- assert TimeUUIDTerm.instance.toString(uuid).equals(uuid.toString());
+ assert JdbcTimeUUID.instance.toString(uuid).equals(uuid.toString());
TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
Calendar c = Calendar.getInstance();
@@ -142,6 +142,6 @@ public class RoundTripTest
assert UTF8Type.instance.fromString(UTF8Type.instance.getString(ByteBuffer.wrap(v.getBytes(Charsets.UTF_8))))
.equals(ByteBuffer.wrap(v.getBytes(Charsets.UTF_8)));
assert UTF8Type.instance.compose(ByteBuffer.wrap(v.getBytes(Charsets.UTF_8))).equals(v);
- assert UTF8Term.instance.toString(v).equals(v);
+ assert JdbcUTF8.instance.toString(v).equals(v);
}
}