Migrate to wvlet-log

Author: xerial

build.sbt

@@ -105,7 +105,7 @@ lazy val larrayScala = Project(
       },
       libraryDependencies ++= Seq(
         // Add dependent jars here
-        "org.xerial" %% "xerial-core" % "3.6.0",
+        "org.wvlet" %% "wvlet-log" % "1.1",
         snappy % "test",
         junit,
         "org.iq80.snappy" % "snappy" % "0.3" % "test",
@@ -124,11 +124,12 @@ lazy val larrayBuffer = Project(
   settings = buildSettings ++ Seq(
     description := "LArray off-heap buffer library",
     crossPaths := false,
+    scalaVersion := SCALA_VERSION,
     autoScalaLibrary := false,
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "3.0.1" % "test",
       "org.xerial.java" % "xerial-core" % "2.1",
-      "org.xerial" %% "xerial-core" % "3.6.0" % "test"
+      "org.scalatest" %% "scalatest" % "3.0.1" % "test",
+      "org.wvlet" %% "wvlet-log" % "1.1" % "test"
     )
   )
 )

larray-buffer/src/main/java/xerial/larray/buffer/DefaultMemoryAllocator.java

@@ -17,8 +17,7 @@
  */
 public class DefaultMemoryAllocator implements MemoryAllocator {
 
-    private Logger logger = Logger.getLogger(DefaultMemoryAllocator.class);
-
+    private static Logger logger = Logger.getLogger(DefaultMemoryAllocator.class);
 
     // Table from address -> MemoryReference
     private Map<Long, MemoryReference> allocatedMemoryReferences = new ConcurrentHashMap<Long, MemoryReference>();

larray-buffer/src/main/java/xerial/larray/buffer/UnsafeUtil.java

@@ -8,6 +8,7 @@
 
 /**
  * Helper methods for using sun.misc.Unsafe.
+ *
  * @author Taro L. Saito
  */
 public class UnsafeUtil {
@@ -17,9 +18,11 @@ public static Unsafe getUnsafe() {
             Field f = Unsafe.class.getDeclaredField("theUnsafe");
             f.setAccessible(true);
             return Unsafe.class.cast(f.get(null));
-        } catch (NoSuchFieldException e) {
+        }
+        catch(NoSuchFieldException e) {
             throw new IllegalStateException("sun.misc.Unsafe is not available in this JVM");
-        } catch (IllegalAccessException e) {
+        }
+        catch(IllegalAccessException e) {
             throw new IllegalStateException("sun.misc.Unsafe is not available in this JVM");
         }
     }
@@ -29,9 +32,11 @@ public static Unsafe getUnsafe() {
     private static Constructor<?> findDirectByteBufferConstructor() {
         try {
             return Class.forName("java.nio.DirectByteBuffer").getDeclaredConstructor(Long.TYPE, Integer.TYPE, Object.class);
-        } catch (ClassNotFoundException e) {
+        }
+        catch(ClassNotFoundException e) {
             throw new IllegalStateException(String.format("Failed to find java.nio.DirectByteBuffer: $s", e.getMessage()));
-        } catch (NoSuchMethodException e) {
+        }
+        catch(NoSuchMethodException e) {
             throw new IllegalStateException(String.format("Failed to find constructor f java.nio.DirectByteBuffer: $s", e.getMessage()));
         }
     }
@@ -44,9 +49,9 @@ private static Constructor<?> findDirectByteBufferConstructor() {
      *
      * @param addr
      * @param size
-     * @param att object holding the underlying memory to attach to the buffer.
-     *            This will prevent the garbage collection of the memory area that's
-     *            associated with the new <code>DirectByteBuffer</code>
+     * @param att  object holding the underlying memory to attach to the buffer.
+     *             This will prevent the garbage collection of the memory area that's
+     *             associated with the new <code>DirectByteBuffer</code>
      * @return
      */
     public static ByteBuffer newDirectByteBuffer(long addr, int size, Object att) {
@@ -55,7 +60,8 @@ public static ByteBuffer newDirectByteBuffer(long addr, int size, Object att) {
         try {
             b = dbbCC.newInstance(new Long(addr), new Integer(size), att);
             return ByteBuffer.class.cast(b);
-        } catch (Exception e) {
+        }
+        catch(Exception e) {
             throw new IllegalStateException(String.format("Failed to create DirectByteBuffer: %s", e.getMessage()));
         }
     }

larray-buffer/src/test/scala/xerial/larray/DataUnit.scala

@@ -0,0 +1,70 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//--------------------------------------
+//
+// DataUnit.scala
+// Since: 2012/12/07 1:38 PM
+//
+//--------------------------------------
+
+package xerial.larray
+
+/**
+  * Translators of data sizes
+  *
+  * @author Taro L. Saito
+  */
+object DataUnit {
+
+  /**
+    * Convert the given byte size into human readable format like 1024 -> 1K
+    * @param byteSize
+    * @return string representation of the byte size
+    */
+  def toHumanReadableFormat(byteSize:Long) : String = {
+    // kilo, mega, giga, tera, peta, exa, zetta, yotta
+    val unitName = Seq("", "K", "M", "G", "T", "P", "E", "Z", "Y")
+
+    def loop(index:Int, v:Long) : (Long, String) = {
+      if(index >= unitName.length)
+        (byteSize, "")
+      val next = v >> 10L
+      if(next == 0L)
+        (v, unitName(index))
+      else
+        loop(index+1, next)
+    }
+
+    val (prefix, unit) = if(byteSize > 0)
+      loop(0, byteSize)
+    else
+      loop(0, -byteSize) match { case (p, u) => (-p, u)}
+    s"$prefix$unit"
+  }
+
+//  implicit class DataSize(size:Long) {
+//    def K = size * KB
+//    def M = size * MB
+//    def G = size * GB
+//    def P = size * PB
+//  }
+
+  // data size unit
+  val KB = 1L << 10
+  val MB = 1L << 20
+  val GB = 1L << 30
+  val PB = 1L << 40
+
+}

larray-buffer/src/test/scala/xerial/larray/LArraySpec.scala

@@ -1,17 +1,38 @@
 package xerial.larray
 
 import org.scalatest._
-import xerial.core.io.Resource
-import xerial.core.util.Timer
-import xerial.core.log.Logger
+import wvlet.log.LogFormatter.SourceCodeLogFormatter
+import wvlet.log.{LogSupport, Logger}
+import wvlet.log.io.{ResourceReader, StopWatch, Timer}
+
 import scala.language.implicitConversions
 
 /**
  * @author Taro L. Saito
  */
-trait LArraySpec extends WordSpec with Matchers with Resource with Timer with Logger
-with BeforeAndAfterAll with BeforeAndAfter with BeforeAndAfterEach with GivenWhenThen {
+trait LArraySpec
+  extends WordSpec
+    with Matchers
+    with ResourceReader
+    with Timer
+    with LogSupport
+    with BeforeAndAfterAll
+    with BeforeAndAfter
+    with BeforeAndAfterEach
+    with GivenWhenThen {
 
   implicit def toTag(t:String) = Tag(t)
 
+  Logger.setDefaultFormatter(SourceCodeLogFormatter)
+
+  override protected def beforeAll(): Unit = {
+    // Run LogLevel scanner (log-test.properties or log.properties in classpath) every 1 minute
+    Logger.scheduleLogLevelScan
+    super.beforeAll()
+  }
+
+  override protected def afterAll(): Unit = {
+    Logger.stopScheduledLogLevelScan
+    super.afterAll()
+  }
 }

larray-buffer/src/test/scala/xerial/larray/buffer/LBufferTest.scala

@@ -8,10 +8,8 @@
 package xerial.larray.buffer
 
 import java.nio.ByteBuffer
-import xerial.larray.LArraySpec
-import scala.util.Random
-import xerial.core.util.DataUnit
 
+import xerial.larray.{DataUnit, LArraySpec}
 
 /**
  * @author Taro L. Saito
@@ -69,34 +67,34 @@ class LBufferTest extends LArraySpec {
 
       info("start buffer allocation test")
 
-      time("single-thread allocation", repeat=10) {
-        block("without zero-filling", repeat=R) {
+      time("single-thread allocation", repeat=10, blockRepeat = R) {
+        block("without zero-filling") {
           for(i <- range) yield {
             new LBuffer(S)
           }
         }
 
-        block("with zero-filling", repeat=R) {
+        block("with zero-filling") {
           for(i <- range) yield {
             val m = new LBuffer(S)
             m.clear()
             m
           }
         }
 
-        block("java array", repeat=R) {
+        block("java array") {
           for(i <- range) yield {
             new Array[Byte](S)
           }
         }
 
-        block("byte buffer", repeat=R) {
+        block("byte buffer") {
           for(i <- range) yield {
             ByteBuffer.allocate(S)
           }
         }
 
-        block("direct byte buffer", repeat=R) {
+        block("direct byte buffer") {
           for(i <- range) yield {
             ByteBuffer.allocateDirect(S)
           }
@@ -114,34 +112,34 @@ class LBufferTest extends LArraySpec {
 
       info("start buffer allocation test")
 
-      time("concurrent allocation", repeat=10) {
-        block("without zero-filling", repeat=R) {
+      time("concurrent allocation", repeat=10, blockRepeat = R) {
+        block("without zero-filling") {
           for(i <- range) yield {
             new LBuffer(S)
           }
         }
 
-        block("with zero-filling", repeat=R) {
+        block("with zero-filling") {
           for(i <- range) yield {
             val m = new LBuffer(S)
             m.clear()
             m
           }
         }
 
-        block("java array", repeat=R) {
+        block("java array") {
           for(i <- range) yield {
             new Array[Byte](S)
           }
         }
 
-        block("byte buffer", repeat=R) {
+        block("byte buffer") {
           for(i <- range) yield {
             ByteBuffer.allocate(S)
           }
         }
 
-        block("direct byte buffer", repeat=R) {
+        block("direct byte buffer") {
           for(i <- range) yield {
             ByteBuffer.allocateDirect(S)
           }

larray/src/main/scala/xerial/larray/LArray.scala

@@ -23,11 +23,13 @@
 package xerial.larray
 
 import scala.reflect.ClassTag
-import xerial.core.log.Logger
-import java.nio.{ByteOrder, ByteBuffer}
+import java.nio.{ByteBuffer, ByteOrder}
 import java.nio.channels.{FileChannel, WritableByteChannel}
+
 import sun.nio.ch.DirectBuffer
-import java.io.{FileInputStream, FileOutputStream, File}
+import java.io.{File, FileInputStream, FileOutputStream}
+
+import wvlet.log.LogSupport
 import xerial.larray.buffer.{Memory, MemoryAllocator}
 import xerial.larray.mmap.MMapMode
 
@@ -742,7 +744,7 @@ trait RawByteArray[A] extends LArray[A] {
 }
 
 
-private[larray] trait UnsafeArray[T] extends RawByteArray[T] with Logger {
+private[larray] trait UnsafeArray[T] extends RawByteArray[T] with LogSupport {
   self: LArray[T] =>
   private[larray] def m: Memory
   def address = m.address