From ddb8039e3aa1fe99d4a17c21cc970831258d1bb8 Mon Sep 17 00:00:00 2001
From: Naveen <nsomasundaram@linkedin.com>
Date: Mon, 18 Aug 2014 14:03:46 -0700
Subject: [PATCH 1/6] RocksDB static build Make file changes to download and
 build the dependencies .Load the shared library when RocksDB is initialized

---
 Makefile                                  | 32 +++++++++++++++-
 java/org/rocksdb/NativeLibraryLoader.java | 46 +++++++++++++++++++++++
 java/org/rocksdb/Options.java             |  3 ++
 java/org/rocksdb/RocksDB.java             | 24 ++++++++++--
 4 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 java/org/rocksdb/NativeLibraryLoader.java

diff --git a/Makefile b/Makefile
index 1bd202bc9..fd7c8c7d1 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ endif  # PLATFORM_SHARED_EXT
 
 .PHONY: blackbox_crash_test check clean coverage crash_test ldb_tests \
 	release tags valgrind_check whitebox_crash_test format static_lib shared_lib all \
-	dbg
+	dbg rocksdbjavastatic rocksdbjava
 
 all: $(LIBRARY) $(PROGRAMS) $(TESTS)
 
@@ -480,6 +480,36 @@ ROCKSDBJNILIB = librocksdbjni.jnilib
 JAVA_INCLUDE = -I/System/Library/Frameworks/JavaVM.framework/Headers/
 endif
 
+
+rocksdbjavastatic:
+	#build zlib 
+	curl -O http://zlib.net/zlib-1.2.8.tar.gz
+	tar xvzf zlib-1.2.8.tar.gz
+	cd zlib-1.2.8 && CFLAGS='-fPIC' ./configure --static && make
+	cp zlib-1.2.8/libz.a .
+	rm -rf zlib-1.2.8.tar.gz zlib-1.2.8
+	
+	#build bzip
+	curl -O  http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+	tar xvzf bzip2-1.0.6.tar.gz
+	cd bzip2-1.0.6 && make CFLAGS='-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64'
+	cp bzip2-1.0.6/libbz2.a .
+	rm -rf bzip2-1.0.6.tar.gz bzip2-1.0.6
+
+	#build snappy
+	curl -O https://snappy.googlecode.com/files/snappy-1.1.1.tar.gz
+	tar xvzf snappy-1.1.1.tar.gz
+	cd snappy-1.1.1 && ./configure --with-pic --enable-static 
+	cd snappy-1.1.1 && make
+	cp snappy-1.1.1/.libs/libsnappy.a .
+	rm -rf snappy-1.1.1 snappy-1.1.1.tar.gz
+	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j
+	cd java;$(MAKE) java;
+	rm -f ./java/$(ROCKSDBJNILIB)
+	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a
+	cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB)
+	
+
 rocksdbjava:
 	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j32
 	cd java;$(MAKE) java;
diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
new file mode 100644
index 000000000..f49f54488
--- /dev/null
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -0,0 +1,46 @@
+package org.rocksdb;
+
+import java.io.*;
+
+public class NativeLibraryLoader
+{
+
+  private static String sharedLibraryName = "librocksdbjni.so";
+  private static String tempFilePrefix = "librocksdbjni";
+  private static String tempFileSuffix = ".so";
+  /**
+   * Private constructor - this class will never be instanced
+   */
+  private NativeLibraryLoader() {
+  }
+
+  public static void loadLibraryFromJar() throws IOException {
+
+    File temp = File.createTempFile(tempFilePrefix, tempFileSuffix);
+    temp.deleteOnExit();
+
+    if (!temp.exists()) {
+      throw new FileNotFoundException("File " + temp.getAbsolutePath() + " does not exist.");
+    }
+
+    byte[] buffer = new byte[1024];
+    int readBytes;
+
+    InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(sharedLibraryName);
+    if (is == null) {
+      throw new FileNotFoundException(sharedLibraryName + " was not found inside JAR.");
+    }
+
+    OutputStream os = new FileOutputStream(temp);
+    try {
+      while ((readBytes = is.read(buffer)) != -1) {
+        os.write(buffer, 0, readBytes);
+      }
+    } finally {
+      os.close();
+      is.close();
+    }
+
+    System.load(temp.getAbsolutePath());
+  }
+}
diff --git a/java/org/rocksdb/Options.java b/java/org/rocksdb/Options.java
index 95f994606..420bfebba 100644
--- a/java/org/rocksdb/Options.java
+++ b/java/org/rocksdb/Options.java
@@ -13,6 +13,9 @@ package org.rocksdb;
  * native resources will be released as part of the process.
  */
 public class Options extends RocksObject {
+  static{
+    RocksDB.loadLibrary();
+  }
   static final long DEFAULT_CACHE_SIZE = 8 << 20;
   static final int DEFAULT_NUM_SHARD_BITS = -1;
   /**
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index c7b06cc6d..bd9a4f648 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -11,6 +11,7 @@ import java.util.HashMap;
 import java.io.Closeable;
 import java.io.IOException;
 import org.rocksdb.util.Environment;
+import org.rocksdb.NativeLibraryLoader;
 
 /**
  * A RocksDB is a persistent ordered map from keys to values.  It is safe for
@@ -18,16 +19,24 @@ import org.rocksdb.util.Environment;
  * All methods of this class could potentially throw RocksDBException, which
  * indicates sth wrong at the rocksdb library side and the call failed.
  */
-public class RocksDB extends RocksObject {
+public class RocksDB extends org.rocksdb.RocksObject
+{
+
   public static final int NOT_FOUND = -1;
   private static final String[] compressionLibs_ = {
       "snappy", "z", "bzip2", "lz4", "lz4hc"};
 
+  static {
+      loadLibrary();
+  }
+
+
   /**
    * Loads the necessary library files.
    * Calling this method twice will have no effect.
    */
-  public static synchronized void loadLibrary() {
+  public static synchronized void loadLibrary()
+  {
     // loading possibly necessary libraries.
     for (String lib : compressionLibs_) {
       try {
@@ -36,8 +45,15 @@ public class RocksDB extends RocksObject {
         // since it may be optional, we ignore its loading failure here.
       }
     }
-    // However, if any of them is required.  We will see error here.
-    System.loadLibrary("rocksdbjni");
+
+    try
+    {
+      NativeLibraryLoader.loadLibraryFromJar();
+    }
+    catch (IOException e)
+    {
+      e.printStackTrace();
+    }
   }
 
   /**

From 343e98a7d13391ab95dd0b64c1422da597926a96 Mon Sep 17 00:00:00 2001
From: Naveen <nsomasundaram@linkedin.com>
Date: Mon, 18 Aug 2014 14:08:10 -0700
Subject: [PATCH 2/6] Reverting import change

---
 java/org/rocksdb/RocksDB.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index bd9a4f648..6825bf3c5 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -19,7 +19,7 @@ import org.rocksdb.NativeLibraryLoader;
  * All methods of this class could potentially throw RocksDBException, which
  * indicates sth wrong at the rocksdb library side and the call failed.
  */
-public class RocksDB extends org.rocksdb.RocksObject
+public class RocksDB extends RocksObject
 {
 
   public static final int NOT_FOUND = -1;

From 1d284db2135ecb10d8bcd7cd4c1c10fc9f57f621 Mon Sep 17 00:00:00 2001
From: Naveen <nsomasundaram@linkedin.com>
Date: Mon, 8 Sep 2014 17:44:52 -0700
Subject: [PATCH 3/6] Addressing review comments

---
 Makefile                                  | 27 ++++++++++++-----------
 java/org/rocksdb/NativeLibraryLoader.java | 10 ++++-----
 java/org/rocksdb/Options.java             |  2 +-
 java/org/rocksdb/RocksDB.java             |  9 +++-----
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index fd7c8c7d1..4c58e0b0a 100644
--- a/Makefile
+++ b/Makefile
@@ -245,7 +245,7 @@ unity: unity.cc unity.o
 clean:
 	-rm -f $(PROGRAMS) $(TESTS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) build_config.mk unity.cc
 	-rm -rf ios-x86/* ios-arm/*
-	-find . -name "*.[od]" -exec rm {} \;
+	-find . -name "*.[oda]" -exec rm {} \;
 	-find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \;
 tags:
 	ctags * -R
@@ -480,29 +480,30 @@ ROCKSDBJNILIB = librocksdbjni.jnilib
 JAVA_INCLUDE = -I/System/Library/Frameworks/JavaVM.framework/Headers/
 endif
 
-
-rocksdbjavastatic:
-	#build zlib 
+libz.a:
+	-rm -rf zlib-1.2.8
 	curl -O http://zlib.net/zlib-1.2.8.tar.gz
 	tar xvzf zlib-1.2.8.tar.gz
 	cd zlib-1.2.8 && CFLAGS='-fPIC' ./configure --static && make
-	cp zlib-1.2.8/libz.a .
-	rm -rf zlib-1.2.8.tar.gz zlib-1.2.8
-	
-	#build bzip
-	curl -O  http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+	cp zlib-1.2.8/libz.a . 
+
+libbz2.a:
+	-rm -rf bzip2-1.0.6
+	curl -O  http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz 
 	tar xvzf bzip2-1.0.6.tar.gz
 	cd bzip2-1.0.6 && make CFLAGS='-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64'
 	cp bzip2-1.0.6/libbz2.a .
-	rm -rf bzip2-1.0.6.tar.gz bzip2-1.0.6
 
-	#build snappy
+libsnappy.a:
+	-rm -rf snappy-1.1.1
 	curl -O https://snappy.googlecode.com/files/snappy-1.1.1.tar.gz
 	tar xvzf snappy-1.1.1.tar.gz
-	cd snappy-1.1.1 && ./configure --with-pic --enable-static 
+	cd snappy-1.1.1 && ./configure --with-pic --enable-static
 	cd snappy-1.1.1 && make
 	cp snappy-1.1.1/.libs/libsnappy.a .
-	rm -rf snappy-1.1.1 snappy-1.1.1.tar.gz
+		
+
+rocksdbjavastatic: libz.a libbz2.a libsnappy.a
 	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j
 	cd java;$(MAKE) java;
 	rm -f ./java/$(ROCKSDBJNILIB)
diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
index f49f54488..f6b8520f5 100644
--- a/java/org/rocksdb/NativeLibraryLoader.java
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -2,8 +2,7 @@ package org.rocksdb;
 
 import java.io.*;
 
-public class NativeLibraryLoader
-{
+public class NativeLibraryLoader {
 
   private static String sharedLibraryName = "librocksdbjni.so";
   private static String tempFilePrefix = "librocksdbjni";
@@ -14,13 +13,14 @@ public class NativeLibraryLoader
   private NativeLibraryLoader() {
   }
 
-  public static void loadLibraryFromJar() throws IOException {
+  public static void loadLibraryFromJar()
+      throws IOException {
 
     File temp = File.createTempFile(tempFilePrefix, tempFileSuffix);
     temp.deleteOnExit();
 
     if (!temp.exists()) {
-      throw new FileNotFoundException("File " + temp.getAbsolutePath() + " does not exist.");
+      throw new RuntimeException("File " + temp.getAbsolutePath() + " does not exist.");
     }
 
     byte[] buffer = new byte[1024];
@@ -28,7 +28,7 @@ public class NativeLibraryLoader
 
     InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(sharedLibraryName);
     if (is == null) {
-      throw new FileNotFoundException(sharedLibraryName + " was not found inside JAR.");
+      throw new RuntimeException(sharedLibraryName + " was not found inside JAR.");
     }
 
     OutputStream os = new FileOutputStream(temp);
diff --git a/java/org/rocksdb/Options.java b/java/org/rocksdb/Options.java
index 420bfebba..4ed0b8025 100644
--- a/java/org/rocksdb/Options.java
+++ b/java/org/rocksdb/Options.java
@@ -13,7 +13,7 @@ package org.rocksdb;
  * native resources will be released as part of the process.
  */
 public class Options extends RocksObject {
-  static{
+  static {
     RocksDB.loadLibrary();
   }
   static final long DEFAULT_CACHE_SIZE = 8 << 20;
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index 6825bf3c5..132b9ac39 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -19,8 +19,7 @@ import org.rocksdb.NativeLibraryLoader;
  * All methods of this class could potentially throw RocksDBException, which
  * indicates sth wrong at the rocksdb library side and the call failed.
  */
-public class RocksDB extends RocksObject
-{
+public class RocksDB extends RocksObject {
 
   public static final int NOT_FOUND = -1;
   private static final String[] compressionLibs_ = {
@@ -35,8 +34,7 @@ public class RocksDB extends RocksObject
    * Loads the necessary library files.
    * Calling this method twice will have no effect.
    */
-  public static synchronized void loadLibrary()
-  {
+  public static synchronized void loadLibrary() {
     // loading possibly necessary libraries.
     for (String lib : compressionLibs_) {
       try {
@@ -45,14 +43,13 @@ public class RocksDB extends RocksObject
         // since it may be optional, we ignore its loading failure here.
       }
     }
-
     try
     {
       NativeLibraryLoader.loadLibraryFromJar();
     }
     catch (IOException e)
     {
-      e.printStackTrace();
+      throw new RuntimeException("Unable to load the RocksDB shared library" + e);
     }
   }
 

From cf7ace886573f387194d158e09497c05a30bd24a Mon Sep 17 00:00:00 2001
From: Naveen <nsomasun@linkedin.com>
Date: Wed, 10 Sep 2014 12:12:31 -0700
Subject: [PATCH 4/6] Addressing review comments

---
 java/org/rocksdb/NativeLibraryLoader.java | 19 ++++++++++++-------
 java/org/rocksdb/RocksDB.java             |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
index f6b8520f5..880e90acc 100644
--- a/java/org/rocksdb/NativeLibraryLoader.java
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -2,16 +2,16 @@ package org.rocksdb;
 
 import java.io.*;
 
+
+/**
+ * This class is used to load the RocksDB shared library from within the jar.
+ * The shared library is extracted to a temp folder and loaded from there.
+ */
 public class NativeLibraryLoader {
 
   private static String sharedLibraryName = "librocksdbjni.so";
   private static String tempFilePrefix = "librocksdbjni";
   private static String tempFileSuffix = ".so";
-  /**
-   * Private constructor - this class will never be instanced
-   */
-  private NativeLibraryLoader() {
-  }
 
   public static void loadLibraryFromJar()
       throws IOException {
@@ -23,7 +23,7 @@ public class NativeLibraryLoader {
       throw new RuntimeException("File " + temp.getAbsolutePath() + " does not exist.");
     }
 
-    byte[] buffer = new byte[1024];
+    byte[] buffer = new byte[102400];
     int readBytes;
 
     InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(sharedLibraryName);
@@ -31,8 +31,8 @@ public class NativeLibraryLoader {
       throw new RuntimeException(sharedLibraryName + " was not found inside JAR.");
     }
 
-    OutputStream os = new FileOutputStream(temp);
     try {
+      OutputStream os = new FileOutputStream(temp);
       while ((readBytes = is.read(buffer)) != -1) {
         os.write(buffer, 0, readBytes);
       }
@@ -43,4 +43,9 @@ public class NativeLibraryLoader {
 
     System.load(temp.getAbsolutePath());
   }
+  /**
+   * Private constructor to disallow instantiation
+   */
+  private NativeLibraryLoader() {
+  }
 }
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index 132b9ac39..f45a608e2 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -26,7 +26,7 @@ public class RocksDB extends RocksObject {
       "snappy", "z", "bzip2", "lz4", "lz4hc"};
 
   static {
-      loadLibrary();
+      RocksDB.loadLibrary();
   }
 
 

From fd7d3fe604191d9e076c9a76485111a0109acadf Mon Sep 17 00:00:00 2001
From: Naveen <nsomasun@linkedin.com>
Date: Mon, 22 Sep 2014 18:20:02 -0700
Subject: [PATCH 5/6] Addressing review comments (adding a env variable to
 override temp directory)

---
 java/org/rocksdb/NativeLibraryLoader.java | 19 +++++++++++++------
 java/org/rocksdb/RocksDB.java             |  7 +++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
index 880e90acc..ad4315dd4 100644
--- a/java/org/rocksdb/NativeLibraryLoader.java
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -8,15 +8,18 @@ import java.io.*;
  * The shared library is extracted to a temp folder and loaded from there.
  */
 public class NativeLibraryLoader {
-
   private static String sharedLibraryName = "librocksdbjni.so";
   private static String tempFilePrefix = "librocksdbjni";
   private static String tempFileSuffix = ".so";
 
-  public static void loadLibraryFromJar()
+  public static void loadLibraryFromJar(String tmpDir)
       throws IOException {
+    File temp;
+    if(tmpDir == null || tmpDir.equals(""))
+      temp = File.createTempFile(tempFilePrefix, tempFileSuffix);
+    else
+      temp = new File(tmpDir+"/"+sharedLibraryName);
 
-    File temp = File.createTempFile(tempFilePrefix, tempFileSuffix);
     temp.deleteOnExit();
 
     if (!temp.exists()) {
@@ -31,14 +34,18 @@ public class NativeLibraryLoader {
       throw new RuntimeException(sharedLibraryName + " was not found inside JAR.");
     }
 
+    OutputStream os = null;
     try {
-      OutputStream os = new FileOutputStream(temp);
+      os = new FileOutputStream(temp);
       while ((readBytes = is.read(buffer)) != -1) {
         os.write(buffer, 0, readBytes);
       }
     } finally {
-      os.close();
-      is.close();
+      if(os != null)
+        os.close();
+
+      if(is != null)
+        is.close();
     }
 
     System.load(temp.getAbsolutePath());
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index f45a608e2..387e34282 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -20,21 +20,20 @@ import org.rocksdb.NativeLibraryLoader;
  * indicates sth wrong at the rocksdb library side and the call failed.
  */
 public class RocksDB extends RocksObject {
-
   public static final int NOT_FOUND = -1;
   private static final String[] compressionLibs_ = {
       "snappy", "z", "bzip2", "lz4", "lz4hc"};
 
   static {
-      RocksDB.loadLibrary();
+    RocksDB.loadLibrary();
   }
 
-
   /**
    * Loads the necessary library files.
    * Calling this method twice will have no effect.
    */
   public static synchronized void loadLibrary() {
+    String tmpDir = System.getenv("ROCKSDB_SHAREDLIB_DIR");
     // loading possibly necessary libraries.
     for (String lib : compressionLibs_) {
       try {
@@ -45,7 +44,7 @@ public class RocksDB extends RocksObject {
     }
     try
     {
-      NativeLibraryLoader.loadLibraryFromJar();
+      NativeLibraryLoader.loadLibraryFromJar(tmpDir);
     }
     catch (IOException e)
     {

From 51eeaf65e26bab134d7ebef1a69bc7356c815d60 Mon Sep 17 00:00:00 2001
From: Naveen <nsomasun@linkedin.com>
Date: Tue, 23 Sep 2014 10:31:55 -0700
Subject: [PATCH 6/6] Addressing review comments

---
 java/org/rocksdb/NativeLibraryLoader.java | 2 +-
 java/org/rocksdb/RocksDB.java             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
index ad4315dd4..440056582 100644
--- a/java/org/rocksdb/NativeLibraryLoader.java
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -18,7 +18,7 @@ public class NativeLibraryLoader {
     if(tmpDir == null || tmpDir.equals(""))
       temp = File.createTempFile(tempFilePrefix, tempFileSuffix);
     else
-      temp = new File(tmpDir+"/"+sharedLibraryName);
+      temp = new File(tmpDir + "/" + sharedLibraryName);
 
     temp.deleteOnExit();
 
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index 387e34282..ec1cb8a28 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -31,6 +31,9 @@ public class RocksDB extends RocksObject {
   /**
    * Loads the necessary library files.
    * Calling this method twice will have no effect.
+   * By default the method extracts the shared library for loading at
+   * java.io.tmpdir, however, you can override this temporary location by
+   * setting the environment variable ROCKSDB_SHAREDLIB_DIR.
    */
   public static synchronized void loadLibrary() {
     String tmpDir = System.getenv("ROCKSDB_SHAREDLIB_DIR");