From 0bb3a26d89e0eb6f3a48a8a2caea0c778abfad84 Mon Sep 17 00:00:00 2001
From: Radek Hubner <rhubner@users.noreply.github.com>
Date: Wed, 18 Oct 2023 11:01:04 -0700
Subject: [PATCH] Lazy load native library in Statistics constructor. (#11953)

Summary:
Should fix https://github.com/facebook/rocksdb/issues/9667 and follow the same appropoach as https://github.com/facebook/rocksdb/issues/11919

Pull Request resolved: https://github.com/facebook/rocksdb/pull/11953

Reviewed By: hx235

Differential Revision: D50307456

Pulled By: ajkr

fbshipit-source-id: 43e7e671e8b04875185b38284cefd4c3e11981fa
---
 java/Makefile                                 |  1 +
 .../src/main/java/org/rocksdb/Statistics.java | 12 ++++++++--
 .../test/java/org/rocksdb/StatisticsTest.java | 22 +++++++++++--------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/java/Makefile b/java/Makefile
index ede740afad..f37dc0c4ce 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -450,6 +450,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
index 9f3c9a62c5..09e08ee569 100644
--- a/java/src/main/java/org/rocksdb/Statistics.java
+++ b/java/src/main/java/org/rocksdb/Statistics.java
@@ -14,7 +14,7 @@ import java.util.EnumSet;
 public class Statistics extends RocksObject {
 
   public Statistics() {
-    super(newStatistics());
+    super(newStatisticsInstance());
   }
 
   public Statistics(final Statistics otherStatistics) {
@@ -22,7 +22,7 @@ public class Statistics extends RocksObject {
   }
 
   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 class Statistics extends RocksObject {
     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
index de92102ec2..269cc56a0e 100644
--- a/java/src/test/java/org/rocksdb/StatisticsTest.java
+++ b/java/src/test/java/org/rocksdb/StatisticsTest.java
@@ -5,24 +5,28 @@
 
 package org.rocksdb;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import java.nio.charset.StandardCharsets;
-
-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();