New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add translog checksums #7232
Merged
Merged
Add translog checksums #7232
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.translog; | ||
|
|
||
| import org.apache.lucene.store.BufferedChecksum; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.zip.CRC32; | ||
| import java.util.zip.Checksum; | ||
|
|
||
| /** | ||
| * Similar to Lucene's BufferedChecksumIndexInput, however this wraps a | ||
| * {@link StreamInput} so anything read will update the checksum | ||
| */ | ||
| public final class BufferedChecksumStreamInput extends StreamInput { | ||
| private final StreamInput in; | ||
| private final Checksum digest; | ||
|
|
||
| public BufferedChecksumStreamInput(StreamInput in) { | ||
| this.in = in; | ||
| this.digest = new BufferedChecksum(new CRC32()); | ||
| } | ||
|
|
||
| public long getChecksum() { | ||
| return this.digest.getValue(); | ||
| } | ||
|
|
||
| @Override | ||
| public byte readByte() throws IOException { | ||
| final byte b = in.readByte(); | ||
| digest.update(b); | ||
| return b; | ||
| } | ||
|
|
||
| @Override | ||
| public void readBytes(byte[] b, int offset, int len) throws IOException { | ||
| in.readBytes(b, offset, len); | ||
| digest.update(b, offset, len); | ||
| } | ||
|
|
||
| @Override | ||
| public void reset() throws IOException { | ||
| in.reset(); | ||
| digest.reset(); | ||
| } | ||
|
|
||
| @Override | ||
| public int read() throws IOException { | ||
| return readByte() & 0xFF; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| in.close(); | ||
| } | ||
| } | ||
73 changes: 73 additions & 0 deletions
73
src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.translog; | ||
|
|
||
| import org.apache.lucene.store.BufferedChecksum; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.zip.CRC32; | ||
| import java.util.zip.Checksum; | ||
|
|
||
| /** | ||
| * Similar to Lucene's BufferedChecksumIndexOutput, however this wraps a | ||
| * {@link StreamOutput} so anything written will update the checksum | ||
| */ | ||
| public final class BufferedChecksumStreamOutput extends StreamOutput { | ||
| private final StreamOutput out; | ||
| private final Checksum digest; | ||
|
|
||
| public BufferedChecksumStreamOutput(StreamOutput out) { | ||
| this.out = out; | ||
| this.digest = new BufferedChecksum(new CRC32()); | ||
| } | ||
|
|
||
| public long getChecksum() { | ||
| return this.digest.getValue(); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeByte(byte b) throws IOException { | ||
| out.writeByte(b); | ||
| digest.update(b); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeBytes(byte[] b, int offset, int length) throws IOException { | ||
| out.writeBytes(b, offset, length); | ||
| digest.update(b, offset, length); | ||
| } | ||
|
|
||
| @Override | ||
| public void flush() throws IOException { | ||
| out.flush(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| out.close(); | ||
| } | ||
|
|
||
| @Override | ||
| public void reset() throws IOException { | ||
| out.reset(); | ||
| digest.reset(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the contract of this method? Usually (e.g. java InputStream) its that it returns an integer value between 0 and 255. So I think this is missing & 0xFF ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, added this, thanks!