use the converter to make a sane data structure

jamesgolick · Mar 18, 2010 · 94dc0d2 · 94dc0d2
1 parent 1f4e09a
commit 94dc0d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/main/scala/Cassandra.scala b/src/main/scala/Cassandra.scala
@@ -39,15 +39,16 @@ class Cassandra(val keyspace: String,
   }
 
   def get(columnFamily: String, key: String,
-          reversed: Boolean, limit: Int): JList[KeySlice] = {
+          reversed: Boolean, limit: Int): Map[Array[Byte], Array[Byte]] = {
     val parent    = converter.makeColumnParent(columnFamily)
     val predicate = converter.makeSlicePredicate(reversed, limit)
     val keyRange  = converter.makeKeyRange(key)
+    val list      = client.get_range_slices(keyspace, parent, predicate, keyRange, 1)
 
-    client.get_range_slices(keyspace, parent, predicate, keyRange, 1)
+    converter.toMap(list)
   }
 
-  def get(columnFamily: String, key: String): JList[KeySlice] = {
+  def get(columnFamily: String, key: String): Map[Array[Byte], Array[Byte]] = {
     get(columnFamily, key, false, 100)
   }
 }
diff --git a/src/test/scala/CassandraSpec.scala b/src/test/scala/CassandraSpec.scala
@@ -10,6 +10,7 @@ import java.util.{List => JList}
 import org.apache.cassandra.thrift.{Cassandra => TCassandra}
 import org.apache.cassandra.thrift.ColumnParent
 import org.apache.cassandra.thrift.KeyRange
+import org.apache.cassandra.thrift.KeySlice
 import org.apache.cassandra.thrift.{Mutation => TMutation}
 import org.apache.cassandra.thrift.SlicePredicate
 
@@ -35,31 +36,44 @@ object CassandraSpec extends Specification with Mockito {
     val columnParent   = mock[ColumnParent]
     val slicePredicate = mock[SlicePredicate]
     val keyRange       = mock[KeyRange]
+    val keySlices      = mock[JList[KeySlice]]
+    val map            = mock[Map[Array[Byte], Array[Byte]]]
+
+    client.get_range_slices(keyspace, columnParent, slicePredicate, keyRange, 1) returns keySlices
+    converter.toMap(keySlices) returns map
 
     "with all the options specified" in {
       converter.makeColumnParent("Users") returns columnParent
       converter.makeSlicePredicate(false, 10) returns slicePredicate
       converter.makeKeyRange("1") returns keyRange
 
-      cassandra.get("Users", "1", false, 10)
+      val returned = cassandra.get("Users", "1", false, 10)
 
       "converts to thrift data types and queries thrift" in {
         client.get_range_slices(keyspace, columnParent,
           slicePredicate, keyRange, 1) was called
       }
+
+      "returns the converted map" in {
+        returned must_== map
+      }
     }
 
     "with only the cf and key specified" in {
       converter.makeColumnParent("Users") returns columnParent
       converter.makeSlicePredicate(false, 100) returns slicePredicate
       converter.makeKeyRange("1") returns keyRange
 
-      cassandra.get("Users", "1")
+      val returned = cassandra.get("Users", "1")
 
       "converts to thrift data types and queries thrift" in {
         client.get_range_slices(keyspace, columnParent,
           slicePredicate, keyRange, 1) was called
       }
+
+      "returns the converted map" in {
+        returned must_== map
+      }
     }
   }
 }