You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hs...@apache.org on 2015/03/24 23:57:12 UTC
flink git commit: [FLINK-1770]Rename the variable 'contentAdressable'
to 'contentAddressable'
Repository: flink
Updated Branches:
refs/heads/master ed1b30f3a -> b566e484a
[FLINK-1770]Rename the variable 'contentAdressable' to 'contentAddressable'
Rename the variable 'contentAdressable' to 'contentAddressable' in order to better understanding.
Author: hongsibao <ho...@huawei.com>
Closes #515 from matadorhong/RenameVariableMoreReasonable and squashes the following commits:
40c7312 [hongsibao] Rename the variable 'contentAdressable' to 'contentAddressable'
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b566e484
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b566e484
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b566e484
Branch: refs/heads/master
Commit: b566e484abef41d22e792dc44b9a7872064de0b3
Parents: ed1b30f
Author: hongsibao <ho...@huawei.com>
Authored: Tue Mar 24 15:57:08 2015 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Tue Mar 24 15:57:08 2015 -0700
----------------------------------------------------------------------
.../runtime/blob/BlobServerConnection.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b566e484/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServerConnection.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServerConnection.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServerConnection.java
index 5472a2e..d9facfc 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServerConnection.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServerConnection.java
@@ -167,12 +167,12 @@ class BlobServerConnection extends Thread {
File blobFile;
try {
- final int contentAdressable = inputStream.read();
+ final int contentAddressable = inputStream.read();
- if (contentAdressable < 0) {
+ if (contentAddressable < 0) {
throw new EOFException("Premature end of GET request");
}
- if (contentAdressable == NAME_ADDRESSABLE) {
+ if (contentAddressable == NAME_ADDRESSABLE) {
// Receive the job ID and key
byte[] jidBytes = new byte[JobID.SIZE];
readFully(inputStream, jidBytes, 0, JobID.SIZE, "JobID");
@@ -181,7 +181,7 @@ class BlobServerConnection extends Thread {
String key = readKey(buf, inputStream);
blobFile = this.blobServer.getStorageLocation(jobID, key);
}
- else if (contentAdressable == CONTENT_ADDRESSABLE) {
+ else if (contentAddressable == CONTENT_ADDRESSABLE) {
final BlobKey key = BlobKey.readFromInputStream(inputStream);
blobFile = blobServer.getStorageLocation(key);
}
@@ -260,19 +260,19 @@ class BlobServerConnection extends Thread {
FileOutputStream fos = null;
try {
- final int contentAdressable = inputStream.read();
- if (contentAdressable < 0) {
+ final int contentAddressable = inputStream.read();
+ if (contentAddressable < 0) {
throw new EOFException("Premature end of PUT request");
}
- if (contentAdressable == NAME_ADDRESSABLE) {
+ if (contentAddressable == NAME_ADDRESSABLE) {
// Receive the job ID and key
byte[] jidBytes = new byte[JobID.SIZE];
readFully(inputStream, jidBytes, 0, JobID.SIZE, "JobID");
jobID = JobID.fromByteArray(jidBytes);
key = readKey(buf, inputStream);
}
- else if (contentAdressable == CONTENT_ADDRESSABLE) {
+ else if (contentAddressable == CONTENT_ADDRESSABLE) {
md = BlobUtils.createMessageDigest();
}
else {
@@ -280,7 +280,7 @@ class BlobServerConnection extends Thread {
}
if (LOG.isDebugEnabled()) {
- if (contentAdressable == NAME_ADDRESSABLE) {
+ if (contentAddressable == NAME_ADDRESSABLE) {
LOG.debug(String.format("Received PUT request for BLOB under %s / \"%s\"", jobID, key));
} else {
LOG.debug("Received PUT request for content addressable BLOB");
@@ -311,7 +311,7 @@ class BlobServerConnection extends Thread {
fos.close();
fos = null;
- if (contentAdressable == NAME_ADDRESSABLE) {
+ if (contentAddressable == NAME_ADDRESSABLE) {
File storageFile = this.blobServer.getStorageLocation(jobID, key);
if (!incomingFile.renameTo(storageFile)) {
throw new IOException(String.format("Cannot move staging file %s to BLOB file %s",