Author: jbellis
Date: Sat Aug 1 22:31:33 2009
New Revision: 799951
URL: http://svn.apache.org/viewvc?rev=799951&view=rev
Log:
fix spelling, indents from old SequenceFile code
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java?rev=799951&r1=799950&r2=799951&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
Sat Aug 1 22:31:33 2009
@@ -166,19 +166,19 @@
/**
* Build a list of index entries ready for search.
*/
- private List<IndexHelper.ColumnIndexInfo>
getFullColumnIndexList(List<IndexHelper.ColumnIndexInfo> columnIndexList, int
totalNumCols)
+ private List<IndexHelper.ColumnIndexInfo>
getFullColumnIndexList(List<IndexHelper.ColumnIndexInfo> columnIndexList, int
totalColumns)
{
if (columnIndexList.size() == 0)
{
/* if there is no column index, add an index entry that covers
the full space. */
- return Arrays.asList(new
IndexHelper.ColumnIndexInfo(ArrayUtils.EMPTY_BYTE_ARRAY, 0, totalNumCols,
comparator_));
+ return Arrays.asList(new
IndexHelper.ColumnIndexInfo(ArrayUtils.EMPTY_BYTE_ARRAY, 0, totalColumns,
comparator_));
}
List<IndexHelper.ColumnIndexInfo> fullColIndexList = new
ArrayList<IndexHelper.ColumnIndexInfo>();
- int accumulatededCols = 0;
+ int accumulatedColumns = 0;
for (IndexHelper.ColumnIndexInfo colPosInfo : columnIndexList)
- accumulatededCols += colPosInfo.count();
- int remainingCols = totalNumCols - accumulatededCols;
+ accumulatedColumns += colPosInfo.count();
+ int remainingCols = totalColumns - accumulatedColumns;
fullColIndexList.add(new
IndexHelper.ColumnIndexInfo(ArrayUtils.EMPTY_BYTE_ARRAY, 0,
columnIndexList.get(0).count(), comparator_));
for (int i = 0; i < columnIndexList.size() - 1; i++)
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java?rev=799951&r1=799950&r2=799951&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IndexHelper.java
Sat Aug 1 22:31:33 2009
@@ -129,7 +129,7 @@
/**
* Deserialize the index into a structure and return the number of bytes
read.
* @param tableName
- *...@param in Input from which the serialized form of the index is read
+ * @param in Input from which the serialized form of the index is read
* @param columnIndexList the structure which is filled in with the
deserialized index @return number of bytes read from the input
* @throws IOException
*/
@@ -245,7 +245,7 @@
}
/**
- * Reads the column name indexes if present. If the
+ * Reads the column name indexes if present. If the
* indexes are based on time then skip over them.
*/
public static int readColumnIndexes(RandomAccessFile file, String
tableName, String cfName, List<ColumnIndexInfo> columnIndexList) throws
IOException
@@ -263,7 +263,7 @@
}
/**
- * Defreeze the bloom filter.
+ * Defreeze the bloom filter.
*
* @return bloom filter summarizing the column information
* @throws java.io.IOException
@@ -308,10 +308,10 @@
}
}
- /**
- * A helper class to generate indexes while
+ /**
+ * A helper class to generate indexes while
* the columns are sorted by name on disk.
- */
+ */
public static class ColumnIndexInfo implements Comparable<ColumnIndexInfo>
{
private long position_;
