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/07/13 01:58:08 UTC
svn commit: r1145822 - in /cassandra/trunk/src/java/org/apache/cassandra:
db/ db/context/ utils/
Author: jbellis
Date: Tue Jul 12 23:58:07 2011
New Revision: 1145822
URL: http://svn.apache.org/viewvc?rev=1145822&view=rev
Log:
r/m underscores
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java
cassandra/trunk/src/java/org/apache/cassandra/db/CounterColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/DBConstants.java
cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java
cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/Column.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/Column.java Tue Jul 12 23:58:07 2011
@@ -128,7 +128,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.shortSize + name.remaining() + 1 + DBConstants.tsSize + DBConstants.intSize + value.remaining();
}
/*
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java Tue Jul 12 23:58:07 2011
@@ -23,7 +23,6 @@ import static org.apache.cassandra.db.DB
import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.util.Map;
-import java.util.SortedSet;
import java.util.concurrent.ConcurrentSkipListMap;
import org.apache.cassandra.config.CFMetaData;
@@ -32,7 +31,6 @@ import org.apache.cassandra.db.filter.Qu
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.io.IColumnSerializer;
-import org.apache.cassandra.io.util.IIterableColumns;
import org.apache.cassandra.utils.FBUtilities;
public class ColumnFamily extends AbstractColumnContainer
@@ -306,16 +304,16 @@ public class ColumnFamily extends Abstra
public long serializedSize()
{
- return boolSize_ // nullness bool
- + intSize_ // id
+ return boolSize // nullness bool
+ + intSize // id
+ serializedSizeForSSTable();
}
public long serializedSizeForSSTable()
{
- int size = intSize_ // local deletion time
- + longSize_ // client deletion time
- + intSize_; // column count
+ int size = intSize // local deletion time
+ + longSize // client deletion time
+ + intSize; // column count
for (IColumn column : columns.values())
size += column.serializedSize();
return size;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java Tue Jul 12 23:58:07 2011
@@ -188,9 +188,9 @@ public class ColumnIndexer
public long serializedSize()
{
- return DBConstants.intSize_ // length of Bloom Filter
+ return DBConstants.intSize // length of Bloom Filter
+ bloomFilter.serializedSize() // BF data
- + DBConstants.intSize_ // length of index block
+ + DBConstants.intSize // length of index block
+ entriesSize; // index block
}
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/CounterColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CounterColumn.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CounterColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CounterColumn.java Tue Jul 12 23:58:07 2011
@@ -19,10 +19,8 @@
package org.apache.cassandra.db;
import java.io.IOException;
-import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
-import java.util.Arrays;
import java.util.Map;
import org.apache.log4j.Logger;
@@ -34,7 +32,6 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.NodeId;
/**
@@ -93,7 +90,7 @@ public class CounterColumn extends Colum
* A counter column adds to a Column :
* + 8 bytes for timestampOfLastDelete
*/
- return super.size() + DBConstants.tsSize_;
+ return super.size() + DBConstants.tsSize;
}
@Override
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DBConstants.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DBConstants.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DBConstants.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DBConstants.java Tue Jul 12 23:58:07 2011
@@ -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 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;
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java Tue Jul 12 23:58:07 2011
@@ -85,7 +85,7 @@ public class ExpiringColumn extends Colu
* 4 bytes for the localExpirationTime
* + 4 bytes for the timeToLive
*/
- return super.size() + DBConstants.intSize_ + DBConstants.intSize_;
+ return super.size() + DBConstants.intSize + DBConstants.intSize;
}
@Override
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java Tue Jul 12 23:58:07 2011
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.util.Collection;
import java.util.Comparator;
-import java.util.IdentityHashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -36,7 +35,6 @@ import org.apache.cassandra.io.IColumnSe
import org.apache.cassandra.io.util.ColumnSortedMap;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
@@ -125,7 +123,7 @@ public class SuperColumn extends Abstrac
* 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.shortSize + name.remaining() + DBConstants.intSize + DBConstants.longSize + DBConstants.intSize + size();
}
public long timestamp()
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java Tue Jul 12 23:58:07 2011
@@ -59,10 +59,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.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 STEP_LENGTH = NodeId.LENGTH + CLOCK_LENGTH + COUNT_LENGTH;
// Time in ms since a node id has been renewed before we consider using it
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java?rev=1145822&r1=1145821&r2=1145822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java Tue Jul 12 23:58:07 2011
@@ -64,8 +64,8 @@ class BloomFilterSerializer implements I
*/
public static int serializedSize(BloomFilter bf)
{
- return DBConstants.intSize_ // hash count
- + DBConstants.intSize_ // length
- + bf.bitset.getBits().length * DBConstants.longSize_; // buckets
+ return DBConstants.intSize // hash count
+ + DBConstants.intSize // length
+ + bf.bitset.getBits().length * DBConstants.longSize; // buckets
}
}