finagle-cacheresolver: merge contents back into finagle-memcached and…

… rm package

Problem

Finagle-cacheresolver was a transitional bandaid for when we had two
finagle-memcached packages. Since we no longer have two implementations
we don't need a standalone package.

Solution

Move finagle-cacheresolver contents into finagle-memcached.

RB_ID=833602
TBR=true

CHANGES

@@ -18,6 +18,9 @@ Breaking API Changes
   * finagle: Finagle is no longer depending on Twitter's clone of JSR166e, JDK 8
     API is used instead. ``RB_ID=833652``
 
+  * finagle-cacheresolver: package contents merged into finagle-memcached.
+    ``RB_ID=833602``
+
   * finagle-core: Renamed DeadlineFilter to DeadlineStatsFilter, which now only
     records stats for the number of requests with exceeded deadlines, the
     remaining deadline budget, and the transit latency of requests. It no longer

finagle-example/src/main/scala/BUILD

@@ -5,7 +5,6 @@ scala_library(name='scala',
     repo = artifactory,
   ),
   dependencies=[
-    'finagle/finagle-cacheresolver',
     'finagle/finagle-core',
     'finagle/finagle-example/src/main/thrift:thrift-scala',
     'finagle/finagle-http',

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

@@ -5,7 +5,7 @@ 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.cacheresolver.{CacheNode, CachePoolCluster}
+import com.twitter.finagle.memcached.{CacheNode, CachePoolCluster}
 import com.twitter.finagle.memcached.protocol.text.Memcached
 import com.twitter.finagle.memcached.replication._
 import com.twitter.finagle.memcached.PartitionedClient

finagle-cacheresolver/src/main/java/com/twitter/finagle/cacheresolver/java/CachePoolClusterUtil.java → finagle-memcached/src/main/java/com/twitter/finagle/memcached/java/CachePoolClusterUtil.java

@@ -1,13 +1,13 @@
-package com.twitter.finagle.cacheresolver.java;
+package com.twitter.finagle.memcached.java;
 
 import java.util.Collections;
 import java.util.Set;
 
 import scala.collection.JavaConversions;
 
 import com.twitter.common.zookeeper.ZooKeeperClient;
-import com.twitter.finagle.cacheresolver.CacheNode;
-import com.twitter.finagle.cacheresolver.CachePoolCluster$;
+import com.twitter.finagle.memcached.CacheNode;
+import com.twitter.finagle.memcached.CachePoolCluster$;
 import com.twitter.finagle.stats.NullStatsReceiver;
 import com.twitter.finagle.stats.StatsReceiver;
 
@@ -24,7 +24,7 @@ private CachePoolClusterUtil() { }
    * @param cacheNodeSet static set of cache nodes to construct the cluster
    * @return a scala CachePoolCluster
    */
-  public static com.twitter.finagle.cacheresolver.CachePoolCluster newStaticCluster(
+  public static com.twitter.finagle.memcached.CachePoolCluster newStaticCluster(
       Set<CacheNode> cacheNodeSet) {
     scala.collection.immutable.Set<CacheNode> staticSet =
         JavaConversions.asScalaSet(cacheNodeSet).toSet();
@@ -45,7 +45,7 @@ public static com.twitter.finagle.cacheresolver.CachePoolCluster newStaticCluste
    * @param statsReceiver the destination to report the stats to
    * @return a scala CachePoolCluster
    */
-  public static com.twitter.finagle.cacheresolver.CachePoolCluster newZkCluster(
+  public static com.twitter.finagle.memcached.CachePoolCluster newZkCluster(
       String zkPath,
       ZooKeeperClient zkClient,
       Set<CacheNode> backupPool,
@@ -81,7 +81,7 @@ public static com.twitter.finagle.builder.Cluster<CacheNode> newUnmanagedZkClust
    *                   null and empty backup pool means the same as no backup pool.
    * @return a scala CachePoolCluster
    */
-  public static com.twitter.finagle.cacheresolver.CachePoolCluster newZkCluster(
+  public static com.twitter.finagle.memcached.CachePoolCluster newZkCluster(
       String zkPath,
       ZooKeeperClient zkClient,
       Set<CacheNode> backupPool) {
@@ -97,7 +97,7 @@ public static com.twitter.finagle.cacheresolver.CachePoolCluster newZkCluster(
    * @param zkClient zookeeper client to read zookeeper
    * @return a scala CachePoolCluster
    */
-  public static com.twitter.finagle.cacheresolver.CachePoolCluster newZkCluster(
+  public static com.twitter.finagle.memcached.CachePoolCluster newZkCluster(
       String zkPath,
       ZooKeeperClient zkClient) {
     return newZkCluster(zkPath, zkClient, Collections.<CacheNode>emptySet());

finagle-memcached/src/main/java/com/twitter/finagle/memcached/java/ClientTest.java

@@ -6,9 +6,8 @@
 
 import com.twitter.finagle.Service;
 import com.twitter.finagle.builder.ClientBuilder;
-import com.twitter.finagle.cacheresolver.CacheNode;
-import com.twitter.finagle.cacheresolver.CachePoolCluster;
-import com.twitter.finagle.cacheresolver.java.CachePoolClusterUtil;
+import com.twitter.finagle.memcached.CacheNode;
+import com.twitter.finagle.memcached.CachePoolCluster;
 import com.twitter.finagle.memcached.KetamaClientBuilder;
 import com.twitter.finagle.memcached.protocol.Command;
 import com.twitter.finagle.memcached.protocol.Response;

finagle-memcached/src/main/resources/META-INF/services/com.twitter.finagle.Resolver

@@ -0,0 +1 @@
+com.twitter.finagle.memcached.TwitterCacheResolver

finagle-memcached/src/main/scala/BUILD

@@ -17,11 +17,11 @@ scala_library(name='scala',
     '3rdparty/jvm/org/apache/zookeeper:zookeeper-client',
     '3rdparty/jvm/com/google/code/gson',
     '3rdparty/jvm/io/netty',
-    'finagle/finagle-cacheresolver',
     'finagle/finagle-core',
     'finagle/finagle-serversets',
     'util/util-core',
     'util/util-hashing',
-  ],
-  sources=rglobs('*.scala')
+  ], 
+  sources=rglobs('*.scala'), 
+  resources=['finagle/finagle-memcached/src/main/resources']
 )

finagle-memcached/src/main/scala/com/twitter/finagle/Memcached.scala

@@ -4,7 +4,6 @@ import _root_.java.net.SocketAddress
 import com.twitter.concurrent.Broker
 import com.twitter.conversions.time._
 import com.twitter.finagle
-import com.twitter.finagle.cacheresolver.{CacheNode, CacheNodeGroup}
 import com.twitter.finagle.client.{ClientRegistry, DefaultPool, StackClient, StdStackClient, Transporter}
 import com.twitter.finagle.dispatch.{GenSerialClientDispatcher, SerialServerDispatcher, PipeliningDispatcher}
 import com.twitter.finagle.loadbalancer.{Balancers, ConcurrentLoadBalancerFactory, LoadBalancerFactory}

finagle-cacheresolver/src/main/scala/com/twitter/finagle/cacheresolver/CacheNodeMetadata.scala → finagle-memcached/src/main/scala/com/twitter/finagle/memcached/CacheNodeMetadata.scala

@@ -1,4 +1,4 @@
-package com.twitter.finagle.cacheresolver
+package com.twitter.finagle.memcached
 
 import com.twitter.finagle.Addr
 
@@ -7,20 +7,20 @@ import com.twitter.finagle.Addr
  * [[com.twitter.finagle.memcached.KetamaPartitionedClient]]).
  *
  * This class and its companion object are private because they are only an implementation detail for
- * converting between [[com.twitter.finagle.cacheresolver.CacheNode]] and
+ * converting between [[com.twitter.finagle.memcached.CacheNode]] and
  * [[com.twitter.finagle.Address]]. We need to convert between these types for backwards
  * compatibility: [[com.twitter.finagle.memcached.KetamaPartitionedClient]] consumes
- * [[com.twitter.finagle.cacheresolver.CacheNode]]s but [[com.twitter.finagle.Resolver]]s return
+ * [[com.twitter.finagle.memcached.CacheNode]]s but [[com.twitter.finagle.Resolver]]s return
  * [[com.twitter.finagle.Address]]s.
  *
  * @param weight The weight of the cache node. Default value is 1. Note that this determines where
  * data is stored in the Ketama ring and is not interchangable with the notion of weight in
  * [[com.twitter.finagle.addr.WeightedAddress]], which pertains to load balancing.
  * @param key An optional unique identifier for the cache node (e.g.  shard ID).
  */
-private[cacheresolver] case class CacheNodeMetadata(weight: Int, key: Option[String])
+private[memcached] case class CacheNodeMetadata(weight: Int, key: Option[String])
 
-private[cacheresolver] object CacheNodeMetadata {
+private[memcached] object CacheNodeMetadata {
   private val key = "cache_node_metadata"
 
   /**