Merge branch 'fix-finagle-tech' of github.com:mosesn/FrameworkBenchmarks into PR766

finagle/src/main/scala/com/falmarri/finagle/Finagle.scala

@@ -4,7 +4,6 @@ import scala.util.Random
 import scala.collection.immutable.StringOps
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import java.util.concurrent.Executors
 import com.twitter.finagle.Service
 import com.twitter.finagle.exp.Mysql
 import com.twitter.finagle.exp.mysql._
@@ -12,7 +11,7 @@ import org.jboss.netty.handler.codec.http._
 import org.jboss.netty.handler.codec.http.HttpResponseStatus._
 import org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1
 import org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer
-import com.twitter.util.{Future, FuturePool}
+import com.twitter.util.Future
 import java.net.InetSocketAddress
 import com.twitter.finagle.builder.{Server, ServerBuilder}
 import com.twitter.finagle.http.{Http,HttpMuxer}
@@ -36,8 +35,6 @@ object FinagleBenchmark extends App {
       .withDatabase(db)
       .newRichClient(host + ":3306")
 
-  val pool = FuturePool(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2))
-
   val mapper = new ObjectMapper()
   mapper.registerModule(DefaultScalaModule)
 
@@ -67,10 +64,10 @@ object FinagleBenchmark extends App {
 
   val muxService = new HttpMuxer()
     .withHandler("/json", new Service[HttpRequest, HttpResponse] {
-      def apply(req: HttpRequest): Future[HttpResponse] = pool {
-        createResponse(req, serialize(Map("message" -> "Hello, World!")))
-      }
+      def apply(req: HttpRequest): Future[HttpResponse] =
+        Future.value(createResponse(req, serialize(Map("message" -> "Hello, World!"))))
     })
+  /*
     .withHandler("/db", new Service[HttpRequest, HttpResponse] {
       val rand = new Random()
       val sql = "SELECT * FROM world WHERE id = "
@@ -97,6 +94,7 @@ object FinagleBenchmark extends App {
         }
       }
     })
+   */
 
   //Http.serve(new InetSocketAddress(8080), HttpMuxer)
   val server: Server = ServerBuilder()