You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/27 11:16:00 UTC
[2/28] [3649] Strip end of line whitespace
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index a9cc965..13e9f06 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -167,7 +167,7 @@ public class QueryProcessor
throw new InvalidRequestException("Start key must sort before (or equal to) finish key in your partitioner!");
}
AbstractBounds<RowPosition> bounds = new Bounds<RowPosition>(startKey, finishKey);
-
+
// XXX: Our use of Thrift structs internally makes me Sad. :(
SlicePredicate thriftSlicePredicate = slicePredicateFromSelect(select, metadata, variables);
validateSlicePredicate(metadata, thriftSlicePredicate);
@@ -251,7 +251,7 @@ public class QueryProcessor
rowMutations.addAll(update.prepareRowMutations(keyspace, clientState, variables));
}
-
+
try
{
StorageProxy.mutate(rowMutations, consistency);
@@ -265,12 +265,12 @@ public class QueryProcessor
throw new TimedOutException();
}
}
-
+
private static SlicePredicate slicePredicateFromSelect(SelectStatement select, CFMetaData metadata, List<ByteBuffer> variables)
throws InvalidRequestException
{
SlicePredicate thriftSlicePredicate = new SlicePredicate();
-
+
if (select.isColumnRange() || select.getColumnNames().size() == 0)
{
SliceRange sliceRange = new SliceRange();
@@ -284,10 +284,10 @@ public class QueryProcessor
{
thriftSlicePredicate.column_names = getColumnNames(select, metadata, variables);
}
-
+
return thriftSlicePredicate;
}
-
+
/* Test for SELECT-specific taboos */
private static void validateSelect(String keyspace, SelectStatement select, List<ByteBuffer> variables) throws InvalidRequestException
{
@@ -296,15 +296,15 @@ public class QueryProcessor
// Finish key w/o start key (KEY < foo)
if (!select.isKeyRange() && (select.getKeyFinish() != null))
throw new InvalidRequestException("Key range clauses must include a start key (i.e. KEY > term)");
-
+
// Key range and by-key(s) combined (KEY > foo AND KEY = bar)
if (select.isKeyRange() && select.getKeys().size() > 0)
throw new InvalidRequestException("You cannot combine key range and by-key clauses in a SELECT");
-
+
// Start and finish keys, *and* column relations (KEY > foo AND KEY < bar and name1 = value1).
if (select.isKeyRange() && (select.getKeyFinish() != null) && (select.getColumnRelations().size() > 0))
throw new InvalidRequestException("You cannot combine key range and by-column clauses in a SELECT");
-
+
// Can't use more than one KEY =
if (!select.isMultiKey() && select.getKeys().size() > 1)
throw new InvalidRequestException("You cannot use more than one KEY = in a SELECT");
@@ -360,7 +360,7 @@ public class QueryProcessor
validateSchemaIsSettled();
}
-
+
public static void validateKey(ByteBuffer key) throws InvalidRequestException
{
if (key == null || key.remaining() == 0)
@@ -403,7 +403,7 @@ public class QueryProcessor
{
validateColumnNames(Arrays.asList(column));
}
-
+
public static void validateColumn(CFMetaData metadata, ByteBuffer name, ByteBuffer value)
throws InvalidRequestException
{
@@ -422,7 +422,7 @@ public class QueryProcessor
me.getMessage()));
}
}
-
+
private static void validateSlicePredicate(CFMetaData metadata, SlicePredicate predicate)
throws InvalidRequestException
{
@@ -431,13 +431,13 @@ public class QueryProcessor
else
validateColumnNames(predicate.column_names);
}
-
+
private static void validateSliceRange(CFMetaData metadata, SliceRange range)
throws InvalidRequestException
{
validateSliceRange(metadata, range.start, range.finish, range.reversed);
}
-
+
private static void validateSliceRange(CFMetaData metadata, ByteBuffer start, ByteBuffer finish, boolean reversed)
throws InvalidRequestException
{
@@ -446,7 +446,7 @@ public class QueryProcessor
if (start.remaining() > 0 && finish.remaining() > 0 && orderedComparator.compare(start, finish) > 0)
throw new InvalidRequestException("range finish must come after start in traversal order");
}
-
+
// Copypasta from CassandraServer (where it is private).
private static void validateSchemaAgreement() throws SchemaDisagreementException
{
@@ -465,13 +465,13 @@ public class QueryProcessor
throws UnavailableException, InvalidRequestException, TimedOutException, SchemaDisagreementException
{
String keyspace = null;
-
+
// Some statements won't have (or don't need) a keyspace (think USE, or CREATE).
if (statement.type != StatementType.SELECT && StatementType.requiresKeyspace.contains(statement.type))
keyspace = clientState.getKeyspace();
CqlResult result = new CqlResult();
-
+
if (logger.isDebugEnabled()) logger.debug("CQL statement type: {}", statement.type.toString());
CFMetaData metadata;
switch (statement.type)
@@ -625,7 +625,7 @@ public class QueryProcessor
batchUpdate(clientState, Collections.singletonList(update), update.getConsistencyLevel(), variables);
result.type = CqlResultType.VOID;
return result;
-
+
case BATCH:
BatchStatement batch = (BatchStatement) statement.statement;
ThriftValidation.validateConsistencyLevel(keyspace, batch.getConsistencyLevel(), RequestType.WRITE);
@@ -659,20 +659,20 @@ public class QueryProcessor
result.type = CqlResultType.VOID;
return result;
-
+
case USE:
clientState.setKeyspace(CliUtils.unescapeSQLString((String) statement.statement));
result.type = CqlResultType.VOID;
-
+
return result;
-
+
case TRUNCATE:
Pair<String, String> columnFamily = (Pair<String, String>)statement.statement;
keyspace = columnFamily.left == null ? clientState.getKeyspace() : columnFamily.left;
validateColumnFamily(keyspace, columnFamily.right);
clientState.hasColumnFamilyAccess(keyspace, columnFamily.right, Permission.WRITE);
-
+
try
{
StorageProxy.truncateBlocking(keyspace, columnFamily.right);
@@ -685,10 +685,10 @@ public class QueryProcessor
{
throw (UnavailableException) new UnavailableException().initCause(e);
}
-
+
result.type = CqlResultType.VOID;
return result;
-
+
case DELETE:
DeleteStatement delete = (DeleteStatement)statement.statement;
@@ -702,17 +702,17 @@ public class QueryProcessor
{
throw new TimedOutException();
}
-
+
result.type = CqlResultType.VOID;
return result;
-
+
case CREATE_KEYSPACE:
CreateKeyspaceStatement create = (CreateKeyspaceStatement)statement.statement;
create.validate();
ThriftValidation.validateKeyspaceNotSystem(create.getName());
clientState.hasKeyspaceSchemaAccess(Permission.WRITE);
validateSchemaAgreement();
-
+
try
{
KsDef ksd = new KsDef(create.getName(),
@@ -729,10 +729,10 @@ public class QueryProcessor
ex.initCause(e);
throw ex;
}
-
+
result.type = CqlResultType.VOID;
return result;
-
+
case CREATE_COLUMNFAMILY:
CreateColumnFamilyStatement createCf = (CreateColumnFamilyStatement)statement.statement;
clientState.hasColumnFamilySchemaAccess(Permission.WRITE);
@@ -750,10 +750,10 @@ public class QueryProcessor
ex.initCause(e);
throw ex;
}
-
+
result.type = CqlResultType.VOID;
return result;
-
+
case CREATE_INDEX:
CreateIndexStatement createIdx = (CreateIndexStatement)statement.statement;
clientState.hasColumnFamilySchemaAccess(Permission.WRITE);
@@ -773,7 +773,7 @@ public class QueryProcessor
{
if (cd.index_type != null)
throw new InvalidRequestException("Index already exists");
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled())
logger.debug("Updating column {} definition for index {}", oldCfm.comparator.getString(columnName), createIdx.getIndexName());
cd.setIndex_type(IndexType.KEYS);
cd.setIndex_name(createIdx.getIndexName());
@@ -796,7 +796,7 @@ public class QueryProcessor
ex.initCause(e);
throw ex;
}
-
+
result.type = CqlResultType.VOID;
return result;
@@ -830,7 +830,7 @@ public class QueryProcessor
ThriftValidation.validateKeyspaceNotSystem(deleteKeyspace);
clientState.hasKeyspaceSchemaAccess(Permission.WRITE);
validateSchemaAgreement();
-
+
try
{
applyMigrationOnStage(new DropKeyspace(deleteKeyspace));
@@ -841,15 +841,15 @@ public class QueryProcessor
ex.initCause(e);
throw ex;
}
-
+
result.type = CqlResultType.VOID;
return result;
-
+
case DROP_COLUMNFAMILY:
String deleteColumnFamily = (String)statement.statement;
clientState.hasColumnFamilySchemaAccess(Permission.WRITE);
validateSchemaAgreement();
-
+
try
{
applyMigrationOnStage(new DropColumnFamily(keyspace, deleteColumnFamily));
@@ -860,7 +860,7 @@ public class QueryProcessor
ex.initCause(e);
throw ex;
}
-
+
result.type = CqlResultType.VOID;
return result;
@@ -911,21 +911,21 @@ public class QueryProcessor
return new CqlPreparedResult(statementId, statement.boundTerms);
}
-
+
public static CqlResult processPrepared(CQLStatement statement, ClientState clientState, List<ByteBuffer> variables)
throws UnavailableException, InvalidRequestException, TimedOutException, SchemaDisagreementException
{
- // Check to see if there are any bound variables to verify
+ // Check to see if there are any bound variables to verify
if (!(variables.isEmpty() && (statement.boundTerms == 0)))
{
- if (variables.size() != statement.boundTerms)
+ if (variables.size() != statement.boundTerms)
throw new InvalidRequestException(String.format("there were %d markers(?) in CQL but %d bound variables",
statement.boundTerms,
variables.size()));
// at this point there is a match in count between markers and variables that is non-zero
- if (logger.isTraceEnabled())
+ if (logger.isTraceEnabled())
for (int i = 0; i < variables.size(); i++)
logger.trace("[{}] '{}'", i+1, variables.get(i));
}
@@ -968,15 +968,15 @@ public class QueryProcessor
CqlLexer lexer = new CqlLexer(stream);
TokenStream tokenStream = new CommonTokenStream(lexer);
CqlParser parser = new CqlParser(tokenStream);
-
+
// Parse the query string to a statement instance
CQLStatement statement = parser.query();
-
+
// The lexer and parser queue up any errors they may have encountered
// along the way, if necessary, we turn them into exceptions here.
lexer.throwLastRecognitionError();
parser.throwLastRecognitionError();
-
+
return statement;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/Relation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/Relation.java b/src/java/org/apache/cassandra/cql/Relation.java
index 7569789..669c5f2 100644
--- a/src/java/org/apache/cassandra/cql/Relation.java
+++ b/src/java/org/apache/cassandra/cql/Relation.java
@@ -27,10 +27,10 @@ public class Relation
private final Term entity;
private final RelationType relationType;
private final Term value;
-
+
/**
* Creates a new relation.
- *
+ *
* @param entity the kind of relation this is; what the term is being compared to.
* @param type the type that describes how this entity relates to the value.
* @param value the value being compared.
@@ -41,22 +41,22 @@ public class Relation
this.relationType = RelationType.forString(type);
this.value = value;
}
-
+
public RelationType operator()
{
return relationType;
}
-
+
public Term getEntity()
{
return entity;
}
-
+
public Term getValue()
{
return value;
}
-
+
@Override
public String toString()
{
@@ -67,7 +67,7 @@ public class Relation
enum RelationType
{
EQ, LT, LTE, GTE, GT;
-
+
public static RelationType forString(String s)
{
if (s.equals("="))
@@ -80,7 +80,7 @@ enum RelationType
return GTE;
else if (s.equals(">"))
return GT;
-
+
return null;
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/SelectExpression.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/SelectExpression.java b/src/java/org/apache/cassandra/cql/SelectExpression.java
index 0793cd8..4d3cb2f 100644
--- a/src/java/org/apache/cassandra/cql/SelectExpression.java
+++ b/src/java/org/apache/cassandra/cql/SelectExpression.java
@@ -25,23 +25,23 @@ import java.util.List;
* determine which columns will appear in the result set. SelectExpression
* instances encapsulate a parsed expression from a <code>SELECT</code>
* statement.
- *
+ *
* See: doc/cql/CQL.html#SpecifyingColumns
*/
public class SelectExpression
{
public static final int MAX_COLUMNS_DEFAULT = 10000;
-
+
private int numColumns = MAX_COLUMNS_DEFAULT;
private boolean reverseColumns = false;
private final boolean hasFirstSet;
private final boolean wildcard;
private final Term start, finish;
private final List<Term> columns;
-
+
/**
* Create a new SelectExpression for a range (slice) of columns.
- *
+ *
* @param start the starting column name
* @param finish the finishing column name
* @param count the number of columns to limit the results to
@@ -59,10 +59,10 @@ public class SelectExpression
hasFirstSet = firstSet;
this.columns = null;
}
-
+
/**
* Create a new SelectExpression for a list of columns.
- *
+ *
* @param first the first (possibly only) column name to select on.
* @param count the number of columns to limit the results on
* @param reverse true to reverse column order
@@ -79,10 +79,10 @@ public class SelectExpression
start = null;
finish = null;
}
-
+
/**
* Add an additional column name to a SelectExpression.
- *
+ *
* @param addTerm
*/
public void and(Term addTerm)
@@ -90,12 +90,12 @@ public class SelectExpression
assert !isColumnRange(); // Not possible when invoked by parser
columns.add(addTerm);
}
-
+
public boolean isColumnRange()
{
return (start != null);
}
-
+
public boolean isColumnList()
{
return !isColumnRange();
@@ -109,12 +109,12 @@ public class SelectExpression
{
return reverseColumns;
}
-
+
public void setColumnsReversed(boolean reversed)
{
reverseColumns = reversed;
}
-
+
public void setColumnsLimit(int limit)
{
numColumns = limit;
@@ -159,6 +159,6 @@ public class SelectExpression
finish,
columns);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/SelectStatement.java b/src/java/org/apache/cassandra/cql/SelectStatement.java
index b85853a..dec5688 100644
--- a/src/java/org/apache/cassandra/cql/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql/SelectStatement.java
@@ -40,7 +40,7 @@ public class SelectStatement
private final ConsistencyLevel cLevel;
private final WhereClause clause;
private final int numRecords;
-
+
public SelectStatement(SelectExpression expression, boolean isCountOper, String keyspace, String columnFamily,
ConsistencyLevel cLevel, WhereClause clause, int numRecords)
{
@@ -52,32 +52,32 @@ public class SelectStatement
this.clause = (clause != null) ? clause : new WhereClause();
this.numRecords = numRecords;
}
-
+
public boolean isKeyRange()
{
return clause.isKeyRange();
}
-
+
public Set<Term> getKeys()
{
return clause.getKeys();
}
-
+
public Term getKeyStart()
{
return clause.getStartKey();
}
-
+
public Term getKeyFinish()
{
return clause.getFinishKey();
}
-
+
public List<Relation> getColumnRelations()
{
return clause.getColumnRelations();
}
-
+
public boolean isColumnRange()
{
return expression.isColumnRange();
@@ -96,12 +96,12 @@ public class SelectStatement
{
return expression.getColumns();
}
-
+
public Term getColumnStart()
{
return expression.getStart();
}
-
+
public Term getColumnFinish()
{
return expression.getFinish();
@@ -121,12 +121,12 @@ public class SelectStatement
{
return columnFamily;
}
-
+
public boolean isColumnsReversed()
{
return expression.isColumnsReversed();
}
-
+
public ConsistencyLevel getConsistencyLevel()
{
return cLevel;
@@ -141,7 +141,7 @@ public class SelectStatement
{
return expression.getColumnsLimit();
}
-
+
public boolean isCountOperation()
{
return isCountOper;
@@ -176,7 +176,7 @@ public class SelectStatement
{
return Schema.instance.getComparator(keyspace, columnFamily);
}
-
+
public AbstractType<?> getValueValidator(String keyspace, ByteBuffer column)
{
return Schema.instance.getValueValidator(keyspace, columnFamily, column);
@@ -193,6 +193,6 @@ public class SelectStatement
clause,
numRecords);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/StatementType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/StatementType.java b/src/java/org/apache/cassandra/cql/StatementType.java
index 0cbe1e6..6f5afbe 100644
--- a/src/java/org/apache/cassandra/cql/StatementType.java
+++ b/src/java/org/apache/cassandra/cql/StatementType.java
@@ -23,7 +23,7 @@ public enum StatementType
{
SELECT, INSERT, UPDATE, BATCH, USE, TRUNCATE, DELETE, CREATE_KEYSPACE, CREATE_COLUMNFAMILY, CREATE_INDEX, DROP_INDEX,
DROP_KEYSPACE, DROP_COLUMNFAMILY, ALTER_TABLE;
-
+
// Statement types that don't require a keyspace to be set.
private static final EnumSet<StatementType> topLevel = EnumSet.of(USE, CREATE_KEYSPACE, DROP_KEYSPACE);
public static final EnumSet<StatementType> requiresKeyspace = EnumSet.complementOf(topLevel);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/Term.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/Term.java b/src/java/org/apache/cassandra/cql/Term.java
index bd8e77f..fbd55fb 100644
--- a/src/java/org/apache/cassandra/cql/Term.java
+++ b/src/java/org/apache/cassandra/cql/Term.java
@@ -44,7 +44,7 @@ public class Term
/**
* Create new Term instance from a string, and an integer that corresponds
* with the token ID from CQLParser.
- *
+ *
* @param text the text representation of the term.
* @param type the term's type as an integer token ID.
*/
@@ -71,18 +71,18 @@ public class Term
/**
* Returns the text parsed to create this term.
- *
+ *
* @return the string term acquired from a CQL statement.
*/
public String getText()
{
return text;
}
-
+
/**
* Returns the typed value, serialized to a ByteBuffer according to a
* comparator/validator.
- *
+ *
* @return a ByteBuffer of the value.
* @throws InvalidRequestException if unable to coerce the string to its type.
*/
@@ -91,11 +91,11 @@ public class Term
try
{
if (!isBindMarker()) return validator.fromString(text);
-
+
// must be a marker term so check for a CqlBindValue stored in the term
if (bindIndex == null)
throw new AssertionError("a marker Term was encountered with no index value");
-
+
return variables.get(bindIndex);
}
catch (MarshalException e)
@@ -103,10 +103,10 @@ public class Term
throw new InvalidRequestException(e.getMessage());
}
}
-
+
/**
* Returns the typed value, serialized to a ByteBuffer.
- *
+ *
* @return a ByteBuffer of the value.
* @throws InvalidRequestException if unable to coerce the string to its type.
*/
@@ -116,35 +116,35 @@ public class Term
{
case STRING:
return AsciiType.instance.fromString(text);
- case INTEGER:
+ case INTEGER:
return IntegerType.instance.fromString(text);
case UUID:
// we specifically want the Lexical class here, not "UUIDType," because we're supposed to have
// a uuid-shaped string here, and UUIDType also accepts integer or date strings (and turns them into version 1 uuids).
return LexicalUUIDType.instance.fromString(text);
- case FLOAT:
+ case FLOAT:
return FloatType.instance.fromString(text);
}
-
+
// FIXME: handle scenario that should never happen
return null;
}
/**
* Obtain the term's type.
- *
+ *
* @return the type
*/
public TermType getType()
{
return type;
}
-
+
public String toString()
{
return String.format("Term(%s, type=%s)", getText(), type);
}
-
+
public boolean isBindMarker()
{
return type==TermType.QMARK;
@@ -170,7 +170,7 @@ public class Term
if (getClass() != obj.getClass())
return false;
Term other = (Term) obj;
- if (type==TermType.QMARK) return false; // markers are never equal
+ if (type==TermType.QMARK) return false; // markers are never equal
if (text == null)
{
if (other.text != null)
@@ -182,13 +182,13 @@ public class Term
return true;
}
-
+
}
enum TermType
{
STRING, INTEGER, UUID, FLOAT, QMARK;
-
+
static TermType forInt(int type)
{
if ((type == CqlParser.STRING_LITERAL) || (type == CqlParser.IDENT))
@@ -201,7 +201,7 @@ enum TermType
return FLOAT;
else if (type == CqlParser.QMARK)
return QMARK;
-
+
// FIXME: handled scenario that should never occur.
return null;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/UpdateStatement.java b/src/java/org/apache/cassandra/cql/UpdateStatement.java
index eea826a..f00b02f 100644
--- a/src/java/org/apache/cassandra/cql/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql/UpdateStatement.java
@@ -70,7 +70,7 @@ public class UpdateStatement extends AbstractModification
this.columns = columns;
this.keys = keys;
}
-
+
/**
* Creates a new UpdateStatement from a column family name, a consistency level,
* key, and lists of column names and values. It is intended for use with the
@@ -102,17 +102,17 @@ public class UpdateStatement extends AbstractModification
/**
* Returns the consistency level of this <code>UPDATE</code> statement, either
* one parsed from the CQL statement, or the default level otherwise.
- *
+ *
* @return the consistency level as a Thrift enum.
*/
public ConsistencyLevel getConsistencyLevel()
{
return (cLevel != null) ? cLevel : defaultConsistency;
}
-
+
/**
* True if an explicit consistency level was parsed from the statement.
- *
+ *
* @return true if a consistency was parsed, false otherwise.
*/
public boolean isSetConsistencyLevel()
@@ -241,29 +241,29 @@ public class UpdateStatement extends AbstractModification
{
return keys;
}
-
+
public Map<Term, Operation> getColumns() throws InvalidRequestException
{
// Created from an UPDATE
if (columns != null)
return columns;
-
+
// Created from an INSERT
-
+
// Don't hate, validate.
if (columnNames.size() != columnValues.size())
throw new InvalidRequestException("unmatched column names/values");
if (columnNames.size() < 1)
throw new InvalidRequestException("no columns specified for INSERT");
-
+
columns = new HashMap<Term, Operation>();
-
+
for (int i = 0; i < columnNames.size(); i++)
columns.put(columnNames.get(i), new Operation(columnValues.get(i)));
return columns;
}
-
+
public String toString()
{
return String.format("UpdateStatement(keyspace=%s, columnFamily=%s, keys=%s, columns=%s, consistency=%s, timestamp=%s, timeToLive=%s)",
@@ -275,17 +275,17 @@ public class UpdateStatement extends AbstractModification
timestamp,
timeToLive);
}
-
+
public AbstractType<?> getKeyType(String keyspace)
{
return Schema.instance.getCFMetaData(keyspace, columnFamily).getKeyValidator();
}
-
+
public AbstractType<?> getComparator(String keyspace)
{
return Schema.instance.getComparator(keyspace, columnFamily);
}
-
+
public AbstractType<?> getValueValidator(String keyspace, ByteBuffer column)
{
return Schema.instance.getValueValidator(keyspace, columnFamily, column);
@@ -300,5 +300,5 @@ public class UpdateStatement extends AbstractModification
{
return columnValues;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/WhereClause.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/WhereClause.java b/src/java/org/apache/cassandra/cql/WhereClause.java
index eda166d..d9b0f96 100644
--- a/src/java/org/apache/cassandra/cql/WhereClause.java
+++ b/src/java/org/apache/cassandra/cql/WhereClause.java
@@ -46,20 +46,20 @@ public class WhereClause
/**
* Create a new WhereClause with the first parsed relation.
- *
+ *
* @param firstRelation key or column relation
*/
public WhereClause(Relation firstRelation)
{
and(firstRelation);
}
-
+
public WhereClause()
{}
-
+
/**
* Add an additional relation to this WHERE clause.
- *
+ *
* @param relation the relation to add.
*/
public void and(Relation relation)
@@ -80,22 +80,22 @@ public class WhereClause
{
return columns;
}
-
+
public boolean isKeyRange()
{
return startKey != null;
}
-
+
public Term getStartKey()
{
return startKey;
}
-
+
public Term getFinishKey()
{
return finishKey;
}
-
+
public Set<Term> getKeys()
{
return keys;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcUUID.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcUUID.java b/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcUUID.java
index d94a77e..2190a8f 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcUUID.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/AbstractJdbcUUID.java
@@ -26,7 +26,7 @@ public abstract class AbstractJdbcUUID extends AbstractJdbcType<UUID>
{
return obj.toString();
}
-
+
public boolean isCaseSensitive()
{
return false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcAscii.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcAscii.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcAscii.java
index 43c1608..4b85f66 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcAscii.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcAscii.java
@@ -28,9 +28,9 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcAscii extends AbstractJdbcType<String>
{
public static final JdbcAscii instance = new JdbcAscii();
-
+
JdbcAscii() {}
-
+
public boolean isCaseSensitive()
{
return true;
@@ -92,7 +92,7 @@ public class JdbcAscii extends AbstractJdbcType<String>
{
return getString(bytes);
}
-
+
public ByteBuffer decompose(String value)
{
return ByteBufferUtil.bytes(value, Charsets.US_ASCII);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java
index 32febd3..29d2ec5 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcBoolean.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcBoolean extends AbstractJdbcType<Boolean>
{
public static final JdbcBoolean instance = new JdbcBoolean();
-
+
JdbcBoolean() {}
-
+
public boolean isCaseSensitive()
{
return false;
@@ -74,7 +74,7 @@ public class JdbcBoolean extends AbstractJdbcType<Boolean>
throw new MarshalException("A boolean is stored in exactly 1 byte: "+bytes.remaining());
}
byte value = bytes.get(bytes.position());
-
+
return value ==0 ? Boolean.FALSE.toString(): Boolean.TRUE.toString();
}
@@ -93,7 +93,7 @@ public class JdbcBoolean extends AbstractJdbcType<Boolean>
byte value = bytes.get(bytes.position());
return Boolean.valueOf(value ==0 ? false:true);
}
-
+
public ByteBuffer decompose(Boolean value)
{
return (value==null) ? ByteBufferUtil.EMPTY_BYTE_BUFFER
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java
index 746ec53..cc03163 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcBytes.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcBytes extends AbstractJdbcType<ByteBuffer>
{
public static final JdbcBytes instance = new JdbcBytes();
-
+
JdbcBytes() {}
public boolean isCaseSensitive()
@@ -83,7 +83,7 @@ public class JdbcBytes extends AbstractJdbcType<ByteBuffer>
{
return bytes.duplicate();
}
-
+
public ByteBuffer decompose(ByteBuffer value)
{
return value;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
index bd610fd..644d594 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
@@ -20,6 +20,6 @@ package org.apache.cassandra.cql.jdbc;
public class JdbcCounterColumn extends JdbcLong
{
public static final JdbcCounterColumn instance = new JdbcCounterColumn();
-
+
JdbcCounterColumn() {}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
index cf28d33..7d27bcb 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
@@ -46,11 +46,11 @@ public class JdbcDate extends AbstractJdbcType<Date>
return new SimpleDateFormat(DEFAULT_FORMAT);
}
};
-
+
public static final JdbcDate instance = new JdbcDate();
-
+
JdbcDate() {}
-
+
public boolean isCaseSensitive()
{
return false;
@@ -96,7 +96,7 @@ public class JdbcDate extends AbstractJdbcType<Date>
{
throw new MarshalException("A date is exactly 8 bytes (stored as a long): " + bytes.remaining());
}
-
+
// uses ISO-8601 formatted string
return FORMATTER.get().format(new Date(bytes.getLong(bytes.position())));
}
@@ -115,7 +115,7 @@ public class JdbcDate extends AbstractJdbcType<Date>
{
return new Date(ByteBufferUtil.toLong(bytes));
}
-
+
public ByteBuffer decompose(Date value)
{
return (value==null) ? ByteBufferUtil.EMPTY_BYTE_BUFFER
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
index d52daa6..9d1c6ab 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcDecimal.java
@@ -27,7 +27,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcDecimal extends AbstractJdbcType<BigDecimal>
{
public static final JdbcDecimal instance = new JdbcDecimal();
-
+
JdbcDecimal() {}
public boolean isCaseSensitive()
@@ -85,7 +85,7 @@ public class JdbcDecimal extends AbstractJdbcType<BigDecimal>
public BigDecimal compose(ByteBuffer bytes)
{
if (bytes == null) return null;
-
+
// do not consume the contents of the ByteBuffer
bytes = bytes.duplicate();
int scale = bytes.getInt();
@@ -103,16 +103,16 @@ public class JdbcDecimal extends AbstractJdbcType<BigDecimal>
public ByteBuffer decompose(BigDecimal value)
{
if (value == null) return ByteBufferUtil.EMPTY_BYTE_BUFFER;
-
+
BigInteger bi = value.unscaledValue();
Integer scale = value.scale();
byte[] bibytes = bi.toByteArray();
byte[] sbytes = ByteBufferUtil.bytes(scale).array();
byte[] bytes = new byte[bi.toByteArray().length+4];
-
+
for (int i = 0 ; i < 4 ; i++) bytes[i] = sbytes[i];
for (int i = 4 ; i < bibytes.length+4 ; i++) bytes[i] = bibytes[i-4];
-
+
return ByteBuffer.wrap(bytes);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java
index 38b364e..4424d05 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcDouble.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcDouble extends AbstractJdbcType<Double>
{
public static final JdbcDouble instance = new JdbcDouble();
-
+
JdbcDouble() {}
-
+
public boolean isCaseSensitive()
{
return false;
@@ -73,7 +73,7 @@ public class JdbcDouble extends AbstractJdbcType<Double>
{
throw new MarshalException("A double is exactly 8 bytes : "+bytes.remaining());
}
-
+
return ((Double)ByteBufferUtil.toDouble(bytes)).toString();
}
@@ -91,7 +91,7 @@ public class JdbcDouble extends AbstractJdbcType<Double>
{
return ByteBufferUtil.toDouble(bytes);
}
-
+
public ByteBuffer decompose(Double value)
{
return (value==null) ? ByteBufferUtil.EMPTY_BYTE_BUFFER : ByteBufferUtil.bytes(value);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java
index 808be70..3c08fc5 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcFloat.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcFloat extends AbstractJdbcType<Float>
{
public static final JdbcFloat instance = new JdbcFloat();
-
+
JdbcFloat() {}
-
+
public boolean isCaseSensitive()
{
return false;
@@ -73,7 +73,7 @@ public class JdbcFloat extends AbstractJdbcType<Float>
{
throw new MarshalException("A float is exactly 4 bytes : "+bytes.remaining());
}
-
+
return ((Float)ByteBufferUtil.toFloat(bytes)).toString();
}
@@ -91,7 +91,7 @@ public class JdbcFloat extends AbstractJdbcType<Float>
{
return ByteBufferUtil.toFloat(bytes);
}
-
+
public ByteBuffer decompose(Float value)
{
return (value==null) ? ByteBufferUtil.EMPTY_BYTE_BUFFER : ByteBufferUtil.bytes(value);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java
index bcd1fad..d4338ff 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcInteger.java
@@ -26,9 +26,9 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class JdbcInteger extends AbstractJdbcType<BigInteger>
{
public static final JdbcInteger instance = new JdbcInteger();
-
+
JdbcInteger() {}
-
+
public boolean isCaseSensitive()
{
return false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java
index 649f85a..c79e7f7 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcLexicalUUID.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.UUIDGen;
public class JdbcLexicalUUID extends AbstractJdbcUUID
{
public static final JdbcLexicalUUID instance = new JdbcLexicalUUID();
-
+
public JdbcLexicalUUID() {}
-
+
public String getString(ByteBuffer bytes)
{
if (bytes.remaining() == 0)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java
index f6dcf11..0d8d501 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcTimeUUID.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.UUIDGen;
public class JdbcTimeUUID extends AbstractJdbcUUID
{
public static final JdbcTimeUUID instance = new JdbcTimeUUID();
-
+
JdbcTimeUUID() {}
-
+
public String getString(ByteBuffer bytes)
{
if (bytes.remaining() == 0)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java
index 9a885a8..a1eaaf4 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcUTF8.java
@@ -28,9 +28,9 @@ import com.google.common.base.Charsets;
public class JdbcUTF8 extends AbstractJdbcType<String>
{
public static final JdbcUTF8 instance = new JdbcUTF8();
-
+
public JdbcUTF8() {}
-
+
public boolean isCaseSensitive()
{
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java
index 8ac6737..1c62b03 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcUUID.java
@@ -25,9 +25,9 @@ import org.apache.cassandra.utils.UUIDGen;
public class JdbcUUID extends AbstractJdbcUUID
{
public static final JdbcUUID instance = new JdbcUUID();
-
+
JdbcUUID() {}
-
+
public UUID compose(ByteBuffer bytes)
{
bytes = bytes.slice();
@@ -46,7 +46,7 @@ public class JdbcUUID extends AbstractJdbcUUID
{
throw new MarshalException("UUIDs must be exactly 16 bytes");
}
-
+
return compose(bytes).toString();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java b/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
index ed5d3a4..7102bd8 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
@@ -23,7 +23,7 @@ import java.util.Map;
public class TypesMap
{
private final static Map<String, AbstractJdbcType<?>> map = new HashMap<String, AbstractJdbcType<?>>();
-
+
static
{
map.put("org.apache.cassandra.db.marshal.AsciiType", JdbcAscii.instance);
@@ -42,7 +42,7 @@ public class TypesMap
map.put("org.apache.cassandra.db.marshal.UTF8Type", JdbcUTF8.instance);
map.put("org.apache.cassandra.db.marshal.UUIDType", JdbcUUID.instance);
}
-
+
public static AbstractJdbcType<?> getTypeForComparator(String comparator)
{
// If not fully qualified, assume it's the short name for a built-in.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index 0ab95a8..78eecc0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -70,7 +70,7 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
for (Map.Entry<ColumnIdentifier, String> col : columns.entrySet())
{
AbstractType<?> validator = CFPropDefs.parseType(col.getValue());
-
+
columnDefs.put(col.getKey().key, new ColumnDefinition(col.getKey().key, validator, null, null, null));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index 85c4422..297896a 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -148,7 +148,7 @@ public class CollationController
};
ColumnFamily returnCF = container.cloneMeShallow();
filter.collateColumns(returnCF, Collections.singletonList(toCollate), gcBefore);
-
+
// "hoist up" the requested data into a more recent sstable
if (sstablesIterated > cfs.getMinimumCompactionThreshold()
&& !cfs.isCompactionDisabled()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 ef1abcc..c40ff3f 100644
--- a/src/java/org/apache/cassandra/db/Column.java
+++ b/src/java/org/apache/cassandra/db/Column.java
@@ -242,7 +242,7 @@ public class Column implements IColumn
{
return localCopy(cfs, HeapAllocator.instance);
}
-
+
public IColumn localCopy(ColumnFamilyStore cfs, Allocator allocator)
{
return new Column(cfs.internOrCopy(name, allocator), allocator.clone(value), timestamp);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 6a5d1b2..3bb70b1 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -82,7 +82,7 @@ public class ColumnFamily extends AbstractColumnContainer
assert cfm != null;
this.cfm = cfm;
}
-
+
public ColumnFamily cloneMeShallow(ISortedColumns.Factory factory, boolean reversedInsertOrder)
{
ColumnFamily cf = ColumnFamily.create(cfm, factory, reversedInsertOrder);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index fcb3e39..b1b745c 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -175,12 +175,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
metadata.compactionStrategyClass = CFMetaData.createCompactionStrategy(compactionStrategyClass);
maybeReloadCompactionStrategy();
}
-
+
public String getCompactionStrategyClass()
{
return metadata.compactionStrategyClass.getName();
}
-
+
public Map<String,String> getCompressionParameters()
{
return metadata.compressionParameters().asThriftOptions();
@@ -246,7 +246,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
valid = false;
unregisterMBean();
-
+
data.unreferenceSSTables();
indexManager.invalidate();
}
@@ -409,7 +409,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
* @param ksName The keyspace name
* @param cfName The columnFamily name
*/
- public static synchronized void loadNewSSTables(String ksName, String cfName)
+ public static synchronized void loadNewSSTables(String ksName, String cfName)
{
/** ks/cf existence checks will be done by open and getCFS methods for us */
Table table = Table.open(ksName);
@@ -528,7 +528,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
for (String idxName : idxNames)
indexes.add(cfs.indexManager.getColumnByIdxName(idxName));
- Collection<SSTableReader> sstables = cfs.getSSTables();
+ Collection<SSTableReader> sstables = cfs.getSSTables();
try
{
cfs.indexManager.setIndexRemoved(indexes);
@@ -649,11 +649,11 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
public void runMayThrow() throws InterruptedException, IOException
{
latch.await();
-
+
if (!icc.isEmpty())
{
//only valid when memtables exist
-
+
for (SecondaryIndex index : indexManager.getIndexesNotBackedByCfs())
{
// flush any non-cfs backed indexes
@@ -661,7 +661,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
index.forceBlockingFlush();
}
}
-
+
if (writeCommitLog)
{
// if we're not writing to the commit log, we are replaying the log, so marking
@@ -1774,7 +1774,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
return data.getCompressionRatio();
}
-
+
/** true if this CFS contains secondary index data */
public boolean isIndex()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/ColumnSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnSerializer.java b/src/java/org/apache/cassandra/db/ColumnSerializer.java
index 6e7449c..53680e4 100644
--- a/src/java/org/apache/cassandra/db/ColumnSerializer.java
+++ b/src/java/org/apache/cassandra/db/ColumnSerializer.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class ColumnSerializer implements IColumnSerializer
{
private static final Logger logger = LoggerFactory.getLogger(ColumnSerializer.class);
-
+
public final static int DELETION_MASK = 0x01;
public final static int EXPIRATION_MASK = 0x02;
public final static int COUNTER_MASK = 0x04;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/DeletedColumn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DeletedColumn.java b/src/java/org/apache/cassandra/db/DeletedColumn.java
index da79c04..a056823 100644
--- a/src/java/org/apache/cassandra/db/DeletedColumn.java
+++ b/src/java/org/apache/cassandra/db/DeletedColumn.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.HeapAllocator;
public class DeletedColumn extends Column
-{
+{
public DeletedColumn(ByteBuffer name, int localDeletionTime, long timestamp)
{
this(name, ByteBufferUtil.bytes(localDeletionTime), timestamp);
@@ -56,7 +56,7 @@ public class DeletedColumn extends Column
return super.reconcile(column, allocator);
return column.reconcile(this, allocator);
}
-
+
@Override
public IColumn localCopy(ColumnFamilyStore cfs)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 6b7e59c..03e41d2 100644
--- a/src/java/org/apache/cassandra/db/ExpiringColumn.java
+++ b/src/java/org/apache/cassandra/db/ExpiringColumn.java
@@ -77,7 +77,7 @@ public class ExpiringColumn extends Column
public int size()
{
/*
- * An expired column adds to a Column :
+ * An expired column adds to a Column :
* 4 bytes for the localExpirationTime
* + 4 bytes for the timeToLive
*/
@@ -124,7 +124,7 @@ public class ExpiringColumn extends Column
clonedName = allocator.clone(name);
return new ExpiringColumn(clonedName, allocator.clone(value), timestamp, timeToLive, localExpirationTime);
}
-
+
@Override
public String getString(AbstractType<?> comparator)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index b857686..beca2b2 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -313,7 +313,7 @@ public class Memtable
/**
* @param startWith Include data in the result from and including this key and to the end of the memtable
- * @return An iterator of entries with the data from the start key
+ * @return An iterator of entries with the data from the start key
*/
public Iterator<Map.Entry<DecoratedKey, ColumnFamily>> getEntryIterator(final RowPosition startWith, final RowPosition stopAt)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
index c97c3af..f5a8b7d 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@ -62,7 +62,7 @@ import org.apache.thrift.TSerializer;
public class RangeSliceCommand implements MessageProducer, IReadCommand
{
private static final RangeSliceCommandSerializer serializer = new RangeSliceCommandSerializer();
-
+
public final String keyspace;
public final String column_family;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 96a42fc..eaf969e 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -56,7 +56,7 @@ public abstract class ReadCommand implements MessageProducer, IReadCommand
public final QueryPath queryPath;
public final String table;
public final ByteBuffer key;
- private boolean isDigestQuery = false;
+ private boolean isDigestQuery = false;
protected final byte commandType;
protected ReadCommand(String table, ByteBuffer key, QueryPath queryPath, byte cmdType)
@@ -112,7 +112,7 @@ public abstract class ReadCommand implements MessageProducer, IReadCommand
class ReadCommandSerializer implements IVersionedSerializer<ReadCommand>
{
private static final Map<Byte, IVersionedSerializer<ReadCommand>> CMD_SERIALIZER_MAP = new HashMap<Byte, IVersionedSerializer<ReadCommand>>();
- static
+ static
{
CMD_SERIALIZER_MAP.put(ReadCommand.CMD_TYPE_GET_SLICE_BY_NAMES, new SliceByNamesReadCommandSerializer());
CMD_SERIALIZER_MAP.put(ReadCommand.CMD_TYPE_GET_SLICE, new SliceFromReadCommandSerializer());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java b/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
index 0c26434..fff06b5 100644
--- a/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
@@ -27,12 +27,12 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
public class ReadRepairVerbHandler implements IVerbHandler
-{
+{
public void doVerb(Message message, String id)
- {
+ {
byte[] body = message.getMessageBody();
FastByteArrayInputStream buffer = new FastByteArrayInputStream(body);
-
+
try
{
RowMutation rm = RowMutation.serializer().deserialize(new DataInputStream(buffer), message.getVersion());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 9ccfb06..9480380 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
/*
- * The read response message is sent by the server when reading data
+ * The read response message is sent by the server when reading data
* this encapsulates the tablename and the row that has been read.
* The table name is needed so that we can use it to create repairs.
*/
@@ -61,12 +61,12 @@ private static final IVersionedSerializer<ReadResponse> serializer;
this.digest = null;
}
- public Row row()
+ public Row row()
{
return row;
}
- public ByteBuffer digest()
+ public ByteBuffer digest()
{
return digest;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIteratorFactory.java b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
index 674d711..d00e2d0 100644
--- a/src/java/org/apache/cassandra/db/RowIteratorFactory.java
+++ b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
@@ -39,7 +39,7 @@ public class RowIteratorFactory
}
};
-
+
/**
* Get a row iterator over the provided memtables and sstables, between the provided keys
* and filtered by the queryfilter.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java b/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
index 7614053..d6fa89c 100644
--- a/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
@@ -59,8 +59,8 @@ public class RowMutationVerbHandler implements IVerbHandler
{
logger.error("Error in row mutation", e);
}
- }
-
+ }
+
/**
* Older version (< 1.0) will not send this message at all, hence we don't
* need to check the version of the data.
@@ -69,7 +69,7 @@ public class RowMutationVerbHandler implements IVerbHandler
{
DataInputStream dis = new DataInputStream(new FastByteArrayInputStream(forwardBytes));
int size = dis.readInt();
-
+
// remove fwds from message to avoid infinite loop
Message messageCopy = message.withHeaderRemoved(RowMutation.FORWARD_HEADER);
for (int i = 0; i < size; i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java b/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
index 20339f4..048977a 100644
--- a/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
@@ -29,7 +29,7 @@ import org.apache.cassandra.net.MessagingService;
public class SchemaCheckVerbHandler implements IVerbHandler
{
private final Logger logger = LoggerFactory.getLogger(SchemaCheckVerbHandler.class);
-
+
public void doVerb(Message message, String id)
{
logger.debug("Received schema check request.");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 14b21dd..8d75c15 100644
--- a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
@@ -51,7 +51,7 @@ public class SliceByNamesReadCommand extends ReadCommand
readCommand.setDigestQuery(isDigestQuery());
return readCommand;
}
-
+
public Row getRow(Table table) throws IOException
{
DecoratedKey<?> dk = StorageService.getPartitioner().decorateKey(key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 94f08e0..261b955 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -73,7 +73,7 @@ public class SystemTable
{
return StorageService.getPartitioner().decorateKey(key);
}
-
+
public static void finishStartup() throws IOException
{
setupVersion();
@@ -272,13 +272,13 @@ public class SystemTable
ex.initCause(err);
throw ex;
}
-
+
SortedSet<ByteBuffer> cols = new TreeSet<ByteBuffer>(BytesType.instance);
cols.add(CLUSTERNAME);
QueryFilter filter = QueryFilter.getNamesFilter(decorate(LOCATION_KEY), new QueryPath(STATUS_CF), cols);
ColumnFamilyStore cfs = table.getColumnFamilyStore(STATUS_CF);
ColumnFamily cf = cfs.getColumnFamily(filter);
-
+
if (cf == null)
{
// this is a brand new node
@@ -294,8 +294,8 @@ public class SystemTable
return;
}
-
-
+
+
IColumn clusterCol = cf.getColumn(CLUSTERNAME);
assert clusterCol != null;
String savedClusterName = ByteBufferUtil.string(clusterCol.value());
@@ -351,7 +351,7 @@ public class SystemTable
return generation;
}
-
+
public static boolean isBootstrapped()
{
Table table = Table.open(Table.SYSTEM_TABLE);
@@ -368,7 +368,7 @@ public class SystemTable
public static void setBootstrapped(boolean isBootstrapped)
{
ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF);
- cf.addColumn(new Column(BOOTSTRAP,
+ cf.addColumn(new Column(BOOTSTRAP,
ByteBuffer.wrap(new byte[] { (byte) (isBootstrapped ? 1 : 0) }),
FBUtilities.timestampMicros()));
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, BOOTSTRAP_KEY);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java
index 7c6a629..5fc5f6e 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -69,9 +69,9 @@ public class Table
// It is possible to call Table.open without a running daemon, so it makes sense to ensure
// proper directories here as well as in CassandraDaemon.
- static
+ static
{
- if (!StorageService.instance.isClientMode())
+ if (!StorageService.instance.isClientMode())
{
try
{
@@ -140,7 +140,7 @@ public class Table
return t;
}
}
-
+
public Collection<ColumnFamilyStore> getColumnFamilyStores()
{
return Collections.unmodifiableCollection(columnFamilyStores.values());
@@ -194,7 +194,7 @@ public class Table
/**
* Take a snapshot of the entire set of column families with a given timestamp
- *
+ *
* @param snapshotName the tag associated with the name of the snapshot. This value may not be null
*/
public void snapshot(String snapshotName)
@@ -248,7 +248,7 @@ public class Table
cfStore.clearSnapshot(snapshotName);
}
}
-
+
/**
* @return A list of open SSTableReaders
*/
@@ -290,7 +290,7 @@ public class Table
{
if (replicationStrategy != null)
StorageService.instance.getTokenMetadata().unregister(replicationStrategy);
-
+
replicationStrategy = AbstractReplicationStrategy.createReplicationStrategy(ksm.name,
ksm.strategyClass,
StorageService.instance.getTokenMetadata(),
@@ -305,10 +305,10 @@ public class Table
ColumnFamilyStore cfs = columnFamilyStores.remove(cfId);
if (cfs == null)
return;
-
+
unloadCf(cfs);
}
-
+
// disassociate a cfs from this table instance.
private void unloadCf(ColumnFamilyStore cfs) throws IOException
{
@@ -326,7 +326,7 @@ public class Table
}
cfs.invalidate();
}
-
+
/** adds a cf to internal structures, ends up creating disk files). */
public void initCf(Integer cfId, String cfName)
{
@@ -381,7 +381,7 @@ public class Table
{
if (writeCommitLog)
CommitLog.instance.add(mutation);
-
+
DecoratedKey<?> key = StorageService.getPartitioner().decorateKey(mutation.key());
for (ColumnFamily cf : mutation.getColumnFamilies())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/UnserializableColumnFamilyException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/UnserializableColumnFamilyException.java b/src/java/org/apache/cassandra/db/UnserializableColumnFamilyException.java
index e54adb6..3cca53e 100644
--- a/src/java/org/apache/cassandra/db/UnserializableColumnFamilyException.java
+++ b/src/java/org/apache/cassandra/db/UnserializableColumnFamilyException.java
@@ -23,7 +23,7 @@ import java.io.IOException;
public class UnserializableColumnFamilyException extends IOException
{
public final int cfId;
-
+
public UnserializableColumnFamilyException(String msg, int cfId)
{
super(msg);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 42661e9..2814038 100644
--- a/src/java/org/apache/cassandra/db/WriteResponse.java
+++ b/src/java/org/apache/cassandra/db/WriteResponse.java
@@ -29,11 +29,11 @@ import org.apache.cassandra.utils.FBUtilities;
/*
- * This message is sent back the row mutation verb handler
- * and basically specifies if the write succeeded or not for a particular
+ * This message is sent back the row mutation verb handler
+ * and basically specifies if the write succeeded or not for a particular
* key in a table
*/
-public class WriteResponse
+public class WriteResponse
{
private static final WriteResponseSerializer serializer = new WriteResponseSerializer();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index a6411e7..ef16c40 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -58,7 +58,7 @@ import javax.management.ObjectName;
public class CommitLog implements CommitLogMBean
{
private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
-
+
static final Logger logger = LoggerFactory.getLogger(CommitLog.class);
public static final CommitLog instance = new CommitLog();
@@ -280,7 +280,7 @@ public class CommitLog implements CommitLogMBean
i.incrementAndGet();
continue;
}
-
+
if (logger.isDebugEnabled())
logger.debug(String.format("replaying mutation for %s.%s: %s",
rm.getTable(),
@@ -338,7 +338,7 @@ public class CommitLog implements CommitLogMBean
logger.info("Finished reading " + file);
}
}
-
+
for (Map.Entry<Integer, AtomicInteger> entry : invalidMutations.entrySet())
logger.info(String.format("Skipped %d mutations from unknown (probably removed) CF with id %d", entry.getValue().intValue(), entry.getKey()));
@@ -452,11 +452,11 @@ public class CommitLog implements CommitLogMBean
if (segment.contains(context))
break;
}
-
+
return null;
}
};
-
+
try
{
executor.submit(task).get();
@@ -507,7 +507,7 @@ public class CommitLog implements CommitLogMBean
}
/**
- * Forces a new segment file to be allocated and activated. Used mainly by truncate.
+ * Forces a new segment file to be allocated and activated. Used mainly by truncate.
*/
public void forceNewSegment() throws ExecutionException, InterruptedException
{
@@ -529,7 +529,7 @@ public class CommitLog implements CommitLogMBean
/**
* Fetches a new segment file from the allocator and activates it.
- *
+ *
* @return the newly activated segment
*/
private void activateNextSegment() throws IOException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
index 4e378fc..b5e0be6 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
@@ -247,7 +247,7 @@ public class CommitLogAllocator
* Adds a segment to our internal tracking list and makes it ready for consumption.
*
* @param segment the segment to add
- * @return the newly added segment
+ * @return the newly added segment
*/
private CommitLogSegment internalAddReadySegment(CommitLogSegment segment)
{
@@ -334,7 +334,7 @@ public class CommitLogAllocator
*/
public void awaitTermination() throws InterruptedException
{
- allocationThread.join();
+ allocationThread.join();
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 323ae0a..102b523 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -123,7 +123,7 @@ public class CommitLogSegment
catch (IOException e)
{
throw new IOError(e);
- }
+ }
}
/**
@@ -175,7 +175,7 @@ public class CommitLogSegment
/**
* Recycle processes an unneeded segment file for reuse.
- *
+ *
* @return a new CommitLogSegment representing the newly reusable segment.
*/
public CommitLogSegment recycle()
@@ -233,7 +233,7 @@ public class CommitLogSegment
/**
* Appends a row mutation onto the commit log. Requres that hasCapacityFor has already been checked.
*
- * @param rowMutation the mutation to append to the commit log.
+ * @param rowMutation the mutation to append to the commit log.
* @return the position of the appended mutation
*/
public ReplayPosition write(RowMutation rowMutation) throws IOException
@@ -367,7 +367,7 @@ public class CommitLogSegment
/**
* Check to see if a certain ReplayPosition is contained by this segment file.
*
- * @param context the replay position to be checked
+ * @param context the replay position to be checked
* @return true if the replay position is contained by this segment file.
*/
public boolean contains(ReplayPosition context)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 284b0cc..7a36625 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -133,7 +133,7 @@ public class CompactionManager implements CompactionManagerMBean
}
submitBackground(cfs);
}
- finally
+ finally
{
compactionLock.readLock().unlock();
}
@@ -179,7 +179,7 @@ public class CompactionManager implements CompactionManagerMBean
}
return this;
}
- finally
+ finally
{
// we probably already downgraded
if (compactionLock.writeLock().isHeldByCurrentThread())
@@ -774,7 +774,7 @@ public class CompactionManager implements CompactionManagerMBean
logger.info(String.format(format, writer.getFilename(), startsize, endsize, (int)(ratio*100), totalkeysWritten, dTime));
}
- // flush to ensure we don't lose the tombstones on a restart, since they are not commitlog'd
+ // flush to ensure we don't lose the tombstones on a restart, since they are not commitlog'd
cfs.indexManager.flushIndexesBlocking();
cfs.replaceCompactedSSTables(Arrays.asList(sstable), results);
@@ -890,7 +890,7 @@ public class CompactionManager implements CompactionManagerMBean
}
}
};
-
+
// don't submit to the executor if the compaction lock is held by the current thread. Instead return a simple
// future that will be immediately immediately get()ed and executed. Happens during a migration, which locks
// the compaction thread and then reinitializes a ColumnFamilyStore. Under normal circumstances, CFS spawns
@@ -1097,16 +1097,16 @@ public class CompactionManager implements CompactionManagerMBean
{
return executor.getCompletedTaskCount() + validationExecutor.getCompletedTaskCount();
}
-
+
private static class SimpleFuture implements Future
{
private Runnable runnable;
-
- private SimpleFuture(Runnable r)
+
+ private SimpleFuture(Runnable r)
{
runnable = r;
}
-
+
public boolean cancel(boolean mayInterruptIfRunning)
{
throw new IllegalStateException("May not call SimpleFuture.cancel()");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
index c202de3..5fcc632 100644
--- a/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
@@ -55,7 +55,7 @@ public class NamesQueryFilter implements IFilter
{
return new SSTableNamesIterator(sstable, key, columns);
}
-
+
public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key)
{
return new SSTableNamesIterator(sstable, file, key, columns);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/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 841ca99..31b39d0 100644
--- a/src/java/org/apache/cassandra/db/filter/QueryPath.java
+++ b/src/java/org/apache/cassandra/db/filter/QueryPath.java
@@ -89,8 +89,8 @@ public class QueryPath
String cfName = din.readUTF();
ByteBuffer scName = ByteBufferUtil.readWithShortLength(din);
ByteBuffer cName = ByteBufferUtil.readWithShortLength(din);
- return new QueryPath(cfName.isEmpty() ? null : cfName,
- scName.remaining() == 0 ? null : scName,
+ return new QueryPath(cfName.isEmpty() ? null : cfName,
+ scName.remaining() == 0 ? null : scName,
cName.remaining() == 0 ? null : cName);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 7b603e5..ef237cc 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -60,7 +60,7 @@ public class SliceQueryFilter implements IFilter
{
return new SSTableSliceIterator(sstable, key, start, finish, reversed);
}
-
+
public IColumnIterator getSSTableColumnIterator(SSTableReader sstable, FileDataInput file, DecoratedKey<?> key)
{
return new SSTableSliceIterator(sstable, file, key, start, finish, reversed);
@@ -122,9 +122,9 @@ public class SliceQueryFilter implements IFilter
&& ((!reversed && comparator.compare(column.name(), finish) > 0))
|| (reversed && comparator.compare(column.name(), finish) < 0))
break;
-
+
// only count live columns towards the `count` criteria
- if (column.isLive()
+ if (column.isLive()
&& (!container.isMarkedForDelete()
|| column.mostRecentLiveChangeAt() > container.getMarkedForDeleteAt()))
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
index 5e77b94..9d57701 100644
--- a/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
@@ -31,33 +31,33 @@ public abstract class PerColumnSecondaryIndex extends SecondaryIndex
{
/**
* Delete a column from the index
- *
+ *
* @param valueKey the column value which is used as the index key
* @param rowKey the underlying row key which is indexed
* @param col all the column info
*/
public abstract void deleteColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
-
+
/**
* insert a column to the index
- *
+ *
* @param valueKey the column value which is used as the index key
* @param rowKey the underlying row key which is indexed
* @param col all the column info
*/
public abstract void insertColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
-
+
/**
* update a column from the index
- *
+ *
* @param valueKey the column value which is used as the index key
* @param rowKey the underlying row key which is indexed
* @param col all the column info
*/
public abstract void updateColumn(DecoratedKey<?> valueKey, ByteBuffer rowKey, IColumn col) throws IOException;
-
+
public String getNameForSystemTable(ByteBuffer column)
{
- return getIndexName();
+ return getIndexName();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd3268b/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
index 7b4e577..b83d35c 100644
--- a/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
@@ -36,35 +36,35 @@ public abstract class PerRowSecondaryIndex extends SecondaryIndex
/**
* Removes obsolete index entries and creates new ones for the given row key
* and mutated columns.
- *
+ *
* @param rowKey the row key
* @param cf the current rows data
* @param mutatedIndexedColumns the set of columns that were changed or added
* @param oldIndexedColumns the columns which were deleted
- * @throws IOException
+ * @throws IOException
*/
public abstract void applyIndexUpdates(ByteBuffer rowKey,
ColumnFamily cf,
SortedSet<ByteBuffer> mutatedIndexedColumns,
ColumnFamily oldIndexedColumns) throws IOException;
-
-
+
+
/**
* cleans up deleted columns from cassandra cleanup compaction
- *
+ *
* @param key
* @param indexedColumnsInRow
*/
public abstract void deleteFromIndex(DecoratedKey<?> key, List<IColumn> indexedColumnsInRow);
-
-
+
+
@Override
public String getNameForSystemTable(ByteBuffer columnName)
{
try
{
return getIndexName()+ByteBufferUtil.string(columnName);
- }
+ }
catch (CharacterCodingException e)
{
throw new RuntimeException(e);