Merge branch 'release/0.5.2'

Author: isnotinvain

.travis.yml

@@ -1,4 +1,5 @@
 language: scala
+sudo: false
 scala:
   - 2.10.4
   - 2.11.2

CHANGES.md

@@ -1,5 +1,10 @@
 # chill #
 
+### 0.5.2 ###
+* Use new Travis CI infrastructure #210
+* Optimizations for ConfiguredInstantiator. #213
+* Upgrade to algebird 0.9.0, bijection 0.7.2, scala 2.11.5 #214
+
 ### 0.5.1
 * reverse Config contains logic: https://github.com/twitter/chill/pull/205
 * fix setConf: https://github.com/twitter/chill/pull/204

README.md

@@ -139,6 +139,8 @@ object is created.
 
 ## Community and Documentation
 
+This, and all [github.com/twitter](https://github.com/twitter) projects, are under the [Twitter Open Source Code of Conduct](https://engineering.twitter.com/opensource/code-of-conduct). Additionally, see the [Typelevel Code of Conduct](http://typelevel.org/conduct) for specific examples of harassing behavior that are not tolerated.
+
 To learn more and find links to tutorials and information around the web, check out the [Chill Wiki](https://github.com/twitter/chill/wiki).
 
 The latest ScalaDocs are hosted on Chill's [Github Project Page](http://twitter.github.io/chill).
@@ -147,7 +149,7 @@ Discussion occurs primarily on the [Chill mailing list](https://groups.google.co
 
 ## Maven
 
-Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.5.1` and each scala project is published for `2.10` and `2.11`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
+Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.5.2` and each scala project is published for `2.10` and `2.11`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
 
 ## Authors
 

chill-java/src/main/java/com/twitter/chill/config/ConfiguredInstantiator.java

@@ -52,8 +52,8 @@ public ConfiguredInstantiator(Config conf) throws ConfigurationException {
       delegate = new KryoInstantiator();
     }
     else {
-      String[] parts = key.split(":");
-      if(parts.length != 1 && parts.length != 2) {
+      String[] parts = fastSplitKey(key);
+      if(parts == null) {
         throw new ConfigurationException("Invalid Config Key: " + conf.get(KEY));
       }
       KryoInstantiator reflected = null;
@@ -63,7 +63,7 @@ public ConfiguredInstantiator(Config conf) throws ConfigurationException {
       }
 
       if(parts.length == 2) {
-        delegate = deserialize(reflected.newKryo(), parts[1]);
+        delegate = fastDeserialize(reflected.newKryo(), parts[1]);
         if(null == delegate) {
           throw new ConfigurationException("Null delegate from: " + parts[1]);
         }
@@ -149,4 +149,44 @@ protected static String serialize(Kryo k, KryoInstantiator ki) {
     k.writeClassAndObject(out, ki);
     return Base64.encodeBytes(out.toBytes());
   }
+
+  /** Simple class to hold the cached copy of the latest kryo instantiator.
+   * As well as its corresponding base64 encoded data.
+   */
+  private static class CachedKryoInstantiator {
+    public final KryoInstantiator kryoInstantiator;
+    public final String base64Value;
+    public CachedKryoInstantiator(KryoInstantiator ki, String bv) {
+      kryoInstantiator = ki;
+      base64Value = bv;
+    }
+  }
+
+  private static CachedKryoInstantiator cachedKryoInstantiator = null;
+
+  private static synchronized KryoInstantiator fastDeserialize(Kryo k, String base64Value) throws ConfigurationException {
+    if(cachedKryoInstantiator == null || !cachedKryoInstantiator.base64Value.equals(base64Value)) {
+      cachedKryoInstantiator = new CachedKryoInstantiator(deserialize(k, base64Value), base64Value);
+    }
+    return cachedKryoInstantiator.kryoInstantiator;
+  }
+
+  /** Java's string split is very expensive due to regexes.
+   * Implement our own simple version instead.
+   */
+  public static String[] fastSplitKey(String key) {
+    int i = key.indexOf(':');
+    if(-1 == i) {
+      return new String[]{key};
+    }
+    else {
+      int j = key.indexOf(':', i+1);
+      if (-1 != j) {
+        return null;
+      }
+      else {
+        return new String[]{key.substring(0, i), key.substring(i+1)};
+      }
+    }
+  }
 }

chill-java/src/test/scala/com/twitter/chill/config/ConfiguredInstantiatorTest.scala

@@ -16,12 +16,15 @@ limitations under the License.
 
 package com.twitter.chill.config
 
+import org.scalacheck.Prop.forAll
+import org.scalacheck.Properties
 import org.scalatest._
 
 import com.twitter.chill._
 import com.esotericsoftware.kryo.Kryo
 
 class TestInst extends KryoInstantiator { override def newKryo = new Kryo }
+class TestInstTwo extends KryoInstantiator { override def newKryo = new Kryo }
 
 class ReflectingInstantiatorTest extends WordSpec with Matchers {
   "A ConfiguredInstantiator" should {
@@ -38,6 +41,23 @@ class ReflectingInstantiatorTest extends WordSpec with Matchers {
       val cci = new ConfiguredInstantiator(conf)
       // Here is the only assert:
       cci.getDelegate.getClass should equal(classOf[TestInst])
+      // Verify that caching is working:
+      val cci2 = new ConfiguredInstantiator(conf)
+      cci.getDelegate should equal(cci2.getDelegate)
+      // Set a new serialized and verify caching is still correct:
+      ConfiguredInstantiator.setSerialized(conf, new TestInstTwo)
+      val cci3 = new ConfiguredInstantiator(conf)
+      cci3.getDelegate.getClass should equal(classOf[TestInstTwo])
+      cci3.getDelegate should not equal (cci2.getDelegate)
+    }
+  }
+}
+
+object ConfiguredInstantiatorProperties extends Properties("ConfiguredInstantiator") {
+  property("properly split keys") = forAll { (str: String) =>
+    ConfiguredInstantiator.fastSplitKey(str) match {
+      case null => str.split(":").length > 2
+      case success => success.mkString(":") == str
     }
   }
 }

project/Build.scala

@@ -20,10 +20,10 @@ object ChillBuild extends Build {
 
   val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalariformSettings ++ Seq(
 
-    version := "0.5.1",
+    version := "0.5.2",
     organization := "com.twitter",
     scalaVersion := "2.10.4",
-    crossScalaVersions := Seq("2.10.4", "2.11.2"),
+    crossScalaVersions := Seq("2.10.4", "2.11.5"),
     scalacOptions ++= Seq("-unchecked", "-deprecation"),
     ScalariformKeys.preferences := formattingPreferences,
 
@@ -126,7 +126,7 @@ object ChillBuild extends Build {
       .filterNot(unreleasedModules.contains(_))
       .map { s =>
       val suffix = if (javaOnly.contains(s)) "" else "_2.10"
-      "com.twitter" % ("chill-" + s + suffix) % "0.5.1"
+      "com.twitter" % ("chill-" + s + suffix) % "0.5.2"
     }
 
   def module(name: String) = {
@@ -158,7 +158,7 @@ object ChillBuild extends Build {
 
   lazy val chillBijection = module("bijection").settings(
     libraryDependencies ++= Seq(
-      "com.twitter" %% "bijection-core" % "0.7.0"
+      "com.twitter" %% "bijection-core" % "0.7.2"
     )
   ).dependsOn(chill % "test->test;compile->compile")
 
@@ -226,14 +226,14 @@ object ChillBuild extends Build {
 
   lazy val chillAvro = module("avro").settings(
     libraryDependencies ++= Seq(
-      "com.twitter" %% "bijection-avro" % "0.7.0",
+      "com.twitter" %% "bijection-avro" % "0.7.2",
       "junit" % "junit" % "4.5" % "test"
     )
   ).dependsOn(chill,chillJava, chillBijection)
 
   lazy val chillAlgebird = module("algebird").settings(
     libraryDependencies ++= Seq(
-      "com.twitter" %% "algebird-core" % "0.8.0"
+      "com.twitter" %% "algebird-core" % "0.9.0"
     )
   ).dependsOn(chill)
 }