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 2013/12/05 22:40:16 UTC
git commit: ACCUMULO-1969 Load native maps from lib/native not
lib/native/map
Updated Branches:
refs/heads/1.6.0-SNAPSHOT f777f539e -> e15263589
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/1.6.0-SNAPSHOT
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);