Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implementation of store that uses http protocol #241

Merged
merged 4 commits into from
Oct 21, 2014
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -292,4 +292,11 @@ object StorehausBuild extends Build {
javaOptions in run <++= (fullClasspath in Runtime) map { cp => Seq("-cp", sbt.Build.data(cp).mkString(":")) }
).dependsOn(storehausCore, storehausAlgebra, storehausCache)

lazy val storehausHttp = module("http").settings(
libraryDependencies ++= Seq(
Finagle.module("http")
)
).dependsOn(storehausCore)


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright 2014 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.storehaus.http

import java.nio.charset.Charset
import org.jboss.netty.buffer.{ ChannelBuffer, ChannelBuffers }
import org.jboss.netty.handler.codec.http.{ HttpRequest, HttpResponse, DefaultHttpRequest, HttpVersion, HttpMethod, HttpHeaders, HttpResponseStatus }
import com.twitter.util.Future
import com.twitter.finagle.{ Service, Http }
import com.twitter.storehaus.Store

object HttpException {
def apply(response: HttpResponse): HttpException =
new HttpException(response.getStatus.getCode, response.getStatus.getReasonPhrase, response.getContent.toString(Charset.forName("UTF-8")))
}

case class HttpException(code: Int, reasonPhrase: String, content: String) extends Exception(reasonPhrase + Option(content).map("\n" + _ ).getOrElse(""))

object HttpStore {
def apply(dest: String): HttpStore = new HttpStore(Http.newService(dest))
}

class HttpStore(val client: Service[HttpRequest, HttpResponse]) extends Store[String, ChannelBuffer] {
override def get(k: String): Future[Option[ChannelBuffer]] = {
val request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, k)
request.headers.set(HttpHeaders.Names.CONTENT_LENGTH, "0")
client(request).map{ response =>
response.getStatus match {
case HttpResponseStatus.OK => Some(response.getContent)
case HttpResponseStatus.NOT_FOUND => None
case _ => throw HttpException(response)
}
}
}

override def put(kv: (String, Option[ChannelBuffer])): Future[Unit] = {
val request = kv match {
case (k, Some(cb)) =>
val req = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, k)
req.setContent(cb)
req.headers.set(HttpHeaders.Names.CONTENT_LENGTH, cb.readableBytes.toString)
req
case (k, None) =>
val req = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.DELETE, k)
req.headers.set(HttpHeaders.Names.CONTENT_LENGTH, "0")
req
}
client(request).map{ response =>
response.getStatus match {
case HttpResponseStatus.OK => ()
case HttpResponseStatus.CREATED => ()
case HttpResponseStatus.NO_CONTENT => ()
case _ => throw HttpException(response)
}
}
}
}

object HttpStringStore {
def apply(dest: String): HttpStringStore = new HttpStringStore(Http.newService(dest))
}

