Updated Branches: refs/heads/trunk 17d40b726 -> 60d9c7f2f
inline Column.serializer() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3569d05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3569d05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3569d05 Branch: refs/heads/trunk Commit: c3569d05b8d28d3b3481d2e661320071dc30431c Parents: 17d40b7 Author: Jonathan Ellis <[email protected]> Authored: Tue Mar 26 23:11:39 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Mar 26 23:11:39 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Column.java | 7 +------ .../cassandra/db/ColumnFamilySerializer.java | 4 ++-- src/java/org/apache/cassandra/db/OnDiskAtom.java | 4 ++-- src/java/org/apache/cassandra/db/SuperColumns.java | 7 +++---- .../org/apache/cassandra/db/CounterColumnTest.java | 6 +++--- 5 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3569d05/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 4efcfbd..35eeba6 100644 --- a/src/java/org/apache/cassandra/db/Column.java +++ b/src/java/org/apache/cassandra/db/Column.java @@ -44,12 +44,7 @@ public class Column implements OnDiskAtom { public static final int MAX_NAME_LENGTH = FBUtilities.MAX_UNSIGNED_SHORT; - private static final ColumnSerializer serializer = new ColumnSerializer(); - - public static ColumnSerializer serializer() - { - return serializer; - } + public static final ColumnSerializer serializer = new ColumnSerializer(); public static OnDiskAtom.Serializer onDiskSerializer() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3569d05/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 2b3b598..f596fab 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -69,7 +69,7 @@ public class ColumnFamilySerializer implements IVersionedSerializer<ColumnFamily } DeletionInfo.serializer().serialize(cf.deletionInfo(), dos, version); - ColumnSerializer columnSerializer = Column.serializer(); + ColumnSerializer columnSerializer = Column.serializer; int count = cf.getColumnCount(); dos.writeInt(count); int written = 0; @@ -107,7 +107,7 @@ public class ColumnFamilySerializer implements IVersionedSerializer<ColumnFamily { cf.delete(DeletionInfo.serializer().deserialize(dis, version, cf.getComparator())); - ColumnSerializer columnSerializer = Column.serializer(); + ColumnSerializer columnSerializer = Column.serializer; int size = dis.readInt(); for (int i = 0; i < size; ++i) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3569d05/src/java/org/apache/cassandra/db/OnDiskAtom.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/OnDiskAtom.java b/src/java/org/apache/cassandra/db/OnDiskAtom.java index cc997ca..f398626 100644 --- a/src/java/org/apache/cassandra/db/OnDiskAtom.java +++ b/src/java/org/apache/cassandra/db/OnDiskAtom.java @@ -55,7 +55,7 @@ public interface OnDiskAtom { if (atom instanceof Column) { - Column.serializer().serialize((Column)atom, dos); + Column.serializer.serialize((Column) atom, dos); } else { @@ -79,7 +79,7 @@ public interface OnDiskAtom if ((b & ColumnSerializer.RANGE_TOMBSTONE_MASK) != 0) return RangeTombstone.serializer.deserializeBody(dis, name, version); else - return Column.serializer().deserializeColumnBody(dis, name, b, flag, expireBefore); + return Column.serializer.deserializeColumnBody(dis, name, b, flag, expireBefore); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3569d05/src/java/org/apache/cassandra/db/SuperColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SuperColumns.java b/src/java/org/apache/cassandra/db/SuperColumns.java index c45f9f4..8295c7d 100644 --- a/src/java/org/apache/cassandra/db/SuperColumns.java +++ b/src/java/org/apache/cassandra/db/SuperColumns.java @@ -34,7 +34,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.ByteBufferUtil; @@ -74,7 +73,7 @@ public class SuperColumns dos.writeInt(entry.getValue().size()); for (Column subColumn : entry.getValue()) - Column.serializer().serialize(subColumn, dos); + Column.serializer.serialize(subColumn, dos); } } @@ -134,7 +133,7 @@ public class SuperColumns size += typeSizes.sizeof(entry.getValue().size()); for (Column subColumn : entry.getValue()) - size += Column.serializer().serializedSize(subColumn, typeSizes); + size += Column.serializer.serializedSize(subColumn, typeSizes); } return size; } @@ -186,7 +185,7 @@ public class SuperColumns List<Column> subColumns = new ArrayList<Column>(size); for (int i = 0; i < size; ++i) - subColumns.add(Column.serializer().deserialize(dis, flag, expireBefore)); + subColumns.add(Column.serializer.deserialize(dis, flag, expireBefore)); subColumnsIterator = subColumns.iterator(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3569d05/test/unit/org/apache/cassandra/db/CounterColumnTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CounterColumnTest.java b/test/unit/org/apache/cassandra/db/CounterColumnTest.java index c192623..90fe76f 100644 --- a/test/unit/org/apache/cassandra/db/CounterColumnTest.java +++ b/test/unit/org/apache/cassandra/db/CounterColumnTest.java @@ -277,15 +277,15 @@ public class CounterColumnTest extends SchemaLoader CounterColumn original = new CounterColumn(ByteBufferUtil.bytes("x"), state.context, 1L); DataOutputBuffer bufOut = new DataOutputBuffer(); - Column.serializer().serialize(original, bufOut); + Column.serializer.serialize(original, bufOut); byte[] serialized = bufOut.getData(); ByteArrayInputStream bufIn = new ByteArrayInputStream(serialized, 0, serialized.length); - CounterColumn deserialized = (CounterColumn)Column.serializer().deserialize(new DataInputStream(bufIn)); + CounterColumn deserialized = (CounterColumn) Column.serializer.deserialize(new DataInputStream(bufIn)); assert original.equals(deserialized); bufIn = new ByteArrayInputStream(serialized, 0, serialized.length); - CounterColumn deserializedOnRemote = (CounterColumn)Column.serializer().deserialize(new DataInputStream(bufIn), ColumnSerializer.Flag.FROM_REMOTE); + CounterColumn deserializedOnRemote = (CounterColumn) Column.serializer.deserialize(new DataInputStream(bufIn), ColumnSerializer.Flag.FROM_REMOTE); assert deserializedOnRemote.name().equals(original.name()); assert deserializedOnRemote.total() == original.total(); assert deserializedOnRemote.value().equals(cc.clearAllDelta(original.value()));
