Lazy load native library in Statistics constructor.

evolvedbinary · Oct 13, 2023 · a7dc7f9 · a7dc7f9
1 parent 5b11f5a
commit a7dc7f9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/java/Makefile b/java/Makefile
@@ -448,6 +448,7 @@ test: java java_test
 
 run_test:
 	$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=target -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH):target/*" org.rocksdb.test.RocksJunitRunner $(ALL_JAVA_TESTS)
+	$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=target -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH):target/*" org.rocksdb.test.RocksJunitRunner org.rocksdb.StatisticsTest
 
 run_plugin_test:
 	$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=target -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH):target/*" org.rocksdb.test.RocksJunitRunner $(ROCKSDB_PLUGIN_JAVA_TESTS)

diff --git a/java/src/main/java/org/rocksdb/Statistics.java b/java/src/main/java/org/rocksdb/Statistics.java
@@ -14,15 +14,15 @@
 public class Statistics extends RocksObject {
 
   public Statistics() {
-    super(newStatistics());
+    super(newStatisticsInstance());
   }
 
   public Statistics(final Statistics otherStatistics) {
     super(newStatistics(otherStatistics.nativeHandle_));
   }
 
   public Statistics(final EnumSet<HistogramType> ignoreHistograms) {
-    super(newStatistics(toArrayValues(ignoreHistograms)));
+    super(newStatisticsInstance(toArrayValues(ignoreHistograms)));
   }
 
   public Statistics(final EnumSet<HistogramType> ignoreHistograms, final Statistics otherStatistics) {
@@ -134,8 +134,16 @@ public String toString() {
     return toString(nativeHandle_);
   }
 
+  private static long newStatisticsInstance() {
+    RocksDB.loadLibrary();
+    return newStatistics();
+  }
   private static native long newStatistics();
   private static native long newStatistics(final long otherStatisticsHandle);
+  private static long newStatisticsInstance(final byte[] ignoreHistograms) {
+    RocksDB.loadLibrary();
+    return newStatistics(ignoreHistograms);
+  }
   private static native long newStatistics(final byte[] ignoreHistograms);
   private static native long newStatistics(
       final byte[] ignoreHistograms, final long otherStatisticsHandle);

diff --git a/java/src/test/java/org/rocksdb/StatisticsTest.java b/java/src/test/java/org/rocksdb/StatisticsTest.java
@@ -11,18 +11,24 @@
 import org.junit.rules.TemporaryFolder;
 
 import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class StatisticsTest {
 
-  @ClassRule
-  public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
-      new RocksNativeLibraryResource();
-
   @Rule
   public TemporaryFolder dbFolder = new TemporaryFolder();
 
+
+  @Test
+  public void createStatistics() throws RocksDBException {
+    final Statistics statistics = new Statistics();
+    statistics.setStatsLevel(StatsLevel.EXCEPT_DETAILED_TIMERS);
+    final Statistics statisticsWithHistogramOptions = new Statistics(EnumSet.of(HistogramType.DB_WRITE, HistogramType.COMPACTION_TIME));
+    statisticsWithHistogramOptions.reset();
+  }
+
   @Test
   public void statsLevel() throws RocksDBException {
     final Statistics statistics = new Statistics();