Author: jbellis
Date: Wed Jan 19 16:39:52 2011
New Revision: 1060857
URL: http://svn.apache.org/viewvc?rev=1060857&view=rev
Log:
move FBU.hex methods to BBU
patch by slebresne; reviewed by jbellis for CASSANDRA-2009
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DecoratedKey.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadVerbHandler.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/BytesType.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/CompactionIterator.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/DigestMismatchException.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableExport.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
Wed Jan 19 16:39:52 2011
@@ -41,7 +41,6 @@ import org.apache.cassandra.db.marshal.U
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.io.SerDeUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
@@ -350,7 +349,7 @@ public final class CFMetaData
/** convention for nameing secondary indexes. */
public static String indexName(String parentCf, ColumnDefinition info)
{
- return parentCf + "." + (info.getIndexName() == null ?
FBUtilities.bytesToHex(info.name) : info.getIndexName());
+ return parentCf + "." + (info.getIndexName() == null ?
ByteBufferUtil.bytesToHex(info.name) : info.getIndexName());
}
public org.apache.cassandra.avro.CfDef deflate()
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java
Wed Jan 19 16:39:52 2011
@@ -32,7 +32,6 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.thrift.ColumnDef;
import org.apache.cassandra.thrift.IndexType;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
public class ColumnDefinition
{
@@ -154,7 +153,7 @@ public class ColumnDefinition
public String toString()
{
return "ColumnDefinition{" +
- "name=" + FBUtilities.bytesToHex(name) +
+ "name=" + ByteBufferUtil.bytesToHex(name) +
", validator=" + validator +
", index_type=" + index_type +
", index_name='" + index_name + '\'' +
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Wed Jan 19 16:39:52 2011
@@ -180,7 +180,7 @@ public class ColumnFamilyStore implement
ColumnFamilyStore indexCfs = indexedColumns.remove(indexName);
if (indexCfs == null)
{
- logger.debug("index {} already removed; ignoring",
FBUtilities.bytesToHex(indexName));
+ logger.debug("index {} already removed; ignoring",
ByteBufferUtil.bytesToHex(indexName));
continue;
}
indexCfs.unregisterMBean();
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DecoratedKey.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DecoratedKey.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DecoratedKey.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DecoratedKey.java
Wed Jan 19 16:39:52 2011
@@ -24,7 +24,7 @@ import java.util.Comparator;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.ByteBufferUtil;
/**
* Represents a decorated key, handy for certain operations
@@ -91,7 +91,7 @@ public class DecoratedKey<T extends Toke
@Override
public String toString()
{
- String keystring = key == null ? "null" : FBUtilities.bytesToHex(key);
+ String keystring = key == null ? "null" :
ByteBufferUtil.bytesToHex(key);
return "DecoratedKey(" + token + ", " + keystring + ")";
}
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadVerbHandler.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadVerbHandler.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadVerbHandler.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadVerbHandler.java
Wed Jan 19 16:39:52 2011
@@ -30,6 +30,7 @@ import org.apache.cassandra.net.IVerbHan
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
public class ReadVerbHandler implements IVerbHandler
@@ -70,7 +71,7 @@ public class ReadVerbHandler implements
if (command.isDigestQuery())
{
if (logger_.isDebugEnabled())
- logger_.debug("digest is " +
FBUtilities.bytesToHex(ColumnFamily.digest(row.cf)));
+ logger_.debug("digest is " +
ByteBufferUtil.bytesToHex(ColumnFamily.digest(row.cf)));
readResponse = new ReadResponse(ColumnFamily.digest(row.cf));
}
else
@@ -88,7 +89,7 @@ public class ReadVerbHandler implements
Message response = message.getReply(FBUtilities.getLocalAddress(),
bytes);
if (logger_.isDebugEnabled())
logger_.debug(String.format("Read key %s; sending response to
%s@%s",
- FBUtilities.bytesToHex(command.key),
message.getMessageId(), message.getFrom()));
+
ByteBufferUtil.bytesToHex(command.key), message.getMessageId(),
message.getFrom()));
MessagingService.instance().sendOneWay(response,
message.getFrom());
}
catch (IOException ex)
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
Wed Jan 19 16:39:52 2011
@@ -285,7 +285,7 @@ public class RowMutation
{
StringBuilder buff = new StringBuilder("RowMutation(");
buff.append("keyspace='").append(table_).append('\'');
- buff.append(",
key='").append(FBUtilities.bytesToHex(key_)).append('\'');
+ buff.append(",
key='").append(ByteBufferUtil.bytesToHex(key_)).append('\'');
buff.append(", modifications=[");
if (shallow)
{
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
Wed Jan 19 16:39:52 2011
@@ -28,7 +28,6 @@ import org.apache.cassandra.db.filter.Qu
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
public class SliceByNamesReadCommand extends ReadCommand
{
@@ -66,7 +65,7 @@ public class SliceByNamesReadCommand ext
{
return "SliceByNamesReadCommand(" +
"table='" + table + '\'' +
- ", key=" + FBUtilities.bytesToHex(key) +
+ ", key=" + ByteBufferUtil.bytesToHex(key) +
", columnParent='" + queryPath + '\'' +
", columns=[" + getComparator().getString(columnNames) + "]" +
')';
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceFromReadCommand.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
Wed Jan 19 16:39:52 2011
@@ -27,7 +27,6 @@ import org.apache.cassandra.db.filter.Qu
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
public class SliceFromReadCommand extends ReadCommand
{
@@ -69,7 +68,7 @@ public class SliceFromReadCommand extend
{
return "SliceFromReadCommand(" +
"table='" + table + '\'' +
- ", key='" + FBUtilities.bytesToHex(key) + '\'' +
+ ", key='" + ByteBufferUtil.bytesToHex(key) + '\'' +
", column_parent='" + queryPath + '\'' +
", start='" + getComparator().getString(start) + '\'' +
", finish='" + getComparator().getString(finish) + '\'' +
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
Wed Jan 19 16:39:52 2011
@@ -51,7 +51,6 @@ import org.apache.cassandra.io.util.File
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
public class Table
@@ -395,7 +394,7 @@ public class Table
{
List<Memtable> memtablesToFlush = Collections.emptyList();
if (logger.isDebugEnabled())
- logger.debug("applying mutation of row {}",
FBUtilities.bytesToHex(mutation.key()));
+ logger.debug("applying mutation of row {}",
ByteBufferUtil.bytesToHex(mutation.key()));
// write the mutation to the commitlog and memtables
flusherLock.readLock().lock();
@@ -429,7 +428,7 @@ public class Table
ByteBuffer value = cf.getColumn(column) == null ?
null : cf.getColumn(column).value(); // may be null on row-level deletion
logger.debug(String.format("mutating indexed
column %s value %s",
cf.getComparator().getString(column),
- value == null ? "null"
: FBUtilities.bytesToHex(value)));
+ value == null ? "null"
: ByteBufferUtil.bytesToHex(value)));
}
}
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/BytesType.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/BytesType.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/BytesType.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/BytesType.java
Wed Jan 19 16:39:52 2011
@@ -24,7 +24,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
public class BytesType extends AbstractType
{
@@ -44,7 +43,7 @@ public class BytesType extends AbstractT
public String getString(ByteBuffer bytes)
{
- return FBUtilities.bytesToHex(bytes);
+ return ByteBufferUtil.bytesToHex(bytes);
}
public ByteBuffer fromString(String source)
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
Wed Jan 19 16:39:52 2011
@@ -25,7 +25,7 @@ import org.apache.commons.lang.NotImplem
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.ByteBufferUtil;
/** for sorting columns representing row keys in the row ordering as
determined by a partitioner.
* Not intended for user-defined CFs, and will in fact error out if used with
such. */
@@ -40,7 +40,7 @@ public class LocalByPartionerType<T exte
public String getString(ByteBuffer bytes)
{
- return FBUtilities.bytesToHex(bytes);
+ return ByteBufferUtil.bytesToHex(bytes);
}
public ByteBuffer fromString(String source)
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/CompactionIterator.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/CompactionIterator.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/CompactionIterator.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/CompactionIterator.java
Wed Jan 19 16:39:52 2011
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
+import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.ReducingIterator;
@@ -132,7 +133,7 @@ implements Closeable, ICompactionInfo
if (rowSize > DatabaseDescriptor.getInMemoryCompactionLimit())
{
logger.info(String.format("Compacting large row %s (%d bytes)
incrementally",
-
FBUtilities.bytesToHex(rows.get(0).getKey().key), rowSize));
+
ByteBufferUtil.bytesToHex(rows.get(0).getKey().key), rowSize));
return new LazilyCompactedRow(cfs, rows, major, gcBefore);
}
return new PrecompactedRow(cfs, rows, major, gcBefore);
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/DigestMismatchException.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/DigestMismatchException.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/DigestMismatchException.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/DigestMismatchException.java
Wed Jan 19 16:39:52 2011
@@ -21,7 +21,7 @@ package org.apache.cassandra.service;
import java.nio.ByteBuffer;
import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.ByteBufferUtil;
public class DigestMismatchException extends Exception
{
@@ -29,7 +29,7 @@ public class DigestMismatchException ext
{
super(String.format("Mismatch for key %s (%s vs %s)",
key.toString(),
- FBUtilities.bytesToHex(digest1),
- FBUtilities.bytesToHex(digest2)));
+ ByteBufferUtil.bytesToHex(digest1),
+ ByteBufferUtil.bytesToHex(digest2)));
}
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
Wed Jan 19 16:39:52 2011
@@ -147,7 +147,7 @@ public class StorageProxy implements Sto
MessagingService.instance().addCallback(responseHandler,
unhintedMessage.getMessageId());
}
if (logger.isDebugEnabled())
- logger.debug("insert writing key " +
FBUtilities.bytesToHex(rm.key()) + " to " + unhintedMessage.getMessageId() +
"@" + destination);
+ logger.debug("insert writing key " +
ByteBufferUtil.bytesToHex(rm.key()) + " to " + unhintedMessage.getMessageId() +
"@" + destination);
Multimap<Message, InetAddress> messages =
dcMessages.get(dc);
@@ -170,7 +170,7 @@ public class StorageProxy implements Sto
{
addHintHeader(hintedMessage, target);
if (logger.isDebugEnabled())
- logger.debug("insert writing key " +
FBUtilities.bytesToHex(rm.key()) + " to " + hintedMessage.getMessageId() + "@"
+ destination + " for " + target);
+ logger.debug("insert writing key " +
ByteBufferUtil.bytesToHex(rm.key()) + " to " + hintedMessage.getMessageId() +
"@" + destination + " for " + target);
}
}
responseHandler.addHintCallback(hintedMessage,
destination);
@@ -199,7 +199,7 @@ public class StorageProxy implements Sto
if (mostRecentRowMutation == null)
throw new RuntimeException("no mutations were seen but found
an error during write anyway", e);
else
- throw new RuntimeException("error writing key " +
FBUtilities.bytesToHex(mostRecentRowMutation.key()), e);
+ throw new RuntimeException("error writing key " +
ByteBufferUtil.bytesToHex(mostRecentRowMutation.key()), e);
}
finally
{
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
Wed Jan 19 16:39:52 2011
@@ -37,6 +37,7 @@ import org.apache.cassandra.dht.IPartiti
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
public class ThriftValidation
@@ -314,8 +315,8 @@ public class ThriftValidation
throw new InvalidRequestException(String.format("[%s][%s][%s] =
[%s] failed validation (%s)",
keyspace,
column_parent.getColumn_family(),
-
FBUtilities.bytesToHex(column.name),
-
FBUtilities.bytesToHex(column.value),
+
ByteBufferUtil.bytesToHex(column.name),
+
ByteBufferUtil.bytesToHex(column.value),
me.getMessage()));
}
}
@@ -414,7 +415,7 @@ public class ThriftValidation
catch (MarshalException e)
{
throw new InvalidRequestException(String.format("Column
name %s is not valid for comparator %s",
-
FBUtilities.bytesToHex(c.name), cf_def.comparator_type));
+
ByteBufferUtil.bytesToHex(c.name), cf_def.comparator_type));
}
if ((c.index_name != null) && (c.index_type == null))
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableExport.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableExport.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableExport.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableExport.java
Wed Jan 19 16:39:52 2011
@@ -36,8 +36,8 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.*;
-import static org.apache.cassandra.utils.FBUtilities.bytesToHex;
-import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
+import static org.apache.cassandra.utils.ByteBufferUtil.bytesToHex;
+import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
/**
* Export SSTables to JSON format.
@@ -202,7 +202,7 @@ public class SSTableExport
{
if (excludeSet.contains(key))
continue;
- DecoratedKey<?> dk =
partitioner.decorateKey(ByteBuffer.wrap(hexToBytes(key)));
+ DecoratedKey<?> dk = partitioner.decorateKey(hexToBytes(key));
// validate order of the keys in the sstable
if (lastKey != null && lastKey.compareTo(dk) > 0 )
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SSTableImport.java
Wed Jan 19 16:39:52 2011
@@ -39,7 +39,7 @@ import org.codehaus.jackson.map.MappingJ
import org.codehaus.jackson.JsonParser;
-import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
+import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
/**
* Create SSTables from JSON input
@@ -92,8 +92,8 @@ public class SSTableImport
assert fields.size() == 4 || fields.size() == 6 : "Column
definition should have 4 or 6 fields.";
- name = ByteBuffer.wrap(hexToBytes((String)
fields.get(0)));
- value = ByteBuffer.wrap(hexToBytes((String)
fields.get(1)));
+ name = hexToBytes((String) fields.get(0));
+ value = hexToBytes((String) fields.get(1));
timestamp = (Long) fields.get(2);
isDeleted = (Boolean) fields.get(3);
@@ -167,7 +167,7 @@ public class SSTableImport
// Super columns
for (Map.Entry<?, ?> entry : row.entrySet())
{
- ByteBuffer superName = ByteBuffer.wrap(hexToBytes((String)
entry.getKey()));
+ ByteBuffer superName = hexToBytes((String) entry.getKey());
Map<?, ?> data = (Map<?, ?>) entry.getValue();
addColumnsToCF((List<?>) data.get("subColumns"), superName,
cfamily);
@@ -218,7 +218,7 @@ public class SSTableImport
for (Object keyObject : data.keySet())
{
String key = (String) keyObject;
-
decoratedKeys.put(partitioner.decorateKey(ByteBuffer.wrap(hexToBytes(key))),
key);
+ decoratedKeys.put(partitioner.decorateKey(hexToBytes(key)), key);
}
for (Map.Entry<DecoratedKey, String> rowKey : decoratedKeys.entrySet())
@@ -318,7 +318,7 @@ public class SSTableImport
throw new UnsupportedOperationException("Only Array or
Hash allowed as row content.");
}
- DecoratedKey currentKey =
partitioner.decorateKey(ByteBuffer.wrap(hexToBytes(key)));
+ DecoratedKey currentKey =
partitioner.decorateKey(hexToBytes(key));
if (prevStoredKey != null &&
prevStoredKey.compareTo(currentKey) != -1)
{
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Wed Jan 19 16:39:52 2011
@@ -380,4 +380,22 @@ public class ByteBufferUtil
};
}
+ public static String bytesToHex(ByteBuffer bytes)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (int i = bytes.position(); i < bytes.limit(); i++)
+ {
+ int bint = bytes.get(i) & 0xff;
+ if (bint <= 0xF)
+ // toHexString does not 0 pad its results.
+ sb.append("0");
+ sb.append(Integer.toHexString(bint));
+ }
+ return sb.toString();
+ }
+
+ public static ByteBuffer hexToBytes(String str)
+ {
+ return ByteBuffer.wrap(FBUtilities.hexToBytes(str));
+ }
}
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java
Wed Jan 19 16:39:52 2011
@@ -262,20 +262,6 @@ public class FBUtilities
return sb.toString();
}
- public static String bytesToHex(ByteBuffer bytes)
- {
- StringBuilder sb = new StringBuilder();
- for (int i = bytes.position(); i < bytes.limit(); i++)
- {
- int bint = bytes.get(i) & 0xff;
- if (bint <= 0xF)
- // toHexString does not 0 pad its results.
- sb.append("0");
- sb.append(Integer.toHexString(bint));
- }
- return sb.toString();
- }
-
public static void renameWithConfirm(String tmpFilename, String filename)
throws IOException
{
if (!new File(tmpFilename).renameTo(new File(filename)))
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
Wed Jan 19 16:39:52 2011
@@ -35,10 +35,11 @@ import org.apache.cassandra.dht.IPartiti
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableWriter;
+import org.apache.cassandra.utils.ByteBufferUtil;
import static org.apache.cassandra.io.sstable.SSTableUtils.tempSSTableFile;
-import static org.apache.cassandra.utils.FBUtilities.bytesToHex;
-import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
+import static org.apache.cassandra.utils.ByteBufferUtil.bytesToHex;
+import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
import static org.junit.Assert.assertTrue;
import org.apache.cassandra.Util;
@@ -48,13 +49,12 @@ import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;
import org.junit.Test;
-import org.apache.cassandra.utils.ByteBufferUtil;
public class SSTableExportTest extends SchemaLoader
{
public String asHex(String str)
{
- return bytesToHex(str.getBytes());
+ return bytesToHex(ByteBuffer.wrap(str.getBytes()));
}
@Test
@@ -124,7 +124,7 @@ public class SSTableExportTest extends S
JSONArray rowA = (JSONArray)json.get(asHex("rowA"));
JSONArray colA = (JSONArray)rowA.get(0);
- assert Arrays.equals(hexToBytes((String)colA.get(1)),
"valA".getBytes());
+ assert
hexToBytes((String)colA.get(1)).equals(ByteBufferUtil.bytes("valA"));
JSONArray colExp = (JSONArray)rowA.get(1);
assert ((Long)colExp.get(4)) == 42;
@@ -173,7 +173,7 @@ public class SSTableExportTest extends S
JSONArray subColumns = (JSONArray)superA.get("subColumns");
JSONArray colA = (JSONArray)subColumns.get(0);
JSONObject rowExclude = (JSONObject)json.get(asHex("rowExclude"));
- assert Arrays.equals(hexToBytes((String)colA.get(1)),
"valA".getBytes());
+ assert
hexToBytes((String)colA.get(1)).equals(ByteBufferUtil.bytes("valA"));
assert !(Boolean)colA.get(3);
assert rowExclude == null;
}
@@ -209,7 +209,7 @@ public class SSTableExportTest extends S
QueryFilter qf = QueryFilter.getNamesFilter(Util.dk("rowA"), new
QueryPath("Standard1", null, null), ByteBufferUtil.bytes("name"));
ColumnFamily cf =
qf.getSSTableColumnIterator(reader).getColumnFamily();
assertTrue(cf != null);
-
assertTrue(cf.getColumn(ByteBufferUtil.bytes("name")).value().equals(ByteBuffer.wrap(hexToBytes("76616c"))));
+
assertTrue(cf.getColumn(ByteBufferUtil.bytes("name")).value().equals(hexToBytes("76616c")));
qf = QueryFilter.getNamesFilter(Util.dk("rowExclude"), new
QueryPath("Standard1", null, null), ByteBufferUtil.bytes("name"));
cf = qf.getSSTableColumnIterator(reader).getColumnFamily();
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java?rev=1060857&r1=1060856&r2=1060857&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Wed Jan 19 16:39:52 2011
@@ -34,7 +34,8 @@ import org.apache.cassandra.db.columnite
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableReader;
-import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
+import org.apache.cassandra.utils.ByteBufferUtil;
+import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
import static org.apache.cassandra.io.sstable.SSTableUtils.tempSSTableFile;
import static org.junit.Assert.assertEquals;
@@ -42,7 +43,6 @@ import org.apache.cassandra.Util;
import org.json.simple.parser.ParseException;
import org.junit.Test;
-import org.apache.cassandra.utils.ByteBufferUtil;
public class SSTableImportTest extends SchemaLoader
{
@@ -60,10 +60,10 @@ public class SSTableImportTest extends S
IColumnIterator iter = qf.getSSTableColumnIterator(reader);
ColumnFamily cf = iter.getColumnFamily();
while (iter.hasNext()) cf.addColumn(iter.next());
- assert
cf.getColumn(ByteBufferUtil.bytes("colAA")).value().equals(ByteBuffer.wrap(hexToBytes("76616c4141")));
+ assert
cf.getColumn(ByteBufferUtil.bytes("colAA")).value().equals(hexToBytes("76616c4141"));
assert !(cf.getColumn(ByteBufferUtil.bytes("colAA")) instanceof
DeletedColumn);
IColumn expCol = cf.getColumn(ByteBufferUtil.bytes("colAC"));
- assert
expCol.value().equals(ByteBuffer.wrap(hexToBytes("76616c4143")));
+ assert expCol.value().equals(hexToBytes("76616c4143"));
assert expCol instanceof ExpiringColumn;
assert ((ExpiringColumn)expCol).getTimeToLive() == 42 &&
expCol.getLocalDeletionTime() == 2000000000;
}
@@ -83,7 +83,7 @@ public class SSTableImportTest extends S
assert superCol != null;
assert superCol.getSubColumns().size() > 0;
IColumn subColumn =
superCol.getSubColumn(ByteBufferUtil.bytes("colAA"));
- assert
subColumn.value().equals(ByteBuffer.wrap(hexToBytes("76616c75654141")));
+ assert subColumn.value().equals(hexToBytes("76616c75654141"));
}
@Test
