You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/25 00:37:14 UTC

[1/5] git commit: ACCUMULO-2494 fix rat check failure

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT bc1f026d9 -> 62ce7524f
  refs/heads/master 62661dccd -> a9f1767b9


ACCUMULO-2494 fix rat check failure


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ce6a7216
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ce6a7216
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ce6a7216

Branch: refs/heads/master
Commit: ce6a7216d3d41966f15c3be2d2099aac1797124f
Parents: 5a130ad
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Mar 24 14:52:47 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 16:42:21 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/core/util/StatTest.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce6a7216/core/src/test/java/org/apache/accumulo/core/util/StatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/StatTest.java b/core/src/test/java/org/apache/accumulo/core/util/StatTest.java
index c32d79d..69df38d 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/StatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/StatTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.apache.accumulo.core.util;
 
 import static org.junit.Assert.assertEquals;


[3/5] git commit: ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.

Posted by el...@apache.org.
ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62ce7524
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62ce7524
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62ce7524

Branch: refs/heads/master
Commit: 62ce7524f4618e1b46166a6d8f4f65fbbda4c4ec
Parents: bc1f026
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 24 16:32:10 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 24 16:32:10 2014 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/server/fs/VolumeManagerImpl.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62ce7524/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 6a3140b..8fe6579 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -151,11 +151,9 @@ public class VolumeManagerImpl implements VolumeManager {
 
     Volume v = getVolumeByPath(path);
     FileSystem fs = v.getFileSystem();
-
-    if (bufferSize == 0) {
-      fs.getConf().getInt("io.file.buffer.size", 4096);
-    }
-    return fs.create(path, overwrite, bufferSize, replication, correctBlockSize(fs.getConf(), blockSize));
+    blockSize = correctBlockSize(fs.getConf(), blockSize);
+    bufferSize = correctBufferSize(fs.getConf(), bufferSize);
+    return fs.create(path, overwrite, bufferSize, replication, blockSize);
   }
 
   @Override


[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9f1767b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9f1767b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9f1767b

Branch: refs/heads/master
Commit: a9f1767b9dc8f399a2e9c7b7c5437de992c1fe8d
Parents: 62661dc 62ce752
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 24 16:36:58 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 24 16:36:58 2014 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/server/fs/VolumeManagerImpl.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[2/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bc1f026d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc1f026d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc1f026d

Branch: refs/heads/master
Commit: bc1f026d9b6fd584d46f0a66fd9a16a891ce8587
Parents: 04d51b3 ce6a721
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 24 16:42:36 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 16:42:36 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[4/5] git commit: ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.

Posted by el...@apache.org.
ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62ce7524
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62ce7524
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62ce7524

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 62ce7524f4618e1b46166a6d8f4f65fbbda4c4ec
Parents: bc1f026
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 24 16:32:10 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 24 16:32:10 2014 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/server/fs/VolumeManagerImpl.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62ce7524/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 6a3140b..8fe6579 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -151,11 +151,9 @@ public class VolumeManagerImpl implements VolumeManager {
 
     Volume v = getVolumeByPath(path);
     FileSystem fs = v.getFileSystem();
-
-    if (bufferSize == 0) {
-      fs.getConf().getInt("io.file.buffer.size", 4096);
-    }
-    return fs.create(path, overwrite, bufferSize, replication, correctBlockSize(fs.getConf(), blockSize));
+    blockSize = correctBlockSize(fs.getConf(), blockSize);
+    bufferSize = correctBufferSize(fs.getConf(), bufferSize);
+    return fs.create(path, overwrite, bufferSize, replication, blockSize);
   }
 
   @Override