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 2013/12/06 04:58:40 UTC
[1/5] git commit: ACCUMULO-1969 Load native maps from lib/native not
lib/native/map
Updated Branches:
refs/heads/master 061a64195 -> fd0ff9204
ACCUMULO-1969 Load native maps from lib/native not lib/native/map
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e1526358
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e1526358
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e1526358
Branch: refs/heads/master
Commit: e1526358975515a637c2d34386a817a8acb12137
Parents: f777f53
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 5 16:39:49 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 5 16:39:49 2013 -0500
----------------------------------------------------------------------
bin/build_native_library.sh | 2 +-
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e1526358/bin/build_native_library.sh
----------------------------------------------------------------------
diff --git a/bin/build_native_library.sh b/bin/build_native_library.sh
index cb8d0dd..65b2457 100755
--- a/bin/build_native_library.sh
+++ b/bin/build_native_library.sh
@@ -29,7 +29,7 @@ script=$( basename "$SOURCE" )
lib="${bin}/../lib"
native_tarball="${lib}/accumulo-native.tar.gz"
-final_native_target="${lib}/native/map"
+final_native_target="${lib}/native"
if [[ ! -f $native_tarball ]]; then
echo "Could not find native code artifact: ${native_tarball}";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e1526358/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 80c6f62..a454d6c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -63,10 +63,12 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
static {
// Check standard directories
List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
- // Check in old ACCUMULO_HOME location, too
+ // Check in ACCUMULO_HOME location, too
String envAccumuloHome = System.getenv("ACCUMULO_HOME");
- if (envAccumuloHome != null)
- directories.add(new File(envAccumuloHome + "/lib/native/map"));
+ if (envAccumuloHome != null) {
+ directories.add(new File(envAccumuloHome + "/lib/native"));
+ directories.add(new File(envAccumuloHome + "/lib/native/map")); // old location, just in case somebody puts it here
+ }
// Attempt to load from these directories, using standard names
loadNativeLib(directories);
[3/5] git commit: ACCUMULO-1793 updates Hadoop 2 profile to match
version used in other dev branches. Includes updating slf4j based on what
comes with Hadoop 2.2.0.
Posted by el...@apache.org.
ACCUMULO-1793 updates Hadoop 2 profile to match version used in other dev branches. Includes updating slf4j based on what comes with Hadoop 2.2.0.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1d5ed48f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d5ed48f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d5ed48f
Branch: refs/heads/master
Commit: 1d5ed48f94fbbac3b10d18db4148b4dae79f2880
Parents: 00fb08b
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Thu Dec 5 12:38:52 2013 -0600
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 5 22:33:23 2013 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d5ed48f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a46609..bda5076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -932,9 +932,9 @@
</property>
</activation>
<properties>
- <hadoop.version>2.0.4-alpha</hadoop.version>
+ <hadoop.version>2.2.0</hadoop.version>
<httpclient.version>3.1</httpclient.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
</properties>
</profile>
</profiles>
[4/5] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-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/f65becad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f65becad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f65becad
Branch: refs/heads/master
Commit: f65becad07ed5affe05e82bae5d9fa32611fab2f
Parents: 975881c 1d5ed48
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 5 22:52:30 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 5 22:52:30 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/5] git commit: ACCUMULO-1534 change default for
tfile.fs.input.buffer.size in BCFile to 32K from 256K
Posted by el...@apache.org.
ACCUMULO-1534 change default for tfile.fs.input.buffer.size in BCFile to 32K from 256K
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/975881c1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/975881c1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/975881c1
Branch: refs/heads/master
Commit: 975881c10d1007fa43c1894fda12b3d41ea32dbb
Parents: e152635
Author: Keith Turner <kt...@apache.org>
Authored: Thu Dec 5 17:32:07 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Thu Dec 5 17:32:07 2013 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/975881c1/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 5b416cc..7ce6c2a 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -73,7 +73,7 @@ public final class BCFile {
}
private static int getFSInputBufferSize(Configuration conf) {
- return conf.getInt(FS_INPUT_BUF_SIZE_ATTR, 256 * 1024);
+ return conf.getInt(FS_INPUT_BUF_SIZE_ATTR, 32 * 1024);
}
/**
[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/fd0ff920
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd0ff920
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd0ff920
Branch: refs/heads/master
Commit: fd0ff92044ad8c02f2a1675c9089cd044e078bcf
Parents: 061a641 f65beca
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 5 22:52:56 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 5 22:52:56 2013 -0500
----------------------------------------------------------------------
bin/build_native_library.sh | 2 +-
.../org/apache/accumulo/core/file/rfile/bcfile/BCFile.java | 2 +-
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 8 +++++---
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------