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 2015/01/15 17:12:22 UTC
[1/3] accumulo git commit: ACCUMULO-3481 libaccumulo.so from
java.library.path
Repository: accumulo
Updated Branches:
refs/heads/1.6 d26f63fda -> 65a8c1a16
refs/heads/master 47a091ade -> 07e74151b
ACCUMULO-3481 libaccumulo.so from java.library.path
if libaccumulo.so was loaded from java.library.path, NativeMap.isLoaded() returns false, and native lib is not used
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65a8c1a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65a8c1a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65a8c1a1
Branch: refs/heads/1.6
Commit: 65a8c1a16826cb467da5ba9445978864b8fe73fc
Parents: d26f63f
Author: volth <vo...@webmaster.ms>
Authored: Mon Jan 12 01:45:53 2015 +0000
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jan 15 11:07:55 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/65a8c1a1/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 dcd242e..f728a9b 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
@@ -78,6 +78,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
String errMsg = "Tried and failed to load native map library from " + ldLibraryPath;
try {
System.loadLibrary("accumulo");
+ loadedNativeLibraries.set(true);
log.info("Loaded native map shared library from " + ldLibraryPath);
} catch (Exception e) {
log.error(errMsg, e);
[2/3] accumulo git commit: ACCUMULO-3481 libaccumulo.so from
java.library.path
Posted by ct...@apache.org.
ACCUMULO-3481 libaccumulo.so from java.library.path
if libaccumulo.so was loaded from java.library.path, NativeMap.isLoaded() returns false, and native lib is not used
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65a8c1a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65a8c1a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65a8c1a1
Branch: refs/heads/master
Commit: 65a8c1a16826cb467da5ba9445978864b8fe73fc
Parents: d26f63f
Author: volth <vo...@webmaster.ms>
Authored: Mon Jan 12 01:45:53 2015 +0000
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jan 15 11:07:55 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/65a8c1a1/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 dcd242e..f728a9b 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
@@ -78,6 +78,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
String errMsg = "Tried and failed to load native map library from " + ldLibraryPath;
try {
System.loadLibrary("accumulo");
+ loadedNativeLibraries.set(true);
log.info("Loaded native map shared library from " + ldLibraryPath);
} catch (Exception e) {
log.error(errMsg, e);
[3/3] 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/07e74151
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07e74151
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07e74151
Branch: refs/heads/master
Commit: 07e74151b56965d0d9328d17ef9be3136e47dae8
Parents: 47a091a 65a8c1a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jan 15 11:12:05 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jan 15 11:12:05 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/07e74151/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------