[3649] Capitalize DBConstants constant
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f95fc45c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f95fc45c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f95fc45c Branch: refs/heads/trunk Commit: f95fc45cef72b20566748572207e1869a932440a Parents: 686139a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Feb 24 14:10:09 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 27 11:00:09 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Column.java | 2 +- src/java/org/apache/cassandra/db/ColumnFamily.java | 10 +++++----- .../cassandra/db/ColumnFamilySerializer.java | 2 +- .../org/apache/cassandra/db/ColumnIndexer.java | 4 ++-- .../org/apache/cassandra/db/CounterColumn.java | 2 +- .../org/apache/cassandra/db/CounterMutation.java | 2 +- src/java/org/apache/cassandra/db/DBConstants.java | 10 +++++----- .../org/apache/cassandra/db/ExpiringColumn.java | 2 +- .../org/apache/cassandra/db/RangeSliceReply.java | 2 +- src/java/org/apache/cassandra/db/ReadResponse.java | 4 ++-- src/java/org/apache/cassandra/db/Row.java | 2 +- src/java/org/apache/cassandra/db/RowMutation.java | 8 ++++---- src/java/org/apache/cassandra/db/RowPosition.java | 4 ++-- .../cassandra/db/SliceByNamesReadCommand.java | 10 +++++----- .../apache/cassandra/db/SliceFromReadCommand.java | 14 +++++++------- src/java/org/apache/cassandra/db/SuperColumn.java | 2 +- .../org/apache/cassandra/db/WriteResponse.java | 6 +++--- .../cassandra/db/context/CounterContext.java | 8 ++++---- .../org/apache/cassandra/db/filter/QueryPath.java | 6 +++--- .../cassandra/utils/BloomFilterSerializer.java | 6 +++--- 20 files changed, 53 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/Column.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Column.java b/src/java/org/apache/cassandra/db/Column.java index 5b12a70..eee2563 100644 --- a/src/java/org/apache/cassandra/db/Column.java +++ b/src/java/org/apache/cassandra/db/Column.java @@ -134,7 +134,7 @@ public class Column implements IColumn * + 4 bytes which basically indicates the size of the byte array * + entire byte array. */ - return DBConstants.shortSize + name.remaining() + 1 + DBConstants.tsSize + DBConstants.intSize + value.remaining(); + return DBConstants.SHORT_SIZE + name.remaining() + 1 + DBConstants.TIMESTAMP_SIZE + DBConstants.INT_SIZE + value.remaining(); } /* http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index 35c289e..b40718c 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -336,16 +336,16 @@ public class ColumnFamily extends AbstractColumnContainer public long serializedSize() { - return boolSize // nullness bool - + intSize // id + return BOOL_SIZE // nullness bool + + INT_SIZE // id + serializedSizeForSSTable(); } public long serializedSizeForSSTable() { - int size = intSize // local deletion time - + longSize // client deletion time - + intSize; // column count + int size = INT_SIZE // local deletion time + + LONG_SIZE // client deletion time + + INT_SIZE; // column count for (IColumn column : columns) size += column.serializedSize(); return size; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java index dbe2379..8317ac6 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -157,6 +157,6 @@ public class ColumnFamilySerializer implements ISerializer<ColumnFamily> public long serializedSize(ColumnFamily cf) { - return cf == null ? DBConstants.boolSize : cf.serializedSize(); + return cf == null ? DBConstants.BOOL_SIZE : cf.serializedSize(); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/ColumnIndexer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnIndexer.java b/src/java/org/apache/cassandra/db/ColumnIndexer.java index 420ca05..11470b0 100644 --- a/src/java/org/apache/cassandra/db/ColumnIndexer.java +++ b/src/java/org/apache/cassandra/db/ColumnIndexer.java @@ -187,9 +187,9 @@ public class ColumnIndexer public long serializedSize() { - return DBConstants.intSize // length of Bloom Filter + return DBConstants.INT_SIZE // length of Bloom Filter + bloomFilter.serializedSize() // BF data - + DBConstants.intSize // length of index block + + DBConstants.INT_SIZE // length of index block + entriesSize; // index block } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/CounterColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterColumn.java b/src/java/org/apache/cassandra/db/CounterColumn.java index 026900e..fac4bb5 100644 --- a/src/java/org/apache/cassandra/db/CounterColumn.java +++ b/src/java/org/apache/cassandra/db/CounterColumn.java @@ -103,7 +103,7 @@ public class CounterColumn extends Column * A counter column adds to a Column : * + 8 bytes for timestampOfLastDelete */ - return super.size() + DBConstants.tsSize; + return super.size() + DBConstants.TIMESTAMP_SIZE; } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/CounterMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java index 541dfc0..c369afd 100644 --- a/src/java/org/apache/cassandra/db/CounterMutation.java +++ b/src/java/org/apache/cassandra/db/CounterMutation.java @@ -189,6 +189,6 @@ class CounterMutationSerializer implements IVersionedSerializer<CounterMutation> public long serializedSize(CounterMutation cm, int version) { return RowMutation.serializer().serializedSize(cm.rowMutation(), version) - + DBConstants.shortSize + FBUtilities.encodedUTF8Length(cm.consistency().name()); + + DBConstants.SHORT_SIZE + FBUtilities.encodedUTF8Length(cm.consistency().name()); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/DBConstants.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DBConstants.java b/src/java/org/apache/cassandra/db/DBConstants.java index 047bea2..da18d35 100644 --- a/src/java/org/apache/cassandra/db/DBConstants.java +++ b/src/java/org/apache/cassandra/db/DBConstants.java @@ -20,9 +20,9 @@ package org.apache.cassandra.db; public class DBConstants { - public static final int boolSize = 1; - public static final int intSize = 4; - public static final int longSize = 8; - public static final int shortSize = 2; - public static final int tsSize = 8; + public static final int BOOL_SIZE = 1; + public static final int INT_SIZE = 4; + public static final int LONG_SIZE = 8; + public static final int SHORT_SIZE = 2; + public static final int TIMESTAMP_SIZE = 8; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/ExpiringColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ExpiringColumn.java b/src/java/org/apache/cassandra/db/ExpiringColumn.java index adf1913..142a44d 100644 --- a/src/java/org/apache/cassandra/db/ExpiringColumn.java +++ b/src/java/org/apache/cassandra/db/ExpiringColumn.java @@ -82,7 +82,7 @@ public class ExpiringColumn extends Column * 4 bytes for the localExpirationTime * + 4 bytes for the timeToLive */ - return super.size() + DBConstants.intSize + DBConstants.intSize; + return super.size() + DBConstants.INT_SIZE + DBConstants.INT_SIZE; } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/RangeSliceReply.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeSliceReply.java b/src/java/org/apache/cassandra/db/RangeSliceReply.java index 683a6e9..167d8e4 100644 --- a/src/java/org/apache/cassandra/db/RangeSliceReply.java +++ b/src/java/org/apache/cassandra/db/RangeSliceReply.java @@ -41,7 +41,7 @@ public class RangeSliceReply public Message getReply(Message originalMessage) throws IOException { - int size = DBConstants.intSize; + int size = DBConstants.INT_SIZE; for (Row row : rows) size += Row.serializer().serializedSize(row, originalMessage.getVersion()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/ReadResponse.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java index ba2d4fc..2085647 100644 --- a/src/java/org/apache/cassandra/db/ReadResponse.java +++ b/src/java/org/apache/cassandra/db/ReadResponse.java @@ -114,8 +114,8 @@ class ReadResponseSerializer implements IVersionedSerializer<ReadResponse> public long serializedSize(ReadResponse response, int version) { - int size = DBConstants.intSize; - size += DBConstants.boolSize; + int size = DBConstants.INT_SIZE; + size += DBConstants.BOOL_SIZE; if (response.isDigestQuery()) size += response.digest().remaining(); else http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/Row.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Row.java b/src/java/org/apache/cassandra/db/Row.java index 8856acd..264435c 100644 --- a/src/java/org/apache/cassandra/db/Row.java +++ b/src/java/org/apache/cassandra/db/Row.java @@ -80,7 +80,7 @@ public class Row public long serializedSize(Row row, int version) { - return DBConstants.shortSize + row.key.key.remaining() + ColumnFamily.serializer().serializedSize(row.cf); + return DBConstants.SHORT_SIZE + row.key.key.remaining() + ColumnFamily.serializer().serializedSize(row.cf); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java index bd011f4..c8480ee 100644 --- a/src/java/org/apache/cassandra/db/RowMutation.java +++ b/src/java/org/apache/cassandra/db/RowMutation.java @@ -430,13 +430,13 @@ public class RowMutation implements IMutation, MessageProducer public long serializedSize(RowMutation rm, int version) { - int size = DBConstants.shortSize + FBUtilities.encodedUTF8Length(rm.getTable()); - size += DBConstants.shortSize + rm.key().remaining(); + int size = DBConstants.SHORT_SIZE + FBUtilities.encodedUTF8Length(rm.getTable()); + size += DBConstants.SHORT_SIZE + rm.key().remaining(); - size += DBConstants.intSize; + size += DBConstants.INT_SIZE; for (Map.Entry<Integer,ColumnFamily> entry : rm.modifications.entrySet()) { - size += DBConstants.intSize; + size += DBConstants.INT_SIZE; size += entry.getValue().serializedSize(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/RowPosition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowPosition.java b/src/java/org/apache/cassandra/db/RowPosition.java index 2bdfc5c..210d8a2 100644 --- a/src/java/org/apache/cassandra/db/RowPosition.java +++ b/src/java/org/apache/cassandra/db/RowPosition.java @@ -103,8 +103,8 @@ public abstract class RowPosition implements RingPosition<RowPosition> public long serializedSize(RowPosition pos) { Kind kind = pos.kind(); - return DBConstants.boolSize - + (kind == Kind.ROW_KEY ? DBConstants.shortSize + ((DecoratedKey)pos).key.remaining() + return DBConstants.BOOL_SIZE + + (kind == Kind.ROW_KEY ? DBConstants.SHORT_SIZE + ((DecoratedKey)pos).key.remaining() : Token.serializer().serializedSize(pos.getToken())); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java index fe3f7ab..23d70e2 100644 --- a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java +++ b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java @@ -111,15 +111,15 @@ class SliceByNamesReadCommandSerializer implements IVersionedSerializer<ReadComm public long serializedSize(ReadCommand cmd, int version) { SliceByNamesReadCommand command = (SliceByNamesReadCommand) cmd; - int size = DBConstants.boolSize; - size += DBConstants.shortSize + FBUtilities.encodedUTF8Length(command.table); - size += DBConstants.shortSize + command.key.remaining(); + int size = DBConstants.BOOL_SIZE; + size += DBConstants.SHORT_SIZE + FBUtilities.encodedUTF8Length(command.table); + size += DBConstants.SHORT_SIZE + command.key.remaining(); size += command.queryPath.serializedSize(); - size += DBConstants.intSize; + size += DBConstants.INT_SIZE; if (!command.columnNames.isEmpty()) { for (ByteBuffer cName : command.columnNames) - size += DBConstants.shortSize + cName.remaining(); + size += DBConstants.SHORT_SIZE + cName.remaining(); } return size; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java index 58b5e22..a9efb27 100644 --- a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java +++ b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java @@ -185,14 +185,14 @@ class SliceFromReadCommandSerializer implements IVersionedSerializer<ReadCommand public long serializedSize(ReadCommand cmd, int version) { SliceFromReadCommand command = (SliceFromReadCommand) cmd; - int size = DBConstants.boolSize; - size += DBConstants.shortSize + FBUtilities.encodedUTF8Length(command.table); - size += DBConstants.shortSize + command.key.remaining(); + int size = DBConstants.BOOL_SIZE; + size += DBConstants.SHORT_SIZE + FBUtilities.encodedUTF8Length(command.table); + size += DBConstants.SHORT_SIZE + command.key.remaining(); size += command.queryPath.serializedSize(); - size += DBConstants.shortSize + command.start.remaining(); - size += DBConstants.shortSize + command.finish.remaining(); - size += DBConstants.boolSize; - size += DBConstants.intSize; + size += DBConstants.SHORT_SIZE + command.start.remaining(); + size += DBConstants.SHORT_SIZE + command.finish.remaining(); + size += DBConstants.BOOL_SIZE; + size += DBConstants.INT_SIZE; return size; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/SuperColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SuperColumn.java b/src/java/org/apache/cassandra/db/SuperColumn.java index e455a94..bab84fc 100644 --- a/src/java/org/apache/cassandra/db/SuperColumn.java +++ b/src/java/org/apache/cassandra/db/SuperColumn.java @@ -123,7 +123,7 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn * We need to keep the way we are calculating the column size in sync with the * way we are calculating the size for the column family serializer. */ - return DBConstants.shortSize + name.remaining() + DBConstants.intSize + DBConstants.longSize + DBConstants.intSize + size(); + return DBConstants.SHORT_SIZE + name.remaining() + DBConstants.INT_SIZE + DBConstants.LONG_SIZE + DBConstants.INT_SIZE + size(); } public long timestamp() http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/WriteResponse.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/WriteResponse.java b/src/java/org/apache/cassandra/db/WriteResponse.java index 1acc8c2..0377d3b 100644 --- a/src/java/org/apache/cassandra/db/WriteResponse.java +++ b/src/java/org/apache/cassandra/db/WriteResponse.java @@ -94,9 +94,9 @@ public class WriteResponse public long serializedSize(WriteResponse response, int version) { - int size = DBConstants.shortSize + FBUtilities.encodedUTF8Length(response.table()); - size += DBConstants.shortSize + response.key().remaining(); - size += DBConstants.boolSize; + int size = DBConstants.SHORT_SIZE + FBUtilities.encodedUTF8Length(response.table()); + size += DBConstants.SHORT_SIZE + response.key().remaining(); + size += DBConstants.BOOL_SIZE; return size; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/context/CounterContext.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java index d466caa..b7d26a8 100644 --- a/src/java/org/apache/cassandra/db/context/CounterContext.java +++ b/src/java/org/apache/cassandra/db/context/CounterContext.java @@ -70,10 +70,10 @@ import org.apache.cassandra.utils.NodeId; */ public class CounterContext implements IContext { - private static final int HEADER_SIZE_LENGTH = DBConstants.shortSize; - private static final int HEADER_ELT_LENGTH = DBConstants.shortSize; - private static final int CLOCK_LENGTH = DBConstants.longSize; - private static final int COUNT_LENGTH = DBConstants.longSize; + private static final int HEADER_SIZE_LENGTH = DBConstants.SHORT_SIZE; + private static final int HEADER_ELT_LENGTH = DBConstants.SHORT_SIZE; + private static final int CLOCK_LENGTH = DBConstants.LONG_SIZE; + private static final int COUNT_LENGTH = DBConstants.LONG_SIZE; private static final int STEP_LENGTH = NodeId.LENGTH + CLOCK_LENGTH + COUNT_LENGTH; private static final Logger logger = LoggerFactory.getLogger(CounterContext.class); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/db/filter/QueryPath.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/QueryPath.java b/src/java/org/apache/cassandra/db/filter/QueryPath.java index a6d52e6..7ea0026 100644 --- a/src/java/org/apache/cassandra/db/filter/QueryPath.java +++ b/src/java/org/apache/cassandra/db/filter/QueryPath.java @@ -100,9 +100,9 @@ public class QueryPath public int serializedSize() { - int size = DBConstants.shortSize + (columnFamilyName == null ? 0 : FBUtilities.encodedUTF8Length(columnFamilyName)); - size += DBConstants.shortSize + (superColumnName == null ? 0 : superColumnName.remaining()); - size += DBConstants.shortSize + (columnName == null ? 0 : columnName.remaining()); + int size = DBConstants.SHORT_SIZE + (columnFamilyName == null ? 0 : FBUtilities.encodedUTF8Length(columnFamilyName)); + size += DBConstants.SHORT_SIZE + (superColumnName == null ? 0 : superColumnName.remaining()); + size += DBConstants.SHORT_SIZE + (columnName == null ? 0 : columnName.remaining()); return size; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95fc45c/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java index 7625b16..a849004 100644 --- a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java +++ b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java @@ -76,8 +76,8 @@ public class BloomFilterSerializer implements ISerializer<BloomFilter> */ public long serializedSize(BloomFilter bf) { - return DBConstants.intSize // hash count - + DBConstants.intSize // length - + bf.bitset.getNumWords() * DBConstants.longSize; // buckets + return DBConstants.INT_SIZE // hash count + + DBConstants.INT_SIZE // length + + bf.bitset.getNumWords() * DBConstants.LONG_SIZE; // buckets } }
