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:37:15 UTC
svn commit: r1165666 - in /cassandra/trunk:
src/java/org/apache/cassandra/cql/jdbc/
src/java/org/apache/cassandra/db/marshal/
test/unit/org/apache/cassandra/db/marshal/
Author: jbellis
Date: Tue Sep 6 13:37:15 2011
New Revision: 1165666
URL: http://svn.apache.org/viewvc?rev=1165666&view=rev
Log:
retry two renames
Added:
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java
- copied, changed from r1165661, cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java
- copied, changed from r1165661, cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java (from r1165661, cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java&r1=1165661&r2=1165666&rev=1165666&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LexicalUUIDTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java Tue Sep 6 13:37:15 2011
@@ -26,11 +26,11 @@ import java.util.UUID;
import org.apache.cassandra.utils.UUIDGen;
-public class LexicalUUIDTerm extends JdbcLong
+public class JdbcLexicalUUID extends JdbcLong
{
- public static final LexicalUUIDTerm instance = new LexicalUUIDTerm();
+ public static final JdbcLexicalUUID instance = new JdbcLexicalUUID();
- public LexicalUUIDTerm() {}
+ public JdbcLexicalUUID() {}
public String getString(ByteBuffer bytes)
{
@@ -49,5 +49,4 @@ public class LexicalUUIDTerm extends Jdb
{
return UUIDGen.getUUID(bytes);
}
-
}
Copied: cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java (from r1165661, cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java?p2=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java&p1=cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java&r1=1165661&r2=1165666&rev=1165666&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/LongTerm.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java Tue Sep 6 13:37:15 2011
@@ -21,30 +21,29 @@ package org.apache.cassandra.cql.jdbc;
*/
-import java.nio.ByteBuffer;
import java.sql.Types;
+import java.util.UUID;
-import org.apache.cassandra.utils.ByteBufferUtil;
-
-public class LongTerm extends AbstractJdbcType<Long>
+public abstract class JdbcLong extends AbstractJdbcType<UUID>
{
- public static final LongTerm instance = new LongTerm();
-
- LongTerm() {}
+ public String toString(UUID obj)
+ {
+ return obj.toString();
+ }
public boolean isCaseSensitive()
{
return false;
}
- public int getScale(Long obj)
+ public int getScale(UUID obj)
{
- return 0;
+ return -1;
}
- public int getPrecision(Long obj)
+ public int getPrecision(UUID obj)
{
- return obj.toString().length();
+ return -1;
}
public boolean isCurrency()
@@ -54,12 +53,7 @@ public class LongTerm extends AbstractJd
public boolean isSigned()
{
- return true;
- }
-
- public String toString(Long obj)
- {
- return obj.toString();
+ return false;
}
public boolean needsQuotes()
@@ -67,32 +61,13 @@ public class LongTerm extends AbstractJd
return false;
}
- public String getString(ByteBuffer bytes)
- {
- if (bytes.remaining() == 0)
- {
- return "";
- }
- if (bytes.remaining() != 8)
- {
- throw new MarshalException("A long is exactly 8 bytes: "+bytes.remaining());
- }
-
- return String.valueOf(bytes.getLong(bytes.position()));
- }
-
- public Class<Long> getType()
+ public Class<UUID> getType()
{
- return Long.class;
+ return UUID.class;
}
public int getJdbcType()
{
- return Types.INTEGER;
- }
-
- public Long compose(ByteBuffer bytes)
- {
- return ByteBufferUtil.toLong(bytes);
+ return Types.OTHER;
}
}
Modified: 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=1165666&r1=1165665&r2=1165666&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java Tue Sep 6 13:37:15 2011
@@ -17,7 +17,7 @@ public class TypesMap
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.LexicalUUIDType", JdbcLexicalUUID.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);
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=1165666&r1=1165665&r2=1165666&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:37:15 2011
@@ -24,7 +24,7 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.cassandra.cql.jdbc.LexicalUUIDTerm;
+import org.apache.cassandra.cql.jdbc.JdbcLexicalUUID;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.UUIDGen;
@@ -36,7 +36,7 @@ public class LexicalUUIDType extends Abs
public UUID compose(ByteBuffer bytes)
{
- return LexicalUUIDTerm.instance.compose(bytes);
+ return JdbcLexicalUUID.instance.compose(bytes);
}
public ByteBuffer decompose(UUID value)
@@ -62,7 +62,7 @@ public class LexicalUUIDType extends Abs
{
try
{
- return LexicalUUIDTerm.instance.getString(bytes);
+ return JdbcLexicalUUID.instance.getString(bytes);
}
catch (org.apache.cassandra.cql.jdbc.MarshalException e)
{
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=1165666&r1=1165665&r2=1165666&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:37:15 2011
@@ -86,12 +86,12 @@ public class RoundTripTest
public void testLexicalUUID()
{
UUID uuid = UUIDGen.makeType1UUIDFromHost(FBUtilities.getBroadcastAddress());
- assert LexicalUUIDTerm.instance.getString(LexicalUUIDType.instance.fromString(uuid.toString()))
+ assert JdbcLexicalUUID.instance.getString(LexicalUUIDType.instance.fromString(uuid.toString()))
.equals(uuid.toString());
assert LexicalUUIDType.instance.fromString(LexicalUUIDType.instance.getString(ByteBuffer.wrap(UUIDGen.decompose(uuid))))
.equals(ByteBuffer.wrap(UUIDGen.decompose(uuid)));
assert LexicalUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.decompose(uuid))).equals(uuid);
- assert LexicalUUIDTerm.instance.toString(uuid).equals(uuid.toString());
+ assert JdbcLexicalUUID.instance.toString(uuid).equals(uuid.toString());
}
@Test