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

merge from 0.7 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1086406 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2011-03-28 21:21:29 +00:00
parent b3debb5b45 323ee4606c
commit 0babdf4b98
10 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -34,6 +34,8 @@
charset is not UTF8 (CASSANDRA-2367)
* fix potential infinite loop in ByteBufferUtil.inputStream (CASSANDRA-2365)
* allow negative numbers in the cli (CASSANDRA-2358)
* fix incorrect truncation of long to int when reading columns via block
index (CASSANDRA-2376)
0.7.4

3
conf/schema-sample.txt
View File

@ -53,7 +53,8 @@ create column family Super3
and comment = 'A column family with supercolumns, whose column names are Longs (8 bytes)';
create column family Indexed1
with default_validation_class = LongType
with comparator = UTF8Type
and default_validation_class = LongType
and column_metadata = [{
column_name : birthdate,
validation_class : LongType,

1
src/java/org/apache/cassandra/cli/Cli.g
View File

@ -591,7 +591,6 @@ Alnum
// syntactic Elements
IntegerPositiveLiteral
: Digit+
| '-' Digit+
;
IntegerNegativeLiteral

4
src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
View File

@ -39,6 +39,7 @@ import org.apache.cassandra.io.sstable.IndexHelper;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileUtils;
/**
* This is a reader that finds the block for a starting column and returns
@ -172,8 +173,7 @@ class IndexedSliceReader extends AbstractIterator<IColumn> implements IColumnIte
boolean outOfBounds = false;
file.reset(mark);
long curOffset = file.skipBytes((int) curColPosition.offset);
assert curOffset == curColPosition.offset;
FileUtils.skipBytesFully(file, curColPosition.offset);
while (file.bytesPastMark(mark) < curColPosition.offset + curColPosition.width && !outOfBounds)
{
IColumn column = emptyColumnFamily.getColumnSerializer().deserialize(file);

3
src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
View File

@ -172,8 +172,7 @@ public class SSTableNamesIterator extends SimpleAbstractColumnIterator implement
for (IndexHelper.IndexInfo indexInfo : ranges)
{
file.reset(mark);
long curOffsert = file.skipBytes((int) indexInfo.offset);
assert curOffsert == indexInfo.offset;
FileUtils.skipBytesFully(file, indexInfo.offset);
// TODO only completely deserialize columns we are interested in
while (file.bytesPastMark(mark) < indexInfo.offset + indexInfo.width)
{

12
src/java/org/apache/cassandra/hadoop/streaming/AvroOutputReader.java
View File

@ -32,6 +32,7 @@ import org.apache.avro.io.DecoderFactory;
import org.apache.avro.specific.SpecificDatumReader;
import org.apache.cassandra.hadoop.avro.Mutation;
import org.apache.cassandra.hadoop.avro.StreamingMutation;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.hadoop.streaming.PipeMapRed;
import org.apache.hadoop.streaming.io.OutputReader;
@ -139,15 +140,8 @@ public class AvroOutputReader extends OutputReader<ByteBuffer, List<Mutation>>
@Override
public long skip(long n) throws IOException
{
long skipped = 0;
while (n > 0)
{
// skip in batches up to max_int in size
int skip = (int)Math.min(Integer.MAX_VALUE, n);
skipped += in.skipBytes(skip);
n -= skip;
}
return skipped;
FileUtils.skipBytesFully(in, n);
return n;
}
}
}

8
src/java/org/apache/cassandra/io/sstable/IndexHelper.java
View File

@ -28,6 +28,7 @@ import java.util.List;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileMark;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.*;
/**
@ -46,9 +47,7 @@ public class IndexHelper
/* size of the bloom filter */
int size = in.readInt();
/* skip the serialized bloom filter */
int skipped = in.skipBytes(size);
if (skipped != size)
throw new EOFException("attempted to skip " + size + " bytes but only skipped " + skipped);
FileUtils.skipBytesFully(in, size);
}
/**
@ -61,8 +60,7 @@ public class IndexHelper
/* read only the column index list */
int columnIndexSize = file.readInt();
/* skip the column index data */
if (file.skipBytes(columnIndexSize) != columnIndexSize)
throw new EOFException();
FileUtils.skipBytesFully(file, columnIndexSize);
}
/**

2
src/java/org/apache/cassandra/io/sstable/SSTable.java
View File

@ -227,7 +227,7 @@ public abstract class SSTable
while (ifile.getFilePointer() < BYTES_CAP && keys < SAMPLES_CAP)
{
ByteBufferUtil.skipShortLength(ifile);
ifile.skipBytes(8);
FileUtils.skipBytesFully(ifile, 8);
keys++;
}
assert keys > 0 && ifile.getFilePointer() > 0 && ifile.length() > 0;

25
src/java/org/apache/cassandra/io/util/FileUtils.java
View File

@ -210,4 +210,29 @@ public class FileUtils
// The directory is now empty so now it can be smoked
deleteWithConfirm(dir);
}
public static void skipBytesFully(DataInput in, int bytes) throws IOException
{
int n = 0;
while (n < bytes)
{
int skipped = in.skipBytes(bytes - n);
if (skipped == 0)
throw new EOFException("EOF after " + n + " bytes out of " + bytes);
n += skipped;
}
}
public static void skipBytesFully(DataInput in, long bytes) throws IOException
{
long n = 0;
while (n < bytes)
{
int m = (int) Math.min(Integer.MAX_VALUE, bytes - n);
int skipped = in.skipBytes(m);
if (skipped == 0)
throw new EOFException("EOF after " + n + " bytes out of " + bytes);
n += skipped;
}
}
}

9
src/java/org/apache/cassandra/utils/ByteBufferUtil.java
View File

@ -31,6 +31,8 @@ import java.util.Arrays;
import static com.google.common.base.Charsets.UTF_8;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.commons.lang.ArrayUtils;
/**
@ -373,12 +375,7 @@ public class ByteBufferUtil
public static ByteBuffer skipShortLength(DataInput in) throws IOException
{
int skip = readShortLength(in);
while (skip > 0)
{
int skipped = in.skipBytes(skip);
if (skipped == 0) throw new EOFException();
skip -= skipped;
}
FileUtils.skipBytesFully(in, skip);
return null;
}