You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/08/13 00:49:06 UTC
[1/2] cassandra git commit: Follow-up to CASSANDRA-9265
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 e51f83b60 -> 0ff2a5b71
Follow-up to CASSANDRA-9265
patch by Aleksey Yeschenko
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85d550f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85d550f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85d550f9
Branch: refs/heads/cassandra-3.0
Commit: 85d550f9460ce763acb97ad0740f6ea495f911d3
Parents: 5c88651
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 13 01:48:01 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 13 01:48:07 2015 +0300
----------------------------------------------------------------------
.../io/util/ChecksummedRandomAccessReader.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85d550f9/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java b/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
index 60b193a..442236d 100644
--- a/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.cassandra.io.util;
import java.io.File;
@@ -32,7 +31,9 @@ public class ChecksummedRandomAccessReader extends RandomAccessReader
{
public final File file;
- public CorruptFileException(Exception cause, File file) {
+ public CorruptFileException(Exception cause, File file)
+ {
+ super(cause);
this.file = file;
}
}
@@ -40,7 +41,8 @@ public class ChecksummedRandomAccessReader extends RandomAccessReader
private final DataIntegrityMetadata.ChecksumValidator validator;
private final File file;
- protected ChecksummedRandomAccessReader(File file, ChannelProxy channel, DataIntegrityMetadata.ChecksumValidator validator) throws IOException {
+ protected ChecksummedRandomAccessReader(File file, ChannelProxy channel, DataIntegrityMetadata.ChecksumValidator validator)
+ {
super(channel, validator.chunkSize, -1, BufferType.ON_HEAP, null);
this.validator = validator;
this.file = file;
@@ -51,13 +53,14 @@ public class ChecksummedRandomAccessReader extends RandomAccessReader
try (ChannelProxy channel = new ChannelProxy(file))
{
RandomAccessReader crcReader = RandomAccessReader.open(crcFile);
- DataIntegrityMetadata.ChecksumValidator validator = new DataIntegrityMetadata.ChecksumValidator(new Adler32(),
- crcReader,
- file.getPath());
+ @SuppressWarnings("resource")
+ DataIntegrityMetadata.ChecksumValidator validator =
+ new DataIntegrityMetadata.ChecksumValidator(new Adler32(), crcReader, file.getPath());
return new ChecksummedRandomAccessReader(file, channel, validator);
}
}
+ @Override
protected void reBuffer()
{
long desiredPosition = current();
@@ -89,12 +92,14 @@ public class ChecksummedRandomAccessReader extends RandomAccessReader
buffer.position((int) (desiredPosition - bufferOffset));
}
+ @Override
public void seek(long newPosition)
{
validator.seek(newPosition);
super.seek(newPosition);
}
+ @Override
public void close()
{
super.close();
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ff2a5b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ff2a5b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ff2a5b7
Branch: refs/heads/cassandra-3.0
Commit: 0ff2a5b712363dae742807005f11bb03201b4237
Parents: e51f83b 85d550f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 13 01:50:17 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 13 01:50:17 2015 +0300
----------------------------------------------------------------------
.../io/util/ChecksummedRandomAccessReader.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff2a5b7/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
index 3fc247b,442236d..98869a1
--- a/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/util/ChecksummedRandomAccessReader.java
@@@ -41,23 -41,26 +41,24 @@@ public class ChecksummedRandomAccessRea
private final DataIntegrityMetadata.ChecksumValidator validator;
private final File file;
- protected ChecksummedRandomAccessReader(File file, ChannelProxy channel, DataIntegrityMetadata.ChecksumValidator validator) throws IOException
+ protected ChecksummedRandomAccessReader(File file, ChannelProxy channel, DataIntegrityMetadata.ChecksumValidator validator)
{
- super(channel, validator.chunkSize, -1, BufferType.ON_HEAP, null);
+ super(channel, validator.chunkSize, -1, BufferType.ON_HEAP);
this.validator = validator;
this.file = file;
}
++ @SuppressWarnings("resource")
public static ChecksummedRandomAccessReader open(File file, File crcFile) throws IOException
{
- try (ChannelProxy channel = new ChannelProxy(file))
- {
- RandomAccessReader crcReader = RandomAccessReader.open(crcFile);
- @SuppressWarnings("resource")
- DataIntegrityMetadata.ChecksumValidator validator =
- new DataIntegrityMetadata.ChecksumValidator(new Adler32(), crcReader, file.getPath());
- return new ChecksummedRandomAccessReader(file, channel, validator);
- }
+ ChannelProxy channel = new ChannelProxy(file);
+ RandomAccessReader crcReader = RandomAccessReader.open(crcFile);
- DataIntegrityMetadata.ChecksumValidator validator = new DataIntegrityMetadata.ChecksumValidator(new CRC32(),
- crcReader,
- file.getPath());
++ DataIntegrityMetadata.ChecksumValidator validator =
++ new DataIntegrityMetadata.ChecksumValidator(new CRC32(), crcReader, file.getPath());
+ return new ChecksummedRandomAccessReader(file, channel, validator);
}
+ @Override
protected void reBuffer()
{
long desiredPosition = current();
@@@ -95,16 -99,10 +97,17 @@@
super.seek(newPosition);
}
+ @Override
public void close()
{
- super.close();
- validator.close();
+ try
+ {
+ super.close();
+ }
+ finally
+ {
+ channel.close();
+ validator.close();
+ }
}
}