You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/12/19 23:22:31 UTC
[1/5] accumulo git commit: ACCUMULO-3443 Speicfy UTF-8 when comparing
header bytes
Repository: accumulo
Updated Branches:
refs/heads/1.6 9a32ec116 -> 42d651e33
refs/heads/master d798d5121 -> 7db351949
ACCUMULO-3443 Speicfy UTF-8 when comparing header bytes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b894e72
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b894e72
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b894e72
Branch: refs/heads/1.6
Commit: 7b894e72c9ee063fc80286a50258da55be1d0e16
Parents: 9a32ec1
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 19 16:46:15 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 19 16:46:23 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b894e72/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 7158ea8..80e03b8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -263,7 +263,7 @@ public class DfsLogger {
FSDataInputStream input = fs.open(path);
DataInputStream decryptingInput = null;
- byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes();
+ byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes(UTF_8);
byte[] magicBuffer = new byte[magic.length];
try {
input.readFully(magicBuffer);
@@ -286,7 +286,7 @@ public class DfsLogger {
}
} else {
input.seek(0);
- byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes();
+ byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes(UTF_8);
byte[] magicBufferV2 = new byte[magicV2.length];
input.readFully(magicBufferV2);
[4/5] accumulo git commit: ACCUMULO-3188 Skip unnecessary (re-)read
of header bytes
Posted by ct...@apache.org.
ACCUMULO-3188 Skip unnecessary (re-)read of header bytes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42d651e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42d651e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42d651e3
Branch: refs/heads/1.6
Commit: 42d651e3358c081f3a303553ce95a214147f273d
Parents: 7b894e7
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 19 17:16:52 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 19 17:16:52 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/42d651e3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 80e03b8..df8dc7a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -316,8 +316,8 @@ public class DfsLogger {
CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
- input.seek(0);
- input.readFully(magicBufferV2);
+ // go back to the beginning, but skip over magicV2 already checked earlier
+ input.seek(magicV2.length);
params.setEncryptedInputStream(input);
params = cryptoModule.getDecryptingInputStream(params);
[2/5] accumulo git commit: ACCUMULO-3443 Speicfy UTF-8 when comparing
header bytes
Posted by ct...@apache.org.
ACCUMULO-3443 Speicfy UTF-8 when comparing header bytes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b894e72
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b894e72
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b894e72
Branch: refs/heads/master
Commit: 7b894e72c9ee063fc80286a50258da55be1d0e16
Parents: 9a32ec1
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 19 16:46:15 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 19 16:46:23 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b894e72/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 7158ea8..80e03b8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -263,7 +263,7 @@ public class DfsLogger {
FSDataInputStream input = fs.open(path);
DataInputStream decryptingInput = null;
- byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes();
+ byte[] magic = DfsLogger.LOG_FILE_HEADER_V3.getBytes(UTF_8);
byte[] magicBuffer = new byte[magic.length];
try {
input.readFully(magicBuffer);
@@ -286,7 +286,7 @@ public class DfsLogger {
}
} else {
input.seek(0);
- byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes();
+ byte[] magicV2 = DfsLogger.LOG_FILE_HEADER_V2.getBytes(UTF_8);
byte[] magicBufferV2 = new byte[magicV2.length];
input.readFully(magicBufferV2);
[5/5] accumulo git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7db35194
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7db35194
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7db35194
Branch: refs/heads/master
Commit: 7db3519493ae7de5123414d5f4adf81f223173d4
Parents: d798d51 42d651e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 19 17:20:16 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 19 17:20:16 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7db35194/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
[3/5] accumulo git commit: ACCUMULO-3188 Skip unnecessary (re-)read
of header bytes
Posted by ct...@apache.org.
ACCUMULO-3188 Skip unnecessary (re-)read of header bytes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42d651e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42d651e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42d651e3
Branch: refs/heads/master
Commit: 42d651e3358c081f3a303553ce95a214147f273d
Parents: 7b894e7
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 19 17:16:52 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 19 17:16:52 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/42d651e3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 80e03b8..df8dc7a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -316,8 +316,8 @@ public class DfsLogger {
CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf);
- input.seek(0);
- input.readFully(magicBufferV2);
+ // go back to the beginning, but skip over magicV2 already checked earlier
+ input.seek(magicV2.length);
params.setEncryptedInputStream(input);
params = cryptoModule.getDecryptingInputStream(params);