Author: eevans
Date: Sat Jan 29 17:26:00 2011
New Revision: 1065080
URL: http://svn.apache.org/viewvc?rev=1065080&view=rev
Log:
eliminate usage of JUG for UUIDs
Patch by eevans for CASSANDRA-2067
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1065080&r1=1065079&r2=1065080&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Sat Jan 29
17:26:00 2011
@@ -39,7 +39,6 @@ import org.apache.cassandra.utils.FBUtil
import org.apache.cassandra.utils.UUIDGen;
import org.apache.thrift.TBaseHelper;
import org.apache.thrift.TException;
-import org.safehaus.uuid.UUIDGenerator;
// Cli Client Side Library
public class CliClient extends CliUserHelp
@@ -1809,7 +1808,7 @@ public class CliClient extends CliUserHe
{
if (validator instanceof TimeUUIDType)
{
- value =
ByteBuffer.wrap(UUIDGenerator.getInstance().generateTimeBasedUUID().asByteArray());
+ value = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
}
else if (validator instanceof LexicalUUIDType)
{
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java?rev=1065080&r1=1065079&r2=1065080&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
Sat Jan 29 17:26:00 2011
@@ -18,63 +18,63 @@
*/
package org.apache.cassandra.db.marshal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Random;
+import java.util.UUID;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import org.apache.cassandra.utils.UUIDGen;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
public class TimeUUIDTypeTest
{
TimeUUIDType timeUUIDType = new TimeUUIDType();
- UUIDGenerator generator = UUIDGenerator.getInstance();
@Test
- public void testEquality()
+ public void testEquality() throws UnknownHostException
{
- UUID a = generator.generateTimeBasedUUID();
- UUID b = new UUID(a.asByteArray());
-
- timeUUIDType.validate(ByteBuffer.wrap(a.asByteArray()));
- timeUUIDType.validate(ByteBuffer.wrap(b.asByteArray()));
- assertEquals(0, timeUUIDType.compare(ByteBuffer.wrap(a.asByteArray()),
ByteBuffer.wrap(b.asByteArray())));
+ UUID a = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+ UUID b = new UUID(a.getMostSignificantBits(),
a.getLeastSignificantBits());
+
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(a)));
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(b)));
+ assertEquals(0,
timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(a)),
ByteBuffer.wrap(UUIDGen.decompose(b))));
}
@Test
- public void testSmaller()
+ public void testSmaller() throws UnknownHostException
{
- UUID a = generator.generateTimeBasedUUID();
- UUID b = generator.generateTimeBasedUUID();
- UUID c = generator.generateTimeBasedUUID();
-
- timeUUIDType.validate(ByteBuffer.wrap(a.asByteArray()));
- timeUUIDType.validate(ByteBuffer.wrap(b.asByteArray()));
- timeUUIDType.validate(ByteBuffer.wrap(c.asByteArray()));
+ UUID a = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+ UUID b = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+ UUID c = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(a)));
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(b)));
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(c)));
- assert timeUUIDType.compare(ByteBuffer.wrap(a.asByteArray()),
ByteBuffer.wrap(b.asByteArray())) < 0;
- assert timeUUIDType.compare(ByteBuffer.wrap(b.asByteArray()),
ByteBuffer.wrap(c.asByteArray())) < 0;
- assert timeUUIDType.compare(ByteBuffer.wrap(a.asByteArray()),
ByteBuffer.wrap(c.asByteArray())) < 0;
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(a)),
ByteBuffer.wrap(UUIDGen.decompose(b))) < 0;
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(b)),
ByteBuffer.wrap(UUIDGen.decompose(c))) < 0;
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(a)),
ByteBuffer.wrap(UUIDGen.decompose(c))) < 0;
}
@Test
- public void testBigger()
+ public void testBigger() throws UnknownHostException
{
- UUID a = generator.generateTimeBasedUUID();
- UUID b = generator.generateTimeBasedUUID();
- UUID c = generator.generateTimeBasedUUID();
-
- timeUUIDType.validate(ByteBuffer.wrap(a.asByteArray()));
- timeUUIDType.validate(ByteBuffer.wrap(b.asByteArray()));
- timeUUIDType.validate(ByteBuffer.wrap(c.asByteArray()));
-
- assert timeUUIDType.compare(ByteBuffer.wrap(c.asByteArray()),
ByteBuffer.wrap(b.asByteArray())) > 0;
- assert timeUUIDType.compare(ByteBuffer.wrap(b.asByteArray()),
ByteBuffer.wrap(a.asByteArray())) > 0;
- assert timeUUIDType.compare(ByteBuffer.wrap(c.asByteArray()),
ByteBuffer.wrap(a.asByteArray())) > 0;
+ UUID a = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+ UUID b = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+ UUID c = UUIDGen.makeType1UUIDFromHost(InetAddress.getLocalHost());
+
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(a)));
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(b)));
+ timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(c)));
+
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(c)),
ByteBuffer.wrap(UUIDGen.decompose(b))) > 0;
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(b)),
ByteBuffer.wrap(UUIDGen.decompose(a))) > 0;
+ assert timeUUIDType.compare(ByteBuffer.wrap(UUIDGen.decompose(c)),
ByteBuffer.wrap(UUIDGen.decompose(a))) > 0;
}
@Test
@@ -102,7 +102,7 @@ public class TimeUUIDTypeTest
@Test
public void testValidTimeVersion()
{
- java.util.UUID uuid1 =
java.util.UUID.fromString("00000000-0000-1000-0000-000000000000");
+ UUID uuid1 = UUID.fromString("00000000-0000-1000-0000-000000000000");
assert uuid1.version() == 1;
timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(uuid1)));
}
@@ -110,7 +110,7 @@ public class TimeUUIDTypeTest
@Test(expected = MarshalException.class)
public void testInvalidTimeVersion()
{
- java.util.UUID uuid2 =
java.util.UUID.fromString("00000000-0000-2100-0000-000000000000");
+ UUID uuid2 = UUID.fromString("00000000-0000-2100-0000-000000000000");
assert uuid2.version() == 2;
timeUUIDType.validate(ByteBuffer.wrap(UUIDGen.decompose(uuid2)));
}
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java?rev=1065080&r1=1065079&r2=1065080&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
Sat Jan 29 17:26:00 2011
@@ -1,14 +1,13 @@
package org.apache.cassandra.db.marshal;
-import com.google.common.base.Charsets;
import org.apache.cassandra.Util;
+import org.apache.cassandra.utils.UUIDGen;
import org.junit.Test;
-import org.safehaus.uuid.UUIDGenerator;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
-import java.util.Random;
+import java.util.UUID;
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,15 +39,14 @@ public class TypeValidationTest
@Test(expected = MarshalException.class)
public void testInvalidTimeUUID()
{
- org.safehaus.uuid.UUID uuid =
UUIDGenerator.getInstance().generateRandomBasedUUID();
- TimeUUIDType.instance.validate(ByteBuffer.wrap(uuid.toByteArray()));
+ UUID uuid = UUID.randomUUID();
+
TimeUUIDType.instance.validate(ByteBuffer.wrap(UUIDGen.decompose(uuid)));
}
@Test
public void testValidTimeUUID()
{
- org.safehaus.uuid.UUID uuid =
UUIDGenerator.getInstance().generateTimeBasedUUID();
- TimeUUIDType.instance.validate(ByteBuffer.wrap(uuid.toByteArray()));
+
TimeUUIDType.instance.validate(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes()));
}
@Test
