From 972c895c3569f2a66ddf9ba260739f59d1827e84 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Wed, 8 Jun 2016 06:35:57 +0100
Subject: [PATCH] Previously WARN level logging became FATAL level logging in
 the Java API (#1089)

---
 java/rocksjni/loggerjnicallback.cc            |  3 ++
 .../src/test/java/org/rocksdb/LoggerTest.java | 54 +++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/java/rocksjni/loggerjnicallback.cc b/java/rocksjni/loggerjnicallback.cc
index 539a76fbb..1da873d2f 100644
--- a/java/rocksjni/loggerjnicallback.cc
+++ b/java/rocksjni/loggerjnicallback.cc
@@ -54,6 +54,9 @@ void LoggerJniCallback::Logv(const InfoLogLevel log_level,
       case rocksdb::InfoLogLevel::INFO_LEVEL:
         jlog_level = InfoLogLevelJni::INFO_LEVEL(env);
         break;
+      case rocksdb::InfoLogLevel::WARN_LEVEL:
+        jlog_level = InfoLogLevelJni::WARN_LEVEL(env);
+        break;
       case rocksdb::InfoLogLevel::ERROR_LEVEL:
         jlog_level = InfoLogLevelJni::ERROR_LEVEL(env);
         break;
diff --git a/java/src/test/java/org/rocksdb/LoggerTest.java b/java/src/test/java/org/rocksdb/LoggerTest.java
index 3e6d359be..f83cff3b7 100644
--- a/java/src/test/java/org/rocksdb/LoggerTest.java
+++ b/java/src/test/java/org/rocksdb/LoggerTest.java
@@ -48,6 +48,36 @@ public class LoggerTest {
     }
   }
 
+  @Test
+  public void warnLogger() throws RocksDBException {
+    final AtomicInteger logMessageCounter = new AtomicInteger();
+    try (final Options options = new Options().
+        setInfoLogLevel(InfoLogLevel.WARN_LEVEL).
+        setCreateIfMissing(true);
+
+         final Logger logger = new Logger(options) {
+           // Create new logger with max log level passed by options
+           @Override
+           protected void log(InfoLogLevel infoLogLevel, String logMsg) {
+             assertThat(logMsg).isNotNull();
+             assertThat(logMsg.length()).isGreaterThan(0);
+             logMessageCounter.incrementAndGet();
+           }
+         }
+    ) {
+
+      // Set custom logger to options
+      options.setLogger(logger);
+
+      try (final RocksDB db = RocksDB.open(options,
+          dbFolder.getRoot().getAbsolutePath())) {
+        // there should be zero messages
+        // using warn level as log level.
+        assertThat(logMessageCounter.get()).isEqualTo(0);
+      }
+    }
+  }
+
 
   @Test
   public void fatalLogger() throws RocksDBException {
@@ -119,6 +149,30 @@ public class LoggerTest {
     }
   }
 
+  @Test
+  public void setWarnLogLevel() {
+    final AtomicInteger logMessageCounter = new AtomicInteger();
+    try (final Options options = new Options().
+        setInfoLogLevel(InfoLogLevel.FATAL_LEVEL).
+        setCreateIfMissing(true);
+         final Logger logger = new Logger(options) {
+           // Create new logger with max log level passed by options
+           @Override
+           protected void log(InfoLogLevel infoLogLevel, String logMsg) {
+             assertThat(logMsg).isNotNull();
+             assertThat(logMsg.length()).isGreaterThan(0);
+             logMessageCounter.incrementAndGet();
+           }
+         }
+    ) {
+      assertThat(logger.infoLogLevel()).
+          isEqualTo(InfoLogLevel.FATAL_LEVEL);
+      logger.setInfoLogLevel(InfoLogLevel.WARN_LEVEL);
+      assertThat(logger.infoLogLevel()).
+          isEqualTo(InfoLogLevel.WARN_LEVEL);
+    }
+  }
+
   @Test
   public void setInfoLogLevel() {
     final AtomicInteger logMessageCounter = new AtomicInteger();