Merge branch 'release/0.9.1'

Author: ianoc

CHANGES.md

@@ -1,5 +1,8 @@
 # Summingbird #
 
+## 0.9.1
+* Fixes a bug in the LTuple2 class. Add a test for it: https://github.com/twitter/summingbird/pull/632
+
 ## 0.9.0
 * Removing internal config setup from scalding platform: https://github.com/twitter/summingbird/pull/629
 * Remove store that no one seems to use and has no tests: https://github.com/twitter/summingbird/pull/630

README.md

@@ -108,7 +108,7 @@ Please feel free to use the beautiful [Summingbird logo](https://drive.google.co
 
 ## Maven
 
-Summingbird modules are published on maven central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.9.0`.
+Summingbird modules are published on maven central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.9.1`.
 
 Current published artifacts are
 

project/Build.scala

@@ -175,7 +175,7 @@ object SummingbirdBuild extends Build {
   def youngestForwardCompatible(subProj: String) =
     Some(subProj)
       .filterNot(unreleasedModules.contains(_))
-      .map { s => "com.twitter" % ("summingbird-" + s + "_2.10") % "0.8.0" }
+      .map { s => "com.twitter" % ("summingbird-" + s + "_2.10") % "0.9.0" }
 
   def module(name: String) = {
     val id = "summingbird-%s".format(name)

summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/batch/LTuple2Test.scala

@@ -0,0 +1,89 @@
+/*
+ Copyright 2013 Twitter, Inc.
+
+ 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.
+ */
+
+package com.twitter.summingbird.scalding.batch
+
+import cascading.flow.{ Flow, FlowDef }
+
+import com.twitter.algebird._
+import com.twitter.algebird.monad._
+import com.twitter.summingbird.batch._
+import com.twitter.summingbird.option.{ Commutative, NonCommutative, Commutativity }
+import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ }
+
+import org.scalacheck._
+import org.scalacheck.Prop._
+import org.scalacheck.Properties
+
+object LTuple2Properties extends Properties("LTuple2 Properties") {
+
+  property("When the contents equal then the LTuple2 equals") = {
+    forAll { (a1: Int, b1: Int, a2: Int, b2: Int) =>
+
+      val ltup1 = LTuple2(a1, b1)
+      val ltup2 = LTuple2(a2, b2)
+
+      if (a1 == a2 && b1 == b2)
+        ltup1 == ltup2
+      else
+        ltup1 != ltup2
+    }
+  }
+
+  property("Case of always equal values, should equal") = {
+    forAll { (a1: Int, b1: Int) =>
+
+      val ltup1 = LTuple2(a1, b1)
+      val ltup2 = LTuple2(a1, b1)
+
+      ltup1 == ltup2
+    }
+  }
+
+  property("Case of always equal values, should equal. Different types.") = {
+    forAll { (a1: Int, b1: String) =>
+
+      val ltup1 = LTuple2(a1, b1)
+      val ltup2 = LTuple2(a1, b1)
+
+      ltup1 == ltup2
+    }
+  }
+
+  property("things when tuple2 of different types equals then LTuple2 equals too") = {
+    forAll { (a1: Int, b1: String, a2: Int, b2: String) =>
+
+      val ltup1 = LTuple2(a1, b1)
+      val ltup2 = LTuple2(a2, b2)
+
+      if (a1 == a2 && b1 == b2)
+        ltup1 == ltup2
+      else
+        ltup1 != ltup2
+    }
+  }
+
+  property("Hash code of the LTuple2 is the same as a tuple2 would have been") = {
+    forAll { (a1: Int, b1: String) =>
+
+      val ltup1 = LTuple2(a1, b1)
+
+      val tup1 = (a1, b1)
+      tup1.hashCode == ltup1.hashCode
+    }
+  }
+
+}

summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedStore.scala

@@ -45,7 +45,7 @@ case class LTuple2[T, U](_1: T, _2: U) {
   override val hashCode: Int = scala.runtime.ScalaRunTime._hashCode(this)
 
   override def equals(other: Any): Boolean = other match {
-    case LTuple2(oT1, oT2) => hashCode == other.hashCode && _1 == oT2 && _2 == oT2
+    case LTuple2(oT1, oT2) => hashCode == other.hashCode && _1 == oT1 && _2 == oT2
     case _ => false
   }
 

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.9.0"
+version in ThisBuild := "0.9.1"