@@ -6,7 +6,7 @@ import org.apache.cassandra.{service => cassandra} import org.apache.cassandra.service.NotFoundException import java.util.{List => JavaList} -import scala.collection.jcl.{ArrayList, Conversions} +import scala.collection.jcl.{ArrayList, Conversions, Map => JavaMap} import scala.collection.immutable.ListMap /** @@ -57,6 +57,60 @@ trait Read[A, B, C] { this : Base[A, B, C] => def apply(path : ColumnPath[A, B]) = get(path) def apply(path : ColumnParent[A]) = get(path) + + /* Get multiple columns from StandardColumnFamily */ + def multiget(path : MultiPath[A, B]) : Map[String, Option[(B, C)]] = { + (ListMap() ++ multigetAny(path).map { case(k, v) => + (k, getColumn(v)) + }) + } + + /* Get multiple super columns from SuperColumnFamily */ + def multigetSuper(path : MultiPath[A, B]) : Map[String, Option[(A , Map[B, C])]] = { + (ListMap() ++ multigetAny(path).map { case(k, v) => + (k, getSuperColumn(v)) + }) + } + + private def multigetAny(path : MultiPath[A, B]) : JavaMap[String, cassandra.ColumnOrSuperColumn]= { + val p = new cassandra.ColumnPath( + path.columnFamily, + path.superColumn.map(superColumn.serialize(_)).getOrElse(null), + path.column.map(column.serialize(_)).getOrElse(null) + ) + JavaMap(client.multiget(keyspace, path.keys, p, consistency)) + } + + /* Get multiple records from StandardColumnFamily */ + def getAll(path : MultiPath[A, B]) : Map[String, Map[B, C]] = { + ListMap() ++ getAllAny(path).map { case(k, v) => + (k, ListMap(v.map(getColumn(_).get) : _*)) + } + } + + /* Get multiple records from SuperColumnFamily */ + def getAllSuper(path : MultiPath[A, B]) : Map[String, Map[A , Map[B, C]]] = { + ListMap() ++ getAllAny(path).map { case(k, v) => + (k, ListMap(v.map(getSuperColumn(_).get) : _*)) + } + } + + private def getAllAny(path : MultiPath[A, B]) : JavaMap[String, JavaList[cassandra.ColumnOrSuperColumn]]= { + val p = new cassandra.ColumnParent( + path.columnFamily, + path.superColumn.map(superColumn.serialize(_)).getOrElse(null) + ) + JavaMap( + client.multiget_slice( + keyspace, + path.keys, + p, + new SlicePredicate(serializer.NonSerializer)( + None, None, Ascending, maximumCount), + consistency + ) + ) + } /** * Get single column @@ -227,7 +281,7 @@ trait Read[A, B, C] { this : Base[A, B, C] => List[T]() ++ Conversions.convertList[T](list) } - implicit private def convertCollection[T](list : Collection[T]) : JavaList[T] = { + implicit private def convertCollection[T](list : Iterable[T]) : JavaList[T] = { (new ArrayList() ++ list).underlying } } src/main/scala/com/nodeta/scalandra/client/Read.scala @@ -142,6 +142,32 @@ object ClientTest extends Specification { } } + + "multiget" should { + for(i <- (0 until 5)) { + cassandra(ColumnParent[String]("Standard1", i.toString)) = jsmith + } + + "find all existing records" in { + val result = cassandra.multiget( + MultiPath[String, String]("Standard1", List("1", "3", "6"), None, Some("last")) + ) + + result("1") must beSomething + result("3") must beSomething + result("6") must beNone + result must not have the key("2") + } + + "find existing rows" in { + val result = cassandra.getAll( + MultiPath[String, String]("Standard1", List("1", "6")) + ) + + result("1") must haveSize(jsmith.size) + result("6") must beEmpty + } + } "order preservation" should { src/test/scala/com/nodeta/scalandra/ClientTest.scala ce0aeb20c127f5a5c35e3d43ac53cf6eb92cd6fe Ville Lautanala ville.lautanala@nodeta.fi http://github.com/nodeta/scalandra/commit/00621883de85d166216dcac06d37a70972af1760 00621883de85d166216dcac06d37a70972af1760 2009-11-10T10:27:40-08:00 2009-11-10T09:15:29-08:00 Implemented multiget and multiget_slice support to Client 841887015ba1b050960cc87566af7cd1b7f7c438 Ville Lautanala ville.lautanala@nodeta.fi