natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make scrub validate column fields 

patch by slebresne; reviewed by jbellis for CASSANDRA-2460


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1094780 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sylvain Lebresne 2011-04-18 21:44:00 +00:00
parent ca1c8bf247
commit 0dbe8baa84
7 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/apache/cassandra/db/Column.java
View File

@ -26,7 +26,9 @@ import java.util.Collection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
@ -232,5 +234,19 @@ public class Column implements IColumn
{
return !isMarkedForDelete();
}
protected void validateName(CFMetaData metadata) throws MarshalException
{
AbstractType nameValidator = metadata.cfType == ColumnFamilyType.Super ? metadata.subcolumnComparator : metadata.comparator;
nameValidator.validate(name());
}
public void validateFields(CFMetaData metadata) throws MarshalException
{
validateName(metadata);
AbstractType valueValidator = metadata.getValueValidator(name());
if (valueValidator != null)
valueValidator.validate(value());
}
}

15
src/java/org/apache/cassandra/db/ColumnFamily.java
View File

@ -35,6 +35,7 @@ import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.QueryPath;
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;
@ -424,4 +425,18 @@ public class ColumnFamily implements IColumnContainer, IIterableColumns
remove(column.name());
addColumn(column.deepCopy());
}
/**
* Goes over all columns and check the fields are valid (as far as we can
* tell).
* This is used to detect corruption after deserialization.
*/
public void validateColumnFields() throws MarshalException
{
CFMetaData metadata = metadata();
for (IColumn column : getSortedColumns())
{
column.validateFields(metadata);
}
}
}

12
src/java/org/apache/cassandra/db/DeletedColumn.java
View File

@ -23,6 +23,8 @@ import java.nio.ByteBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
public class DeletedColumn extends Column
@ -62,4 +64,14 @@ public class DeletedColumn extends Column
{
return new DeletedColumn(ByteBufferUtil.clone(name), ByteBufferUtil.clone(value), timestamp);
}
@Override
public void validateFields(CFMetaData metadata) throws MarshalException
{
validateName(metadata);
if (value().remaining() != 4)
throw new MarshalException("A tombstone value should be 4 bytes long");
if (getLocalDeletionTime() < 0)
throw new MarshalException("The local deletion time should not be negative");
}
}

12
src/java/org/apache/cassandra/db/ExpiringColumn.java
View File

@ -24,7 +24,9 @@ import java.security.MessageDigest;
import org.apache.log4j.Logger;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
@ -135,4 +137,14 @@ public class ExpiringColumn extends Column
throw new IllegalStateException("column is not marked for delete");
}
}
@Override
public void validateFields(CFMetaData metadata) throws MarshalException
{
super.validateFields(metadata);
if (timeToLive <= 0)
throw new MarshalException("A column TTL should be > 0");
if (localExpirationTime < 0)
throw new MarshalException("The local expiration time should not be negative");
}
}

3
src/java/org/apache/cassandra/db/IColumn.java
View File

@ -22,7 +22,9 @@ import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.util.Collection;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.utils.FBUtilities;
public interface IColumn
@ -45,6 +47,7 @@ public interface IColumn
public void updateDigest(MessageDigest digest);
public int getLocalDeletionTime(); // for tombstone GC, so int is sufficient granularity
public String getString(AbstractType comparator);
public void validateFields(CFMetaData metadata) throws MarshalException;
/** clones the column, making copies of any underlying byte buffers */
IColumn deepCopy();

11
src/java/org/apache/cassandra/db/SuperColumn.java
View File

@ -32,7 +32,9 @@ import java.util.concurrent.atomic.AtomicLong;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.CFMetaData;
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.ColumnSortedMap;
import org.apache.cassandra.io.util.DataOutputBuffer;
@ -306,6 +308,15 @@ public class SuperColumn implements IColumn, IColumnContainer
{
throw new UnsupportedOperationException("This operation is unsupported on super columns.");
}
public void validateFields(CFMetaData metadata) throws MarshalException
{
metadata.comparator.validate(name());
for (IColumn column : getSubColumns())
{
column.validateFields(metadata);
}
}
}
class SuperColumnSerializer implements IColumnSerializer

38
src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
View File

@ -34,6 +34,7 @@ import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.columniterator.IColumnIterator;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.io.util.BufferedRandomAccessFile;
import org.apache.cassandra.utils.Filter;
@ -55,6 +56,8 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
// Used by lazilyCompactedRow, so that we see the same things when deserializing the first and second time
private final int expireBefore;
private final boolean validateColumns;
/**
* Used to iterate through the columns of a row.
* @param sstable SSTable we are reading ffrom.
@ -70,7 +73,17 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
this(sstable, file, key, dataStart, dataSize, false);
}
public SSTableIdentityIterator(SSTableReader sstable, BufferedRandomAccessFile file, DecoratedKey key, long dataStart, long dataSize, boolean deserializeRowHeader)
/**
* Used to iterate through the columns of a row.
* @param sstable SSTable we are reading ffrom.
* @param file Reading using this file.
* @param key Key of this row.
* @param dataStart Data for this row starts at this pos.
* @param dataSize length of row data
* @param checkData if true, do its best to deserialize and check the coherence of row data
* @throws IOException
*/
public SSTableIdentityIterator(SSTableReader sstable, BufferedRandomAccessFile file, DecoratedKey key, long dataStart, long dataSize, boolean checkData)
throws IOException
{
this.sstable = sstable;
@ -79,12 +92,13 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
this.dataStart = dataStart;
this.dataSize = dataSize;
this.expireBefore = (int)(System.currentTimeMillis() / 1000);
this.validateColumns = checkData;
finishedAt = dataStart + dataSize;
try
{
file.seek(this.dataStart);
if (deserializeRowHeader)
if (checkData)
{
try
{
@ -141,12 +155,19 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
{
try
{
return sstable.getColumnSerializer().deserialize(file, expireBefore);
IColumn column = sstable.getColumnSerializer().deserialize(file, expireBefore);
if (validateColumns)
column.validateFields(sstable.metadata);
return column;
}
catch (IOException e)
{
throw new IOError(e);
}
catch (MarshalException e)
{
throw new IOError(new IOException("Error validating row " + key, e));
}
}
public void remove()
@ -178,6 +199,17 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
file.seek(columnPosition - 4); // seek to before column count int
ColumnFamily cf = columnFamily.cloneMeShallow();
ColumnFamily.serializer().deserializeColumns(file, cf);
if (validateColumns)
{
try
{
cf.validateColumnFields();
}
catch (MarshalException e)
{
throw new IOException("Error validating row " + key, e);
}
}
return cf;
}