class HttpStringStore(val client: Service[HttpRequest, HttpResponse]) extends Store[String, String] {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this one can be implemented as a ConvertedStore?
if you have an Injection[String, ChannelBuffer]

class HttpStringStore(store: HttpStore)
  extends ConvertedStore[String, String, ChannelBuffer, String](store)(identity)(inj)

private val store = new HttpStore(client)
private val utf8 = Charset.forName("UTF-8")

override def get(k: String): Future[Option[String]] = store.get(k).map(_.map(_.toString(utf8)))

override def put(kv: (String, Option[String])): Future[Unit] = store.put((
kv._1,
kv._2.map(s => ChannelBuffers.wrappedBuffer(s.getBytes(utf8)))
))
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
* Copyright 2014 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.storehaus.http

import java.util.concurrent.ConcurrentHashMap
import java.nio.charset.Charset
import org.jboss.netty.buffer.ChannelBuffers
import org.jboss.netty.handler.codec.http.{ HttpRequest, HttpResponse, DefaultHttpResponse, HttpResponseStatus, HttpMethod, HttpHeaders }
import com.twitter.util.{ Await, Future }
import com.twitter.finagle.{ Service, Http, ListeningServer }
import com.twitter.storehaus.{ FutureOps, Store }
import com.twitter.storehaus.testing.CloseableCleanup
import com.twitter.storehaus.testing.generator.NonEmpty
import org.scalacheck.{ Arbitrary, Gen, Properties }
import org.scalacheck.Prop._

object HttpStringStoreProperties extends Properties("HttpStringStore") with CloseableCleanup[ListeningServer] {
def validPairs: Gen[List[(String, Option[String])]] =
NonEmpty.Pairing.alphaStrs().map(_.map{ case (k, v) => ("/" + k, v) })

def baseTest[K: Arbitrary, V: Arbitrary : Equiv](store: Store[K, V], validPairs: Gen[List[(K, Option[V])]])
(put: (Store[K, V], List[(K, Option[V])]) => Unit) =
forAll(validPairs) { (examples: List[(K, Option[V])]) =>
put(store, examples)
examples.toMap.forall { case (k, optV) =>
val res = Await.result(store.get(k))
Equiv[Option[V]].equiv(res, optV)
}
}

def putStoreTest[K: Arbitrary, V: Arbitrary : Equiv](store: Store[K, V], validPairs: Gen[List[(K, Option[V])]]) =
baseTest(store, validPairs) { (s, pairs) =>
pairs.foreach {
case (k, v) =>
Await.result(s.put((k, v)))
}
}

def multiPutStoreTest[K: Arbitrary, V: Arbitrary : Equiv](store: Store[K, V], validPairs: Gen[List[(K, Option[V])]]) =
baseTest(store, validPairs) { (s, pairs) =>
Await.result(FutureOps.mapCollect(s.multiPut(pairs.toMap)))
}

def storeTest(store: Store[String, String]) =
putStoreTest(store, validPairs) && multiPutStoreTest(store, validPairs)

val service = new Service[HttpRequest, HttpResponse] {
private val map = new ConcurrentHashMap[String, String]()
private val utf8 = Charset.forName("UTF-8")

def apply(request: HttpRequest): Future[HttpResponse] = {
val response = request.getMethod match {
case HttpMethod.GET =>
Option(map.get(request.getUri)).map{ v =>
val resp = new DefaultHttpResponse(request.getProtocolVersion, HttpResponseStatus.OK)
val content = ChannelBuffers.wrappedBuffer(v.getBytes(utf8))
resp.setContent(content)
resp.headers.set(HttpHeaders.Names.CONTENT_LENGTH, content.readableBytes.toString)
resp
}.getOrElse {
val resp = new DefaultHttpResponse(request.getProtocolVersion, HttpResponseStatus.NOT_FOUND)
resp.headers.set(HttpHeaders.Names.CONTENT_LENGTH, "0")
resp
}
case HttpMethod.DELETE =>
map.remove(request.getUri)
val resp = new DefaultHttpResponse(request.getProtocolVersion, HttpResponseStatus.NO_CONTENT)
resp.headers.set(HttpHeaders.Names.CONTENT_LENGTH, "0")
resp
case HttpMethod.PUT =>
val maybeOldV = Option(map.put(request.getUri, request.getContent.toString(utf8)))
val resp = new DefaultHttpResponse(request.getProtocolVersion, maybeOldV.map(_ => HttpResponseStatus.OK).getOrElse(HttpResponseStatus.CREATED))
resp.setContent(request.getContent)
resp.headers.set(HttpHeaders.Names.CONTENT_LENGTH, request.getContent.readableBytes.toString)
resp
case _ =>
new DefaultHttpResponse(request.getProtocolVersion, HttpResponseStatus.METHOD_NOT_ALLOWED)
}
Future.value(response)
}
}

val server = Http.serve("localhost:0", service)

val store = HttpStringStore(server.boundAddress.toString.substring(1)) // i dont know how else to convert boundAddress into something usable

property("HttpStringStore test") = storeTest(store)

override def closeable = server

override def cleanup() = {
println("closing server")
super.cleanup()
}
}