Updated Branches: refs/heads/trunk bfa06db1a -> b460b565e
integratyWriter[sic] doesn't need to be a field of SSTableWriter Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b460b565 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b460b565 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b460b565 Branch: refs/heads/trunk Commit: b460b565e20fdb4739fc92ce387136b39d16e2f1 Parents: bfa06db Author: Dave Brosius <dbros...@apache.org> Authored: Sun May 5 16:18:31 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sun May 5 16:18:31 2013 -0400 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableWriter.java | 4 +--- .../apache/cassandra/io/util/SequentialWriter.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b460b565/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java index 4b0b756..8defb10 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java @@ -46,7 +46,6 @@ public class SSTableWriter extends SSTable private DecoratedKey lastWrittenKey; private FileMark dataMark; private final SSTableMetadata.Collector sstableMetadataCollector; - private DataIntegrityMetadata.ChecksumWriter integratyWriter; public SSTableWriter(String filename, long keyCount) { @@ -107,8 +106,7 @@ public class SSTableWriter extends SSTable { dbuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode()); dataFile = SequentialWriter.open(new File(getFilename()), !metadata.populateIoCacheOnFlush()); - integratyWriter = DataIntegrityMetadata.checksumWriter(descriptor); - dataFile.setDataIntegratyWriter(integratyWriter); + dataFile.setDataIntegrityWriter(DataIntegrityMetadata.checksumWriter(descriptor)); } this.sstableMetadataCollector = sstableMetadataCollector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b460b565/src/java/org/apache/cassandra/io/util/SequentialWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java b/src/java/org/apache/cassandra/io/util/SequentialWriter.java index b970c95..369d80e 100644 --- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java +++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java @@ -399,7 +399,7 @@ public class SequentialWriter extends OutputStream * This can only be called before any data is written to this write, * otherwise an IllegalStateException is thrown. */ - public void setDataIntegratyWriter(DataIntegrityMetadata.ChecksumWriter writer) + public void setDataIntegrityWriter(DataIntegrityMetadata.ChecksumWriter writer) { if (current != 0) throw new IllegalStateException();
