[finagle] Remove finagle-memcached

Problem

finagle-memcached is deprecated in favor of finagle-memacachedx.

Solution

Remove finagle-memcached.

RB_ID=694580

CHANGES

@@ -5,6 +5,11 @@
 6.x
 -----
 
+Deprecations
+~~~~~~~~~~~~
+
+  * finagle-memcached: Deprecated in favor of finagle-memcachedx and now removed.
+
 6.26.0
 ------
 

finagle-benchmark/src/main/scala/BUILD

@@ -4,7 +4,7 @@ scala_library(name='scala',
     '3rdparty/jvm/org/openjdk/jmh:jmh-core',
     '3rdparty/jvm/org/scala-lang:scala-library',
     'finagle/finagle-core',
-    'finagle/finagle-memcached',
+    'finagle/finagle-memcachedx',
     'finagle/finagle-ostrich4',
     'finagle/finagle-stats',
     'finagle/finagle-zipkin',

finagle-benchmark/src/main/scala/com/twitter/finagle/benchmark/ParserUtils.scala

@@ -4,8 +4,8 @@ import com.google.caliper.SimpleBenchmark
 import scala.util.Random
 import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
 import com.google.common.base.Charsets
-import com.twitter.finagle.memcached.util.ChannelBufferUtils._
-import com.twitter.finagle.memcached.util.ParserUtils
+import com.twitter.finagle.memcachedx.util.ChannelBufferUtils._
+import com.twitter.finagle.memcachedx.util.ParserUtils
 
 // From $BIRDCAGE_HOME run:
 // ./pants bench finagle/finagle-benchmark: --bench-target=com.twitter.finagle.benchmark.ParserUtils --bench-memory
@@ -20,15 +20,14 @@ class ParserUtils extends SimpleBenchmark {
     ChannelBuffers.copiedBuffer(rnd.nextString(5), Charsets.UTF_8)
   }
 
+  def matches(buffer: ChannelBuffer, string: String): Boolean =
+    buffer.toString(Charsets.UTF_8).matches(string)
+
   def timeDIGITS(nreps: Int) {
     var i = 0
     while (i < nreps) {
-      numbers foreach { cb =>
-        cb.matches(ParserUtils.DIGITS)
-      }
-      strings foreach { cb =>
-        cb.matches(ParserUtils.DIGITS)
-      }
+      numbers.foreach(matches(_, ParserUtils.DIGITS))
+      strings foreach(matches(_, ParserUtils.DIGITS))
       i += 1
     }
   }

finagle-example/src/main/scala/BUILD

@@ -10,7 +10,7 @@ scala_library(name='scala',
     'finagle/finagle-example/src/main/thrift:thrift-scala',
     'finagle/finagle-http',
     'finagle/finagle-kestrel',
-    'finagle/finagle-memcached',
+    'finagle/finagle-memcachedx',
     'finagle/finagle-mysql',
     'finagle/finagle-ostrich4',
     'finagle/finagle-redis',

finagle-example/src/main/scala/com/twitter/finagle/example/memcache/KetamaClientStress.scala

@@ -4,17 +4,18 @@ import com.twitter.app.Flag
 import com.twitter.app.App
 import com.twitter.conversions.time._
 import com.twitter.finagle.builder.{Cluster, ClientBuilder}
-import com.twitter.finagle.memcached
+import com.twitter.finagle.memcachedx
 import com.twitter.finagle.cacheresolver.{CacheNode, CachePoolCluster}
-import com.twitter.finagle.memcached.protocol.text.Memcached
-import com.twitter.finagle.memcached.replication._
-import com.twitter.finagle.memcached.PartitionedClient
+import com.twitter.finagle.memcachedx.protocol.text.Memcached
+import com.twitter.finagle.memcachedx.replication._
+import com.twitter.finagle.memcachedx.PartitionedClient
 import com.twitter.finagle.stats.OstrichStatsReceiver
 import com.twitter.finagle.util.DefaultTimer
+import com.twitter.io.Buf
 import com.twitter.ostrich.admin.{AdminHttpService, RuntimeEnvironment}
 import com.twitter.util._
 import java.util.concurrent.atomic.AtomicLong
-import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
+import scala.collection.mutable
 
 object KetamaClientStress extends App {
 
@@ -85,9 +86,11 @@ object KetamaClientStress extends App {
     println(builder)
 
     // the test keys/values
-    val keyValueSet: Seq[(String, ChannelBuffer)] = (1 to config.numkeys()).map { _ =>
-      (randomString(config.keysize()), ChannelBuffers.wrappedBuffer(randomString(config.valuesize()).getBytes)) }
-    def nextKeyValue: (String, ChannelBuffer) = keyValueSet((load_count.getAndIncrement()%config.numkeys()).toInt)
+    val keyValueSet: Seq[(String, Buf)] = List.fill(config.numkeys()) {
+      (randomString(config.keysize()), Buf.Utf8(randomString(config.valuesize())))
+    }
+
+    def nextKeyValue: (String, Buf) = keyValueSet((load_count.getAndIncrement()%config.numkeys()).toInt)
 
     // local admin service
     val runtime = RuntimeEnvironment(this, Array()/*no args for you*/)
@@ -101,7 +104,7 @@ object KetamaClientStress extends App {
     }
 
     if (replicaPool == null) {
-      val ketamaClient = memcached.KetamaClientBuilder()
+      val ketamaClient = memcachedx.KetamaClientBuilder()
           .clientBuilder(builder)
           .cachePoolCluster(primaryPool)
           .failureAccrualParams(Int.MaxValue, Duration.Top)
@@ -139,7 +142,7 @@ object KetamaClientStress extends App {
           }
         case "getsThenCas" =>
           keyValueSet.map { case (k, v) => ketamaClient.set(k, v)() }
-          val casMap: scala.collection.mutable.Map[String, (ChannelBuffer, ChannelBuffer)] = scala.collection.mutable.Map()
+          val casMap = mutable.Map.empty[String, (Buf, Buf)]
 
           () => {
             val (key, value) = nextKeyValue
@@ -152,10 +155,8 @@ object KetamaClientStress extends App {
             }
           }
         case "add" =>
-          val (key, value) = (randomString(config.keysize()), ChannelBuffers.wrappedBuffer(randomString(config.valuesize()).getBytes))
-          () => {
-            ketamaClient.add(key+load_count.getAndIncrement().toString, value)
-          }
+          val (key, value) = (randomString(config.keysize()), Buf.Utf8(randomString(config.valuesize())))
+          () => ketamaClient.add(key+load_count.getAndIncrement().toString, value)
         case "replace" =>
           keyValueSet foreach { case (k, v) => ketamaClient.set(k, v)() }
           () => {
@@ -225,7 +226,7 @@ object KetamaClientStress extends App {
           }
         case "getsAllThenCas" =>
           keyValueSet.map { case (k, v) => replicationClient.set(k, v)() }
-          val casMap: scala.collection.mutable.Map[String, ReplicationStatus[Option[(ChannelBuffer, ReplicaCasUnique)]]] = scala.collection.mutable.Map()
+          val casMap: scala.collection.mutable.Map[String, ReplicationStatus[Option[(Buf, ReplicaCasUnique)]]] = scala.collection.mutable.Map()
 
           () => {
             val (key, value) = nextKeyValue
@@ -245,7 +246,7 @@ object KetamaClientStress extends App {
             }
           }
         case "add" =>
-          val (key, value) = (randomString(config.keysize()), ChannelBuffers.wrappedBuffer(randomString(config.valuesize()).getBytes))
+          val (key, value) = (randomString(config.keysize()), Buf.Utf8(randomString(config.valuesize())))
           () => {
             replicationClient.add(key+load_count.getAndIncrement().toString, value)
           }

finagle-example/src/main/scala/com/twitter/finagle/example/memcache/MemcacheStress.scala

@@ -4,15 +4,15 @@ import com.twitter.app.Flag
 import com.twitter.app.App
 import com.twitter.concurrent.NamedPoolThreadFactory
 import com.twitter.finagle.builder.ClientBuilder
-import com.twitter.finagle.memcached
-import com.twitter.finagle.memcached.protocol.text.Memcached
+import com.twitter.finagle.memcachedx
+import com.twitter.finagle.memcachedx.protocol.text.Memcached
 import com.twitter.finagle.stats.OstrichStatsReceiver
 import com.twitter.finagle.{Service, ServiceFactory}
+import com.twitter.io.Buf
 import com.twitter.ostrich.admin.{RuntimeEnvironment, AdminHttpService}
 import com.twitter.util.{Future, Stopwatch}
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicLong
-import org.jboss.netty.buffer.{ChannelBuffer, ChannelBuffers}
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory
 
 class PersistentService[Req, Rep](factory: ServiceFactory[Req, Rep]) extends Service[Req, Rep] {
@@ -38,7 +38,7 @@ object MemcacheStress extends App {
   }
   val count = new AtomicLong
 
-  def proc(client: memcached.Client, key: String, value: ChannelBuffer) {
+  def proc(client: memcachedx.Client, key: String, value: Buf) {
     client.set(key, value) ensure {
       count.incrementAndGet()
       proc(client, key, value)
@@ -66,7 +66,7 @@ object MemcacheStress extends App {
     else                 com.twitter.finagle.tracing.Trace.disable()
 
     val key = "x" * config.keysize()
-    val value = ChannelBuffers.wrappedBuffer(("y" * config.valuesize()).getBytes)
+    val value = Buf.Utf8("y" * config.valuesize())
 
     val runtime = RuntimeEnvironment(this, Array()/*no args for you*/)
     val adminService = new AdminHttpService(2000, 100/*backlog*/, runtime)
@@ -78,7 +78,7 @@ object MemcacheStress extends App {
 
     for (_ <- 0 until config.concurrency()) {
       val svc = new PersistentService(factory)
-      val client = memcached.Client(svc)
+      val client = memcachedx.Client(svc)
       proc(client, key, value)
     }
 

finagle-example/src/main/scala/com/twitter/finagle/example/memcachedproxy/MemcachedProxy.scala

@@ -1,7 +1,7 @@
 package com.twitter.finagle.example.memcachedproxy
 
-import com.twitter.finagle.memcached.protocol.text.Memcached
-import com.twitter.finagle.memcached.protocol.{Command, Response}
+import com.twitter.finagle.memcachedx.protocol.text.Memcached
+import com.twitter.finagle.memcachedx.protocol.{Command, Response}
 import com.twitter.finagle.Service
 import com.twitter.finagle.builder.{Server, ClientBuilder, ServerBuilder}
 import java.net.{ConnectException, Socket, InetSocketAddress}