You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2014/05/29 23:17:51 UTC

[1/3] node cache support

Repository: curator
Updated Branches:
  refs/heads/curator-rpc 6f9a9ab4f -> 985c9ed00


http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/test/java/org/apache/curator/generated/NodeCacheProjection.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/NodeCacheProjection.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/NodeCacheProjection.java
new file mode 100644
index 0000000..083b936
--- /dev/null
+++ b/curator-x-rpc/src/test/java/org/apache/curator/generated/NodeCacheProjection.java
@@ -0,0 +1,393 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.curator.generated;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NodeCacheProjection implements org.apache.thrift.TBase<NodeCacheProjection, NodeCacheProjection._Fields>, java.io.Serializable, Cloneable, Comparable<NodeCacheProjection> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeCacheProjection");
+
+  private static final org.apache.thrift.protocol.TField PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("projection", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new NodeCacheProjectionStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new NodeCacheProjectionTupleSchemeFactory());
+  }
+
+  public GenericProjection projection; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    PROJECTION((short)1, "projection");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // PROJECTION
+          return PROJECTION;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("projection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GenericProjection.class)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NodeCacheProjection.class, metaDataMap);
+  }
+
+  public NodeCacheProjection() {
+  }
+
+  public NodeCacheProjection(
+    GenericProjection projection)
+  {
+    this();
+    this.projection = projection;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public NodeCacheProjection(NodeCacheProjection other) {
+    if (other.isSetProjection()) {
+      this.projection = new GenericProjection(other.projection);
+    }
+  }
+
+  public NodeCacheProjection deepCopy() {
+    return new NodeCacheProjection(this);
+  }
+
+  @Override
+  public void clear() {
+    this.projection = null;
+  }
+
+  public GenericProjection getProjection() {
+    return this.projection;
+  }
+
+  public NodeCacheProjection setProjection(GenericProjection projection) {
+    this.projection = projection;
+    return this;
+  }
+
+  public void unsetProjection() {
+    this.projection = null;
+  }
+
+  /** Returns true if field projection is set (has been assigned a value) and false otherwise */
+  public boolean isSetProjection() {
+    return this.projection != null;
+  }
+
+  public void setProjectionIsSet(boolean value) {
+    if (!value) {
+      this.projection = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case PROJECTION:
+      if (value == null) {
+        unsetProjection();
+      } else {
+        setProjection((GenericProjection)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case PROJECTION:
+      return getProjection();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case PROJECTION:
+      return isSetProjection();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof NodeCacheProjection)
+      return this.equals((NodeCacheProjection)that);
+    return false;
+  }
+
+  public boolean equals(NodeCacheProjection that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_projection = true && this.isSetProjection();
+    boolean that_present_projection = true && that.isSetProjection();
+    if (this_present_projection || that_present_projection) {
+      if (!(this_present_projection && that_present_projection))
+        return false;
+      if (!this.projection.equals(that.projection))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  @Override
+  public int compareTo(NodeCacheProjection other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+
+    lastComparison = Boolean.valueOf(isSetProjection()).compareTo(other.isSetProjection());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetProjection()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projection, other.projection);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("NodeCacheProjection(");
+    boolean first = true;
+
+    sb.append("projection:");
+    if (this.projection == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.projection);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+    if (projection != null) {
+      projection.validate();
+    }
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class NodeCacheProjectionStandardSchemeFactory implements SchemeFactory {
+    public NodeCacheProjectionStandardScheme getScheme() {
+      return new NodeCacheProjectionStandardScheme();
+    }
+  }
+
+  private static class NodeCacheProjectionStandardScheme extends StandardScheme<NodeCacheProjection> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, NodeCacheProjection struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // PROJECTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.projection = new GenericProjection();
+              struct.projection.read(iprot);
+              struct.setProjectionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, NodeCacheProjection struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.projection != null) {
+        oprot.writeFieldBegin(PROJECTION_FIELD_DESC);
+        struct.projection.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class NodeCacheProjectionTupleSchemeFactory implements SchemeFactory {
+    public NodeCacheProjectionTupleScheme getScheme() {
+      return new NodeCacheProjectionTupleScheme();
+    }
+  }
+
+  private static class NodeCacheProjectionTupleScheme extends TupleScheme<NodeCacheProjection> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, NodeCacheProjection struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetProjection()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetProjection()) {
+        struct.projection.write(oprot);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, NodeCacheProjection struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        struct.projection = new GenericProjection();
+        struct.projection.read(iprot);
+        struct.setProjectionIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java
index a1c07bd..2ca6e69 100644
--- a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java
+++ b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java
@@ -76,6 +76,10 @@ public class TestClient
 
         PathChildrenCacheProjection pathChildrenCacheProjection = client.startPathChildrenCache(curatorProjection, "/a/b", true, false, PathChildrenCacheStartMode.BUILD_INITIAL_CACHE);
 
+        NodeCacheProjection nodeCache = client.startNodeCache(curatorProjection, "/a/b/c", false, true);
+        ChildData nodeCacheData = client.getNodeCacheData(curatorProjection, nodeCache);
+        System.out.println("nodeCacheData: " + nodeCacheData);
+
         List<ChildData> pathChildrenCacheData = client.getPathChildrenCacheData(curatorProjection, pathChildrenCacheProjection);
         System.out.println("Child data: " + pathChildrenCacheData);
 
@@ -119,5 +123,8 @@ public class TestClient
 
         pathChildrenCacheData = client.getPathChildrenCacheData(curatorProjection, pathChildrenCacheProjection);
         System.out.println("Child data: " + pathChildrenCacheData);
+
+        nodeCacheData = client.getNodeCacheData(curatorProjection, nodeCache);
+        System.out.println("nodeCacheData: " + nodeCacheData);
     }
 }


[2/3] node cache support

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
index 8936004..da9ae2c 100644
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
+++ b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
@@ -54,6 +54,8 @@ public class CuratorService {
 
     public List<Participant> getLeaderParticipants(CuratorProjection projection, LeaderProjection leaderProjection) throws org.apache.thrift.TException;
 
+    public ChildData getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection) throws org.apache.thrift.TException;
+
     public List<ChildData> getPathChildrenCacheData(CuratorProjection projection, PathChildrenCacheProjection cacheProjection) throws org.apache.thrift.TException;
 
     public ChildData getPathChildrenCacheDataForPath(CuratorProjection projection, PathChildrenCacheProjection cacheProjection, String path) throws org.apache.thrift.TException;
@@ -66,6 +68,8 @@ public class CuratorService {
 
     public LeaderResult startLeaderSelector(CuratorProjection projection, String path, String participantId, int waitForLeadershipMs) throws org.apache.thrift.TException;
 
+    public NodeCacheProjection startNodeCache(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial) throws org.apache.thrift.TException;
+
     public PathChildrenCacheProjection startPathChildrenCache(CuratorProjection projection, String path, boolean cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode) throws org.apache.thrift.TException;
 
   }
@@ -90,6 +94,8 @@ public class CuratorService {
 
     public void getLeaderParticipants(CuratorProjection projection, LeaderProjection leaderProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void getPathChildrenCacheData(CuratorProjection projection, PathChildrenCacheProjection cacheProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getPathChildrenCacheDataForPath(CuratorProjection projection, PathChildrenCacheProjection cacheProjection, String path, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -102,6 +108,8 @@ public class CuratorService {
 
     public void startLeaderSelector(CuratorProjection projection, String path, String participantId, int waitForLeadershipMs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void startNodeCache(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void startPathChildrenCache(CuratorProjection projection, String path, boolean cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
   }
@@ -336,6 +344,30 @@ public class CuratorService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLeaderParticipants failed: unknown result");
     }
 
+    public ChildData getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection) throws org.apache.thrift.TException
+    {
+      send_getNodeCacheData(projection, cacheProjection);
+      return recv_getNodeCacheData();
+    }
+
+    public void send_getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection) throws org.apache.thrift.TException
+    {
+      getNodeCacheData_args args = new getNodeCacheData_args();
+      args.setProjection(projection);
+      args.setCacheProjection(cacheProjection);
+      sendBase("getNodeCacheData", args);
+    }
+
+    public ChildData recv_getNodeCacheData() throws org.apache.thrift.TException
+    {
+      getNodeCacheData_result result = new getNodeCacheData_result();
+      receiveBase(result, "getNodeCacheData");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getNodeCacheData failed: unknown result");
+    }
+
     public List<ChildData> getPathChildrenCacheData(CuratorProjection projection, PathChildrenCacheProjection cacheProjection) throws org.apache.thrift.TException
     {
       send_getPathChildrenCacheData(projection, cacheProjection);
@@ -482,6 +514,32 @@ public class CuratorService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startLeaderSelector failed: unknown result");
     }
 
+    public NodeCacheProjection startNodeCache(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial) throws org.apache.thrift.TException
+    {
+      send_startNodeCache(projection, path, dataIsCompressed, buildInitial);
+      return recv_startNodeCache();
+    }
+
+    public void send_startNodeCache(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial) throws org.apache.thrift.TException
+    {
+      startNodeCache_args args = new startNodeCache_args();
+      args.setProjection(projection);
+      args.setPath(path);
+      args.setDataIsCompressed(dataIsCompressed);
+      args.setBuildInitial(buildInitial);
+      sendBase("startNodeCache", args);
+    }
+
+    public NodeCacheProjection recv_startNodeCache() throws org.apache.thrift.TException
+    {
+      startNodeCache_result result = new startNodeCache_result();
+      receiveBase(result, "startNodeCache");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startNodeCache failed: unknown result");
+    }
+
     public PathChildrenCacheProjection startPathChildrenCache(CuratorProjection projection, String path, boolean cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode) throws org.apache.thrift.TException
     {
       send_startPathChildrenCache(projection, path, cacheData, dataIsCompressed, startMode);
@@ -842,6 +900,41 @@ public class CuratorService {
       }
     }
 
+    public void getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getNodeCacheData_call method_call = new getNodeCacheData_call(projection, cacheProjection, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getNodeCacheData_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private CuratorProjection projection;
+      private NodeCacheProjection cacheProjection;
+      public getNodeCacheData_call(CuratorProjection projection, NodeCacheProjection cacheProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.projection = projection;
+        this.cacheProjection = cacheProjection;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getNodeCacheData", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getNodeCacheData_args args = new getNodeCacheData_args();
+        args.setProjection(projection);
+        args.setCacheProjection(cacheProjection);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ChildData getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getNodeCacheData();
+      }
+    }
+
     public void getPathChildrenCacheData(CuratorProjection projection, PathChildrenCacheProjection cacheProjection, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getPathChildrenCacheData_call method_call = new getPathChildrenCacheData_call(projection, cacheProjection, resultHandler, this, ___protocolFactory, ___transport);
@@ -1058,6 +1151,47 @@ public class CuratorService {
       }
     }
 
+    public void startNodeCache(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      startNodeCache_call method_call = new startNodeCache_call(projection, path, dataIsCompressed, buildInitial, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class startNodeCache_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private CuratorProjection projection;
+      private String path;
+      private boolean dataIsCompressed;
+      private boolean buildInitial;
+      public startNodeCache_call(CuratorProjection projection, String path, boolean dataIsCompressed, boolean buildInitial, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.projection = projection;
+        this.path = path;
+        this.dataIsCompressed = dataIsCompressed;
+        this.buildInitial = buildInitial;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("startNodeCache", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        startNodeCache_args args = new startNodeCache_args();
+        args.setProjection(projection);
+        args.setPath(path);
+        args.setDataIsCompressed(dataIsCompressed);
+        args.setBuildInitial(buildInitial);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public NodeCacheProjection getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_startNodeCache();
+      }
+    }
+
     public void startPathChildrenCache(CuratorProjection projection, String path, boolean cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       startPathChildrenCache_call method_call = new startPathChildrenCache_call(projection, path, cacheData, dataIsCompressed, startMode, resultHandler, this, ___protocolFactory, ___transport);
@@ -1124,12 +1258,14 @@ public class CuratorService {
       processMap.put("getChildren", new getChildren());
       processMap.put("getData", new getData());
       processMap.put("getLeaderParticipants", new getLeaderParticipants());
+      processMap.put("getNodeCacheData", new getNodeCacheData());
       processMap.put("getPathChildrenCacheData", new getPathChildrenCacheData());
       processMap.put("getPathChildrenCacheDataForPath", new getPathChildrenCacheDataForPath());
       processMap.put("isLeader", new isLeader());
       processMap.put("newCuratorProjection", new newCuratorProjection());
       processMap.put("setData", new setData());
       processMap.put("startLeaderSelector", new startLeaderSelector());
+      processMap.put("startNodeCache", new startNodeCache());
       processMap.put("startPathChildrenCache", new startPathChildrenCache());
       return processMap;
     }
@@ -1315,6 +1451,26 @@ public class CuratorService {
       }
     }
 
+    public static class getNodeCacheData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNodeCacheData_args> {
+      public getNodeCacheData() {
+        super("getNodeCacheData");
+      }
+
+      public getNodeCacheData_args getEmptyArgsInstance() {
+        return new getNodeCacheData_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getNodeCacheData_result getResult(I iface, getNodeCacheData_args args) throws org.apache.thrift.TException {
+        getNodeCacheData_result result = new getNodeCacheData_result();
+        result.success = iface.getNodeCacheData(args.projection, args.cacheProjection);
+        return result;
+      }
+    }
+
     public static class getPathChildrenCacheData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getPathChildrenCacheData_args> {
       public getPathChildrenCacheData() {
         super("getPathChildrenCacheData");
@@ -1436,6 +1592,26 @@ public class CuratorService {
       }
     }
 
+    public static class startNodeCache<I extends Iface> extends org.apache.thrift.ProcessFunction<I, startNodeCache_args> {
+      public startNodeCache() {
+        super("startNodeCache");
+      }
+
+      public startNodeCache_args getEmptyArgsInstance() {
+        return new startNodeCache_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public startNodeCache_result getResult(I iface, startNodeCache_args args) throws org.apache.thrift.TException {
+        startNodeCache_result result = new startNodeCache_result();
+        result.success = iface.startNodeCache(args.projection, args.path, args.dataIsCompressed, args.buildInitial);
+        return result;
+      }
+    }
+
     public static class startPathChildrenCache<I extends Iface> extends org.apache.thrift.ProcessFunction<I, startPathChildrenCache_args> {
       public startPathChildrenCache() {
         super("startPathChildrenCache");
@@ -1478,12 +1654,14 @@ public class CuratorService {
       processMap.put("getChildren", new getChildren());
       processMap.put("getData", new getData());
       processMap.put("getLeaderParticipants", new getLeaderParticipants());
+      processMap.put("getNodeCacheData", new getNodeCacheData());
       processMap.put("getPathChildrenCacheData", new getPathChildrenCacheData());
       processMap.put("getPathChildrenCacheDataForPath", new getPathChildrenCacheDataForPath());
       processMap.put("isLeader", new isLeader());
       processMap.put("newCuratorProjection", new newCuratorProjection());
       processMap.put("setData", new setData());
       processMap.put("startLeaderSelector", new startLeaderSelector());
+      processMap.put("startNodeCache", new startNodeCache());
       processMap.put("startPathChildrenCache", new startPathChildrenCache());
       return processMap;
     }
@@ -1946,6 +2124,57 @@ public class CuratorService {
       }
     }
 
+    public static class getNodeCacheData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getNodeCacheData_args, ChildData> {
+      public getNodeCacheData() {
+        super("getNodeCacheData");
+      }
+
+      public getNodeCacheData_args getEmptyArgsInstance() {
+        return new getNodeCacheData_args();
+      }
+
+      public AsyncMethodCallback<ChildData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<ChildData>() { 
+          public void onComplete(ChildData o) {
+            getNodeCacheData_result result = new getNodeCacheData_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getNodeCacheData_result result = new getNodeCacheData_result();
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, getNodeCacheData_args args, org.apache.thrift.async.AsyncMethodCallback<ChildData> resultHandler) throws TException {
+        iface.getNodeCacheData(args.projection, args.cacheProjection,resultHandler);
+      }
+    }
+
     public static class getPathChildrenCacheData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getPathChildrenCacheData_args, List<ChildData>> {
       public getPathChildrenCacheData() {
         super("getPathChildrenCacheData");
@@ -2253,6 +2482,57 @@ public class CuratorService {
       }
     }
 
+    public static class startNodeCache<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startNodeCache_args, NodeCacheProjection> {
+      public startNodeCache() {
+        super("startNodeCache");
+      }
+
+      public startNodeCache_args getEmptyArgsInstance() {
+        return new startNodeCache_args();
+      }
+
+      public AsyncMethodCallback<NodeCacheProjection> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<NodeCacheProjection>() { 
+          public void onComplete(NodeCacheProjection o) {
+            startNodeCache_result result = new startNodeCache_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            startNodeCache_result result = new startNodeCache_result();
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, startNodeCache_args args, org.apache.thrift.async.AsyncMethodCallback<NodeCacheProjection> resultHandler) throws TException {
+        iface.startNodeCache(args.projection, args.path, args.dataIsCompressed, args.buildInitial,resultHandler);
+      }
+    }
+
     public static class startPathChildrenCache<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startPathChildrenCache_args, PathChildrenCacheProjection> {
       public startPathChildrenCache() {
         super("startPathChildrenCache");
@@ -9525,20 +9805,20 @@ public class CuratorService {
 
   }
 
-  public static class getPathChildrenCacheData_args implements org.apache.thrift.TBase<getPathChildrenCacheData_args, getPathChildrenCacheData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheData_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheData_args");
+  public static class getNodeCacheData_args implements org.apache.thrift.TBase<getNodeCacheData_args, getNodeCacheData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getNodeCacheData_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNodeCacheData_args");
 
     private static final org.apache.thrift.protocol.TField PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("projection", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CACHE_PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("cacheProjection", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getPathChildrenCacheData_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPathChildrenCacheData_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getNodeCacheData_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getNodeCacheData_argsTupleSchemeFactory());
     }
 
     public CuratorProjection projection; // required
-    public PathChildrenCacheProjection cacheProjection; // required
+    public NodeCacheProjection cacheProjection; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -9608,17 +9888,17 @@ public class CuratorService {
       tmpMap.put(_Fields.PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("projection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CuratorProjection.class)));
       tmpMap.put(_Fields.CACHE_PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("cacheProjection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PathChildrenCacheProjection.class)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeCacheProjection.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheData_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNodeCacheData_args.class, metaDataMap);
     }
 
-    public getPathChildrenCacheData_args() {
+    public getNodeCacheData_args() {
     }
 
-    public getPathChildrenCacheData_args(
+    public getNodeCacheData_args(
       CuratorProjection projection,
-      PathChildrenCacheProjection cacheProjection)
+      NodeCacheProjection cacheProjection)
     {
       this();
       this.projection = projection;
@@ -9628,17 +9908,17 @@ public class CuratorService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getPathChildrenCacheData_args(getPathChildrenCacheData_args other) {
+    public getNodeCacheData_args(getNodeCacheData_args other) {
       if (other.isSetProjection()) {
         this.projection = new CuratorProjection(other.projection);
       }
       if (other.isSetCacheProjection()) {
-        this.cacheProjection = new PathChildrenCacheProjection(other.cacheProjection);
+        this.cacheProjection = new NodeCacheProjection(other.cacheProjection);
       }
     }
 
-    public getPathChildrenCacheData_args deepCopy() {
-      return new getPathChildrenCacheData_args(this);
+    public getNodeCacheData_args deepCopy() {
+      return new getNodeCacheData_args(this);
     }
 
     @Override
@@ -9651,7 +9931,7 @@ public class CuratorService {
       return this.projection;
     }
 
-    public getPathChildrenCacheData_args setProjection(CuratorProjection projection) {
+    public getNodeCacheData_args setProjection(CuratorProjection projection) {
       this.projection = projection;
       return this;
     }
@@ -9671,11 +9951,11 @@ public class CuratorService {
       }
     }
 
-    public PathChildrenCacheProjection getCacheProjection() {
+    public NodeCacheProjection getCacheProjection() {
       return this.cacheProjection;
     }
 
-    public getPathChildrenCacheData_args setCacheProjection(PathChildrenCacheProjection cacheProjection) {
+    public getNodeCacheData_args setCacheProjection(NodeCacheProjection cacheProjection) {
       this.cacheProjection = cacheProjection;
       return this;
     }
@@ -9709,7 +9989,7 @@ public class CuratorService {
         if (value == null) {
           unsetCacheProjection();
         } else {
-          setCacheProjection((PathChildrenCacheProjection)value);
+          setCacheProjection((NodeCacheProjection)value);
         }
         break;
 
@@ -9747,12 +10027,12 @@ public class CuratorService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getPathChildrenCacheData_args)
-        return this.equals((getPathChildrenCacheData_args)that);
+      if (that instanceof getNodeCacheData_args)
+        return this.equals((getNodeCacheData_args)that);
       return false;
     }
 
-    public boolean equals(getPathChildrenCacheData_args that) {
+    public boolean equals(getNodeCacheData_args that) {
       if (that == null)
         return false;
 
@@ -9783,7 +10063,7 @@ public class CuratorService {
     }
 
     @Override
-    public int compareTo(getPathChildrenCacheData_args other) {
+    public int compareTo(getNodeCacheData_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -9827,7 +10107,7 @@ public class CuratorService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getPathChildrenCacheData_args(");
+      StringBuilder sb = new StringBuilder("getNodeCacheData_args(");
       boolean first = true;
 
       sb.append("projection:");
@@ -9876,15 +10156,15 @@ public class CuratorService {
       }
     }
 
-    private static class getPathChildrenCacheData_argsStandardSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheData_argsStandardScheme getScheme() {
-        return new getPathChildrenCacheData_argsStandardScheme();
+    private static class getNodeCacheData_argsStandardSchemeFactory implements SchemeFactory {
+      public getNodeCacheData_argsStandardScheme getScheme() {
+        return new getNodeCacheData_argsStandardScheme();
       }
     }
 
-    private static class getPathChildrenCacheData_argsStandardScheme extends StandardScheme<getPathChildrenCacheData_args> {
+    private static class getNodeCacheData_argsStandardScheme extends StandardScheme<getNodeCacheData_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getNodeCacheData_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -9905,7 +10185,7 @@ public class CuratorService {
               break;
             case 2: // CACHE_PROJECTION
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.cacheProjection = new PathChildrenCacheProjection();
+                struct.cacheProjection = new NodeCacheProjection();
                 struct.cacheProjection.read(iprot);
                 struct.setCacheProjectionIsSet(true);
               } else { 
@@ -9923,7 +10203,7 @@ public class CuratorService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getNodeCacheData_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -9943,16 +10223,16 @@ public class CuratorService {
 
     }
 
-    private static class getPathChildrenCacheData_argsTupleSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheData_argsTupleScheme getScheme() {
-        return new getPathChildrenCacheData_argsTupleScheme();
+    private static class getNodeCacheData_argsTupleSchemeFactory implements SchemeFactory {
+      public getNodeCacheData_argsTupleScheme getScheme() {
+        return new getNodeCacheData_argsTupleScheme();
       }
     }
 
-    private static class getPathChildrenCacheData_argsTupleScheme extends TupleScheme<getPathChildrenCacheData_args> {
+    private static class getNodeCacheData_argsTupleScheme extends TupleScheme<getNodeCacheData_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getNodeCacheData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetProjection()) {
@@ -9971,7 +10251,7 @@ public class CuratorService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getNodeCacheData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -9980,7 +10260,7 @@ public class CuratorService {
           struct.setProjectionIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.cacheProjection = new PathChildrenCacheProjection();
+          struct.cacheProjection = new NodeCacheProjection();
           struct.cacheProjection.read(iprot);
           struct.setCacheProjectionIsSet(true);
         }
@@ -9989,18 +10269,18 @@ public class CuratorService {
 
   }
 
-  public static class getPathChildrenCacheData_result implements org.apache.thrift.TBase<getPathChildrenCacheData_result, getPathChildrenCacheData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheData_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheData_result");
+  public static class getNodeCacheData_result implements org.apache.thrift.TBase<getNodeCacheData_result, getNodeCacheData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getNodeCacheData_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getNodeCacheData_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getPathChildrenCacheData_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPathChildrenCacheData_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getNodeCacheData_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getNodeCacheData_resultTupleSchemeFactory());
     }
 
-    public List<ChildData> success; // required
+    public ChildData success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -10065,17 +10345,16 @@ public class CuratorService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ChildData.class))));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ChildData.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheData_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getNodeCacheData_result.class, metaDataMap);
     }
 
-    public getPathChildrenCacheData_result() {
+    public getNodeCacheData_result() {
     }
 
-    public getPathChildrenCacheData_result(
-      List<ChildData> success)
+    public getNodeCacheData_result(
+      ChildData success)
     {
       this();
       this.success = success;
@@ -10084,18 +10363,14 @@ public class CuratorService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getPathChildrenCacheData_result(getPathChildrenCacheData_result other) {
+    public getNodeCacheData_result(getNodeCacheData_result other) {
       if (other.isSetSuccess()) {
-        List<ChildData> __this__success = new ArrayList<ChildData>(other.success.size());
-        for (ChildData other_element : other.success) {
-          __this__success.add(new ChildData(other_element));
-        }
-        this.success = __this__success;
+        this.success = new ChildData(other.success);
       }
     }
 
-    public getPathChildrenCacheData_result deepCopy() {
-      return new getPathChildrenCacheData_result(this);
+    public getNodeCacheData_result deepCopy() {
+      return new getNodeCacheData_result(this);
     }
 
     @Override
@@ -10103,26 +10378,11 @@ public class CuratorService {
       this.success = null;
     }
 
-    public int getSuccessSize() {
-      return (this.success == null) ? 0 : this.success.size();
-    }
-
-    public java.util.Iterator<ChildData> getSuccessIterator() {
-      return (this.success == null) ? null : this.success.iterator();
-    }
-
-    public void addToSuccess(ChildData elem) {
-      if (this.success == null) {
-        this.success = new ArrayList<ChildData>();
-      }
-      this.success.add(elem);
-    }
-
-    public List<ChildData> getSuccess() {
+    public ChildData getSuccess() {
       return this.success;
     }
 
-    public getPathChildrenCacheData_result setSuccess(List<ChildData> success) {
+    public getNodeCacheData_result setSuccess(ChildData success) {
       this.success = success;
       return this;
     }
@@ -10148,7 +10408,7 @@ public class CuratorService {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<ChildData>)value);
+          setSuccess((ChildData)value);
         }
         break;
 
@@ -10181,12 +10441,12 @@ public class CuratorService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getPathChildrenCacheData_result)
-        return this.equals((getPathChildrenCacheData_result)that);
+      if (that instanceof getNodeCacheData_result)
+        return this.equals((getNodeCacheData_result)that);
       return false;
     }
 
-    public boolean equals(getPathChildrenCacheData_result that) {
+    public boolean equals(getNodeCacheData_result that) {
       if (that == null)
         return false;
 
@@ -10208,7 +10468,7 @@ public class CuratorService {
     }
 
     @Override
-    public int compareTo(getPathChildrenCacheData_result other) {
+    public int compareTo(getNodeCacheData_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -10242,7 +10502,7 @@ public class CuratorService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getPathChildrenCacheData_result(");
+      StringBuilder sb = new StringBuilder("getNodeCacheData_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -10259,6 +10519,9 @@ public class CuratorService {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
+      if (success != null) {
+        success.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -10277,15 +10540,15 @@ public class CuratorService {
       }
     }
 
-    private static class getPathChildrenCacheData_resultStandardSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheData_resultStandardScheme getScheme() {
-        return new getPathChildrenCacheData_resultStandardScheme();
+    private static class getNodeCacheData_resultStandardSchemeFactory implements SchemeFactory {
+      public getNodeCacheData_resultStandardScheme getScheme() {
+        return new getNodeCacheData_resultStandardScheme();
       }
     }
 
-    private static class getPathChildrenCacheData_resultStandardScheme extends StandardScheme<getPathChildrenCacheData_result> {
+    private static class getNodeCacheData_resultStandardScheme extends StandardScheme<getNodeCacheData_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getNodeCacheData_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -10296,19 +10559,9 @@ public class CuratorService {
           }
           switch (schemeField.id) {
             case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
-                  struct.success = new ArrayList<ChildData>(_list32.size);
-                  for (int _i33 = 0; _i33 < _list32.size; ++_i33)
-                  {
-                    ChildData _elem34;
-                    _elem34 = new ChildData();
-                    _elem34.read(iprot);
-                    struct.success.add(_elem34);
-                  }
-                  iprot.readListEnd();
-                }
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.success = new ChildData();
+                struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -10325,20 +10578,13 @@ public class CuratorService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getNodeCacheData_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
         if (struct.success != null) {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ChildData _iter35 : struct.success)
-            {
-              _iter35.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
+          struct.success.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -10347,16 +10593,16 @@ public class CuratorService {
 
     }
 
-    private static class getPathChildrenCacheData_resultTupleSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheData_resultTupleScheme getScheme() {
-        return new getPathChildrenCacheData_resultTupleScheme();
+    private static class getNodeCacheData_resultTupleSchemeFactory implements SchemeFactory {
+      public getNodeCacheData_resultTupleScheme getScheme() {
+        return new getNodeCacheData_resultTupleScheme();
       }
     }
 
-    private static class getPathChildrenCacheData_resultTupleScheme extends TupleScheme<getPathChildrenCacheData_result> {
+    private static class getNodeCacheData_resultTupleScheme extends TupleScheme<getNodeCacheData_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getNodeCacheData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -10364,32 +10610,17 @@ public class CuratorService {
         }
         oprot.writeBitSet(optionals, 1);
         if (struct.isSetSuccess()) {
-          {
-            oprot.writeI32(struct.success.size());
-            for (ChildData _iter36 : struct.success)
-            {
-              _iter36.write(oprot);
-            }
-          }
+          struct.success.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getNodeCacheData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
-          {
-            org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ChildData>(_list37.size);
-            for (int _i38 = 0; _i38 < _list37.size; ++_i38)
-            {
-              ChildData _elem39;
-              _elem39 = new ChildData();
-              _elem39.read(iprot);
-              struct.success.add(_elem39);
-            }
-          }
+          struct.success = new ChildData();
+          struct.success.read(iprot);
           struct.setSuccessIsSet(true);
         }
       }
@@ -10397,28 +10628,25 @@ public class CuratorService {
 
   }
 
-  public static class getPathChildrenCacheDataForPath_args implements org.apache.thrift.TBase<getPathChildrenCacheDataForPath_args, getPathChildrenCacheDataForPath_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheDataForPath_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheDataForPath_args");
+  public static class getPathChildrenCacheData_args implements org.apache.thrift.TBase<getPathChildrenCacheData_args, getPathChildrenCacheData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheData_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheData_args");
 
     private static final org.apache.thrift.protocol.TField PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("projection", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CACHE_PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("cacheProjection", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getPathChildrenCacheDataForPath_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPathChildrenCacheDataForPath_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getPathChildrenCacheData_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getPathChildrenCacheData_argsTupleSchemeFactory());
     }
 
     public CuratorProjection projection; // required
     public PathChildrenCacheProjection cacheProjection; // required
-    public String path; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PROJECTION((short)1, "projection"),
-      CACHE_PROJECTION((short)2, "cacheProjection"),
-      PATH((short)3, "path");
+      CACHE_PROJECTION((short)2, "cacheProjection");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -10437,8 +10665,6 @@ public class CuratorService {
             return PROJECTION;
           case 2: // CACHE_PROJECTION
             return CACHE_PROJECTION;
-          case 3: // PATH
-            return PATH;
           default:
             return null;
         }
@@ -10486,57 +10712,49 @@ public class CuratorService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CuratorProjection.class)));
       tmpMap.put(_Fields.CACHE_PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("cacheProjection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PathChildrenCacheProjection.class)));
-      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheDataForPath_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheData_args.class, metaDataMap);
     }
 
-    public getPathChildrenCacheDataForPath_args() {
+    public getPathChildrenCacheData_args() {
     }
 
-    public getPathChildrenCacheDataForPath_args(
+    public getPathChildrenCacheData_args(
       CuratorProjection projection,
-      PathChildrenCacheProjection cacheProjection,
-      String path)
+      PathChildrenCacheProjection cacheProjection)
     {
       this();
       this.projection = projection;
       this.cacheProjection = cacheProjection;
-      this.path = path;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getPathChildrenCacheDataForPath_args(getPathChildrenCacheDataForPath_args other) {
+    public getPathChildrenCacheData_args(getPathChildrenCacheData_args other) {
       if (other.isSetProjection()) {
         this.projection = new CuratorProjection(other.projection);
       }
       if (other.isSetCacheProjection()) {
         this.cacheProjection = new PathChildrenCacheProjection(other.cacheProjection);
       }
-      if (other.isSetPath()) {
-        this.path = other.path;
-      }
     }
 
-    public getPathChildrenCacheDataForPath_args deepCopy() {
-      return new getPathChildrenCacheDataForPath_args(this);
+    public getPathChildrenCacheData_args deepCopy() {
+      return new getPathChildrenCacheData_args(this);
     }
 
     @Override
     public void clear() {
       this.projection = null;
       this.cacheProjection = null;
-      this.path = null;
     }
 
     public CuratorProjection getProjection() {
       return this.projection;
     }
 
-    public getPathChildrenCacheDataForPath_args setProjection(CuratorProjection projection) {
+    public getPathChildrenCacheData_args setProjection(CuratorProjection projection) {
       this.projection = projection;
       return this;
     }
@@ -10560,7 +10778,7 @@ public class CuratorService {
       return this.cacheProjection;
     }
 
-    public getPathChildrenCacheDataForPath_args setCacheProjection(PathChildrenCacheProjection cacheProjection) {
+    public getPathChildrenCacheData_args setCacheProjection(PathChildrenCacheProjection cacheProjection) {
       this.cacheProjection = cacheProjection;
       return this;
     }
@@ -10580,30 +10798,6 @@ public class CuratorService {
       }
     }
 
-    public String getPath() {
-      return this.path;
-    }
-
-    public getPathChildrenCacheDataForPath_args setPath(String path) {
-      this.path = path;
-      return this;
-    }
-
-    public void unsetPath() {
-      this.path = null;
-    }
-
-    /** Returns true if field path is set (has been assigned a value) and false otherwise */
-    public boolean isSetPath() {
-      return this.path != null;
-    }
-
-    public void setPathIsSet(boolean value) {
-      if (!value) {
-        this.path = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case PROJECTION:
@@ -10622,14 +10816,6 @@ public class CuratorService {
         }
         break;
 
-      case PATH:
-        if (value == null) {
-          unsetPath();
-        } else {
-          setPath((String)value);
-        }
-        break;
-
       }
     }
 
@@ -10641,9 +10827,6 @@ public class CuratorService {
       case CACHE_PROJECTION:
         return getCacheProjection();
 
-      case PATH:
-        return getPath();
-
       }
       throw new IllegalStateException();
     }
@@ -10659,8 +10842,6 @@ public class CuratorService {
         return isSetProjection();
       case CACHE_PROJECTION:
         return isSetCacheProjection();
-      case PATH:
-        return isSetPath();
       }
       throw new IllegalStateException();
     }
@@ -10669,12 +10850,12 @@ public class CuratorService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getPathChildrenCacheDataForPath_args)
-        return this.equals((getPathChildrenCacheDataForPath_args)that);
+      if (that instanceof getPathChildrenCacheData_args)
+        return this.equals((getPathChildrenCacheData_args)that);
       return false;
     }
 
-    public boolean equals(getPathChildrenCacheDataForPath_args that) {
+    public boolean equals(getPathChildrenCacheData_args that) {
       if (that == null)
         return false;
 
@@ -10696,15 +10877,6 @@ public class CuratorService {
           return false;
       }
 
-      boolean this_present_path = true && this.isSetPath();
-      boolean that_present_path = true && that.isSetPath();
-      if (this_present_path || that_present_path) {
-        if (!(this_present_path && that_present_path))
-          return false;
-        if (!this.path.equals(that.path))
-          return false;
-      }
-
       return true;
     }
 
@@ -10714,7 +10886,7 @@ public class CuratorService {
     }
 
     @Override
-    public int compareTo(getPathChildrenCacheDataForPath_args other) {
+    public int compareTo(getPathChildrenCacheData_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -10741,16 +10913,6 @@ public class CuratorService {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPath()).compareTo(other.isSetPath());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetPath()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, other.path);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -10768,7 +10930,7 @@ public class CuratorService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getPathChildrenCacheDataForPath_args(");
+      StringBuilder sb = new StringBuilder("getPathChildrenCacheData_args(");
       boolean first = true;
 
       sb.append("projection:");
@@ -10786,14 +10948,6 @@ public class CuratorService {
         sb.append(this.cacheProjection);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("path:");
-      if (this.path == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.path);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -10825,15 +10979,15 @@ public class CuratorService {
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_argsStandardSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheDataForPath_argsStandardScheme getScheme() {
-        return new getPathChildrenCacheDataForPath_argsStandardScheme();
+    private static class getPathChildrenCacheData_argsStandardSchemeFactory implements SchemeFactory {
+      public getPathChildrenCacheData_argsStandardScheme getScheme() {
+        return new getPathChildrenCacheData_argsStandardScheme();
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_argsStandardScheme extends StandardScheme<getPathChildrenCacheDataForPath_args> {
+    private static class getPathChildrenCacheData_argsStandardScheme extends StandardScheme<getPathChildrenCacheData_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheDataForPath_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -10861,14 +11015,6 @@ public class CuratorService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // PATH
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.path = iprot.readString();
-                struct.setPathIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -10880,7 +11026,7 @@ public class CuratorService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheDataForPath_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -10894,27 +11040,22 @@ public class CuratorService {
           struct.cacheProjection.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.path != null) {
-          oprot.writeFieldBegin(PATH_FIELD_DESC);
-          oprot.writeString(struct.path);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class getPathChildrenCacheDataForPath_argsTupleSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheDataForPath_argsTupleScheme getScheme() {
-        return new getPathChildrenCacheDataForPath_argsTupleScheme();
+    private static class getPathChildrenCacheData_argsTupleSchemeFactory implements SchemeFactory {
+      public getPathChildrenCacheData_argsTupleScheme getScheme() {
+        return new getPathChildrenCacheData_argsTupleScheme();
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_argsTupleScheme extends TupleScheme<getPathChildrenCacheDataForPath_args> {
+    private static class getPathChildrenCacheData_argsTupleScheme extends TupleScheme<getPathChildrenCacheData_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheDataForPath_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetProjection()) {
@@ -10923,25 +11064,19 @@ public class CuratorService {
         if (struct.isSetCacheProjection()) {
           optionals.set(1);
         }
-        if (struct.isSetPath()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetProjection()) {
           struct.projection.write(oprot);
         }
         if (struct.isSetCacheProjection()) {
           struct.cacheProjection.write(oprot);
         }
-        if (struct.isSetPath()) {
-          oprot.writeString(struct.path);
-        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheDataForPath_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.projection = new CuratorProjection();
           struct.projection.read(iprot);
@@ -10952,27 +11087,23 @@ public class CuratorService {
           struct.cacheProjection.read(iprot);
           struct.setCacheProjectionIsSet(true);
         }
-        if (incoming.get(2)) {
-          struct.path = iprot.readString();
-          struct.setPathIsSet(true);
-        }
       }
     }
 
   }
 
-  public static class getPathChildrenCacheDataForPath_result implements org.apache.thrift.TBase<getPathChildrenCacheDataForPath_result, getPathChildrenCacheDataForPath_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheDataForPath_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheDataForPath_result");
-
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+  public static class getPathChildrenCacheData_result implements org.apache.thrift.TBase<getPathChildrenCacheData_result, getPathChildrenCacheData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheData_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheData_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getPathChildrenCacheDataForPath_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPathChildrenCacheDataForPath_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getPathChildrenCacheData_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getPathChildrenCacheData_resultTupleSchemeFactory());
     }
 
-    public ChildData success; // required
+    public List<ChildData> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -11037,16 +11168,17 @@ public class CuratorService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ChildData.class)));
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ChildData.class))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheDataForPath_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheData_result.class, metaDataMap);
     }
 
-    public getPathChildrenCacheDataForPath_result() {
+    public getPathChildrenCacheData_result() {
     }
 
-    public getPathChildrenCacheDataForPath_result(
-      ChildData success)
+    public getPathChildrenCacheData_result(
+      List<ChildData> success)
     {
       this();
       this.success = success;
@@ -11055,14 +11187,18 @@ public class CuratorService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getPathChildrenCacheDataForPath_result(getPathChildrenCacheDataForPath_result other) {
+    public getPathChildrenCacheData_result(getPathChildrenCacheData_result other) {
       if (other.isSetSuccess()) {
-        this.success = new ChildData(other.success);
+        List<ChildData> __this__success = new ArrayList<ChildData>(other.success.size());
+        for (ChildData other_element : other.success) {
+          __this__success.add(new ChildData(other_element));
+        }
+        this.success = __this__success;
       }
     }
 
-    public getPathChildrenCacheDataForPath_result deepCopy() {
-      return new getPathChildrenCacheDataForPath_result(this);
+    public getPathChildrenCacheData_result deepCopy() {
+      return new getPathChildrenCacheData_result(this);
     }
 
     @Override
@@ -11070,11 +11206,26 @@ public class CuratorService {
       this.success = null;
     }
 
-    public ChildData getSuccess() {
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<ChildData> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(ChildData elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<ChildData>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<ChildData> getSuccess() {
       return this.success;
     }
 
-    public getPathChildrenCacheDataForPath_result setSuccess(ChildData success) {
+    public getPathChildrenCacheData_result setSuccess(List<ChildData> success) {
       this.success = success;
       return this;
     }
@@ -11100,7 +11251,7 @@ public class CuratorService {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((ChildData)value);
+          setSuccess((List<ChildData>)value);
         }
         break;
 
@@ -11133,12 +11284,12 @@ public class CuratorService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getPathChildrenCacheDataForPath_result)
-        return this.equals((getPathChildrenCacheDataForPath_result)that);
+      if (that instanceof getPathChildrenCacheData_result)
+        return this.equals((getPathChildrenCacheData_result)that);
       return false;
     }
 
-    public boolean equals(getPathChildrenCacheDataForPath_result that) {
+    public boolean equals(getPathChildrenCacheData_result that) {
       if (that == null)
         return false;
 
@@ -11160,7 +11311,7 @@ public class CuratorService {
     }
 
     @Override
-    public int compareTo(getPathChildrenCacheDataForPath_result other) {
+    public int compareTo(getPathChildrenCacheData_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -11194,7 +11345,7 @@ public class CuratorService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getPathChildrenCacheDataForPath_result(");
+      StringBuilder sb = new StringBuilder("getPathChildrenCacheData_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -11211,9 +11362,6 @@ public class CuratorService {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (success != null) {
-        success.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -11232,15 +11380,15 @@ public class CuratorService {
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_resultStandardSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheDataForPath_resultStandardScheme getScheme() {
-        return new getPathChildrenCacheDataForPath_resultStandardScheme();
+    private static class getPathChildrenCacheData_resultStandardSchemeFactory implements SchemeFactory {
+      public getPathChildrenCacheData_resultStandardScheme getScheme() {
+        return new getPathChildrenCacheData_resultStandardScheme();
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_resultStandardScheme extends StandardScheme<getPathChildrenCacheDataForPath_result> {
+    private static class getPathChildrenCacheData_resultStandardScheme extends StandardScheme<getPathChildrenCacheData_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheDataForPath_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -11251,9 +11399,19 @@ public class CuratorService {
           }
           switch (schemeField.id) {
             case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.success = new ChildData();
-                struct.success.read(iprot);
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+                {
+                  org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
+                  struct.success = new ArrayList<ChildData>(_list32.size);
+                  for (int _i33 = 0; _i33 < _list32.size; ++_i33)
+                  {
+                    ChildData _elem34;
+                    _elem34 = new ChildData();
+                    _elem34.read(iprot);
+                    struct.success.add(_elem34);
+                  }
+                  iprot.readListEnd();
+                }
                 struct.setSuccessIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -11270,13 +11428,20 @@ public class CuratorService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheDataForPath_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
         if (struct.success != null) {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-          struct.success.write(oprot);
+          {
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
+            for (ChildData _iter35 : struct.success)
+            {
+              _iter35.write(oprot);
+            }
+            oprot.writeListEnd();
+          }
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -11285,16 +11450,16 @@ public class CuratorService {
 
     }
 
-    private static class getPathChildrenCacheDataForPath_resultTupleSchemeFactory implements SchemeFactory {
-      public getPathChildrenCacheDataForPath_resultTupleScheme getScheme() {
-        return new getPathChildrenCacheDataForPath_resultTupleScheme();
+    private static class getPathChildrenCacheData_resultTupleSchemeFactory implements SchemeFactory {
+      public getPathChildrenCacheData_resultTupleScheme getScheme() {
+        return new getPathChildrenCacheData_resultTupleScheme();
       }
     }
 
-    private static class getPathChildrenCacheDataForPath_resultTupleScheme extends TupleScheme<getPathChildrenCacheDataForPath_result> {
+    private static class getPathChildrenCacheData_resultTupleScheme extends TupleScheme<getPathChildrenCacheData_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheDataForPath_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -11302,17 +11467,32 @@ public class CuratorService {
         }
         oprot.writeBitSet(optionals, 1);
         if (struct.isSetSuccess()) {
-          struct.success.write(oprot);
+          {
+            oprot.writeI32(struct.success.size());
+            for (ChildData _iter36 : struct.success)
+            {
+              _iter36.write(oprot);
+            }
+          }
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheDataForPath_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getPathChildrenCacheData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
-          struct.success = new ChildData();
-          struct.success.read(iprot);
+          {
+            org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<ChildData>(_list37.size);
+            for (int _i38 = 0; _i38 < _list37.size; ++_i38)
+            {
+              ChildData _elem39;
+              _elem39 = new ChildData();
+              _elem39.read(iprot);
+              struct.success.add(_elem39);
+            }
+          }
           struct.setSuccessIsSet(true);
         }
       }
@@ -11320,25 +11500,28 @@ public class CuratorService {
 
   }
 
-  public static class isLeader_args implements org.apache.thrift.TBase<isLeader_args, isLeader_args._Fields>, java.io.Serializable, Cloneable, Comparable<isLeader_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isLeader_args");
+  public static class getPathChildrenCacheDataForPath_args implements org.apache.thrift.TBase<getPathChildrenCacheDataForPath_args, getPathChildrenCacheDataForPath_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathChildrenCacheDataForPath_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathChildrenCacheDataForPath_args");
 
     private static final org.apache.thrift.protocol.TField PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("projection", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField LEADER_PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("leaderProjection", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField CACHE_PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("cacheProjection", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new isLeader_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new isLeader_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getPathChildrenCacheDataForPath_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getPathChildrenCacheDataForPath_argsTupleSchemeFactory());
     }
 
     public CuratorProjection projection; // required
-    public LeaderProjection leaderProjection; // required
+    public PathChildrenCacheProjection cacheProjection; // required
+    public String path; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       PROJECTION((short)1, "projection"),
-      LEADER_PROJECTION((short)2, "leaderProjection");
+      CACHE_PROJECTION((short)2, "cacheProjection"),
+      PATH((short)3, "path");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -11355,8 +11538,10 @@ public class CuratorService {
         switch(fieldId) {
           case 1: // PROJECTION
             return PROJECTION;
-          case 2: // LEADER_PROJECTION
-            return LEADER_PROJECTION;
+          case 2: // CACHE_PROJECTION
+            return CACHE_PROJECTION;
+          case 3: // PATH
+            return PATH;
           default:
             return null;
         }
@@ -11402,51 +11587,59 @@ public class CuratorService {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("projection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CuratorProjection.class)));
-      tmpMap.put(_Fields.LEADER_PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("leaderProjection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LeaderProjection.class)));
+      tmpMap.put(_Fields.CACHE_PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("cacheProjection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PathChildrenCacheProjection.class)));
+      tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isLeader_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathChildrenCacheDataForPath_args.class, metaDataMap);
     }
 
-    public isLeader_args() {
+    public getPathChildrenCacheDataForPath_args() {
     }
 
-    public isLeader_args(
+    public getPathChildrenCacheDataForPath_args(
       CuratorProjection projection,
-      LeaderProjection leaderProjection)
+      PathChildrenCacheProjection cacheProjection,
+      String path)
     {
       this();
       this.projection = projection;
-      this.leaderProjection = leaderProjection;
+      this.cacheProjection = cacheProjection;
+      this.path = path;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public isLeader_args(isLeader_args other) {
+    public getPathChildrenCacheDataForPath_args(getPathChildrenCacheDataForPath_args other) {
       if (other.isSetProjection()) {
         this.projection = new CuratorProjection(other.projection);
       }
-      if (other.isSetLeaderProjection()) {
-        this.leaderProjection = new LeaderProjection(other.leaderProjection);
+      if (other.isSetCacheProjection()) {
+        this.cacheProjection = new PathChildrenCacheProjection(other.cacheProjection);
+      }
+      if (other.isSetPath()) {
+        this.path = other.path;
       }
     }
 
-    public isLeader_args deepCopy() {
-      return new isLeader_args(this);
+    public getPathChildrenCacheDataForPath_args deepCopy() {
+      return new getPathChildrenCacheDataForPath_args(this);
     }
 
     @Override
     public void clear() {
       this.projection = null;
-      this.leaderProjection = null;
+      this.cacheProjection = null;
+      this.path = null;
     }
 
     public CuratorProjection getProjection() {
       return this.projection;
     }
 
-    public isLeader_args setProjection(CuratorProjection projection) {
+    public getPathChildrenCacheDataForPath_args setProjection(CuratorProjection projection) {
       this.projection = projection;
       return this;
     }
@@ -11466,27 +11659,51 @@ public class CuratorService {
       }
     }
 
-    public LeaderProjection getLeaderProjection() {
-      return this.leaderProjection;
+    public PathChildrenCacheProjection getCacheProjection() {
+      return this.cacheProjection;
     }
 
-    public isLeader_args setLeaderProjection(LeaderProjection leaderProjection) {
-      this.leaderProjection = leaderProjection;
+    public getPathChildrenCacheDataForPath_args setCacheProjection(PathChildrenCacheProjection cacheProjection) {
+      this.cacheProjection = cacheProjection;
       return this;
     }
 
-    public void unsetLeaderProjection() {
-      this.leaderProjection = null;
+    public void unsetCacheProjection() {
+      this.cacheProjection = null;
     }
 
-    /** Returns true if field leaderProjection is set (has been assigned a value) and false otherwise */
-    public boolean isSetLeaderProjection() {
-      return this.leaderProjection != null;
+    /** Returns true if field cacheProjection is set (has been assigned a value) and false otherwise */
+    public boolean isSetCacheProjection() {
+      return this.cacheProjection != null;
     }
 
-    public void setLeaderProjectionIsSet(boolean value) {
+    public void setCacheProjectionIsSet(boolean value) {
       if (!value) {
-        this.leaderProjection = null;
+        this.cacheProjection = null;
+      }
+    }
+
+    public String getPath() {
+      return this.path;
+    }
+
+    public getPathChildrenCacheDataForPath_args setPath(String path) {
+      this.path = path;
+      return this;
+    }
+
+    public void unsetPath() {
+      this.path = null;
+    }
+
+    /** Returns true if field path is set (has been assigned a value) and false otherwise */
+    public boolean isSetPath() {
+      return this.path != null;
+    }
+
+    public void setPathIsSet(boolean value) {
+      if (!value) {
+        this.path = null;
       }
     }
 
@@ -11500,24 +11717,35 @@ public class CuratorService {
         }
         break;
 
-      case LEADER_PROJECTION:
+      case CACHE_PROJECTION:
         if (value == null) {
-          unsetLeaderProjection();
+          unsetCacheProjection();
         } else {
-          setLeaderProjection((LeaderProjection)value);
+          setCacheProjection((PathChildrenCacheProjection)value);
         }
         break;
 
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case PROJECTION:
-        return getProjection();
+      case PATH:
+        if (value == null) {
+          unsetPath();
+        } else {
+          setPath((String)value);
+        }
+        break;
 
-      case LEADER_PROJECTION:
-        return getLeaderProjection();
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case PROJECTION:
+        return getProjection();
+
+      case CACHE_PROJECTION:
+        return getCacheProjection();
+
+      case PATH:
+        return getPath();
 
       }
       throw new IllegalStateException();
@@ -11532,8 +11760,10 @@ public class CuratorService {
       switch (field) {
       case PROJECTION:
         return isSetProjection();
-      case LEADER_PROJECTION:
-        return isSetLeaderProjection();
+      case CACHE_PROJECTION:
+        return isSetCacheProjection();
+      case PATH:
+        return isSetPath();
       }
       throw new IllegalStateException();
     }
@@ -11542,12 +11772,12 @@ public class CuratorService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof isLeader_args)
-        return this.equals((isLeader_args)that);
+      if (that instanceof getPathChildrenCacheDataForPath_args)
+        return this.equals((getPathChildrenCacheDataForPath_args)that);
       return false;
     }
 
-    public boolean equals(isLeader_args that) {
+    public boolean equals(getPathChildrenCacheDataForPath_args that) {
       if (that == null)
         return false;
 
@@ -11560,12 +11790,21 @@ public class CuratorService {
           return false;
       }
 
-      boolean this_present_leaderProjection = true && this.isSetLeaderProjection();
-      boolean that_present_leaderProjection = true && that.isSetLeaderProjection();
-      if (this_present_leaderProjection || that_present_leaderProjection) {
-        if (!(this_present_leaderProjection && that_present_leaderProjection))
+      boolean this_present_cacheProjection = true && this.isSetCacheProjection();
+      boolean that_present_cacheProjection = true && that.isSetCacheProjection();
+      if (this_present_cacheProjection || that_present_cacheProjection) {
+        if (!(this_present_cacheProjection && that_present_cacheProjection))
           return false;
-        if (!this.leaderProjection.equals(that.leaderProjection))
+        if (!this.cacheProjection.equals(that.cacheProjection))
+          return false;
+      }
+
+      boolean this_present_path = true && this.isSetPath();
+      boolean that_present_path = true && that.isSetPath();
+      if (this_present_path || that_present_path) {
+        if (!(this_present_path && that_present_path))
+          return false;
+        if (!this.path.equals(that.path))
           return false;
       }
 
@@ -11578,7 +11817,7 @@ public class CuratorService {
     }
 
     @Override
-    public int compareTo(isLeader_args other) {
+    public int compareTo(getPathChildrenCacheDataForPath_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -11595,12 +11834,22 @@ public class CuratorService {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLeaderProjection()).compareTo(other.isSetLeaderProjection());
+      lastComparison = Boolean.valueOf(isSetCacheProjection()).compareTo(other.isSetCacheProjection());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetLeaderProjection()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.leaderProjection, other.leaderProjection);
+      if (isSetCacheProjection()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cacheProjection, other.cacheProjection);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetPath()).compareTo(other.isSetPath());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetPath()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, other.path);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -11622,7 +11871,7 @@ public class CuratorService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("isLeader_args(");
+      StringBuilder sb = new StringBuilder("getPathChildrenCacheDataForPath_args(");
       boolean first = true;
 
       sb.append("projection:");
@@ -11633,11 +11882,19 @@ public class CuratorService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("leaderProjection:");
-      if (this.leaderProjection == null) {
+      sb.append("cacheProjection:");
+      if (this.cacheProjection == null) {
         sb.append("null");
       } else {
-        sb.append(this.leaderProjection);
+        sb.append(this.cacheProjection);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("path:");
+      if (this.path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.path);
       }
       first = false;
       sb.append(")");
@@ -11650,8 +11907,8 @@ public class CuratorService {
       if (projection != null) {
         projection.validate();
       }
-      if (leaderProjection != null) {
-        leaderProjection.validate();
+      if (cacheProjection != null) {
+        cacheProjection.validate();
       }
     }
 
@@ -11671,15 +11928,15 @@ public class CuratorService {
       }
     }
 
-    private static class isLeader_argsStandardSchemeFactory implements SchemeFactory {
-      public isLeader_argsStandardScheme getScheme() {
-        return new isLeader_argsStandardScheme();
+    private static class g

<TRUNCATED>

[3/3] git commit: node cache support

Posted by ra...@apache.org.
node cache support


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/985c9ed0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/985c9ed0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/985c9ed0

Branch: refs/heads/curator-rpc
Commit: 985c9ed008a77d179066f9873716636fff4be959
Parents: 6f9a9ab
Author: randgalt <ra...@apache.org>
Authored: Thu May 29 16:17:46 2014 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu May 29 16:17:46 2014 -0500

----------------------------------------------------------------------
 .../curator/x/rpc/connections/CuratorEntry.java |   12 +-
 .../x/rpc/idl/event/RpcCuratorEvent.java        |   16 +
 .../x/rpc/idl/event/RpcCuratorEventType.java    |    3 +-
 .../projection/CuratorProjectionService.java    |   55 +-
 .../rpc/idl/projection/NodeCacheProjection.java |   20 +
 curator-x-rpc/src/main/thrift/curator.thrift    |    8 +-
 .../curator/generated/CuratorEventType.java     |    5 +-
 .../curator/generated/CuratorService.java       | 3893 ++++++++++++++----
 .../curator/generated/NodeCacheProjection.java  |  393 ++
 .../org/apache/curator/x/rpc/TestClient.java    |    7 +
 10 files changed, 3509 insertions(+), 903 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/connections/CuratorEntry.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/connections/CuratorEntry.java b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/connections/CuratorEntry.java
index 1ecd795..2613ad0 100644
--- a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/connections/CuratorEntry.java
+++ b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/connections/CuratorEntry.java
@@ -98,12 +98,6 @@ public class CuratorEntry implements Closeable
         return UUID.randomUUID().toString();
     }
 
-    public <T> String addThing(String id, T thing, Closer<T> closer)
-    {
-        things.put(id, new Entry(thing, closer));
-        return id;
-    }
-
     public <T> T getThing(String id, Class<T> clazz)
     {
         Entry entry = (id != null) ? things.get(id) : null;
@@ -121,6 +115,12 @@ public class CuratorEntry implements Closeable
         return false;
     }
 
+    private <T> String addThing(String id, T thing, Closer<T> closer)
+    {
+        things.put(id, new Entry(thing, closer));
+        return id;
+    }
+
     private <T> T cast(Class<T> clazz, Entry entry)
     {
         if ( entry != null )

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEvent.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEvent.java b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEvent.java
index aacf076..400f8c9 100644
--- a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEvent.java
+++ b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEvent.java
@@ -86,6 +86,22 @@ public class RpcCuratorEvent
         this.childrenCacheEvent = null;
     }
 
+    public RpcCuratorEvent(RpcCuratorEventType type, String path)
+    {
+        this.type = type;
+        this.resultCode = 0;
+        this.path = path;
+        this.context = null;
+        this.stat = null;
+        this.data = null;
+        this.name = null;
+        this.children = null;
+        this.aclList = null;
+        this.watchedEvent = null;
+        this.leaderEvent = null;
+        this.childrenCacheEvent = null;
+    }
+
     public RpcCuratorEvent(RpcPathChildrenCacheEvent childrenCacheEvent)
     {
         this.type = RpcCuratorEventType.PATH_CHILDREN_CACHE;

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEventType.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEventType.java b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEventType.java
index eee5929..0bda3d6 100644
--- a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEventType.java
+++ b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/event/RpcCuratorEventType.java
@@ -41,5 +41,6 @@ public enum RpcCuratorEventType
     CONNECTION_LOST,
     CONNECTION_READ_ONLY,
     LEADER,
-    PATH_CHILDREN_CACHE
+    PATH_CHILDREN_CACHE,
+    NODE_CACHE
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/CuratorProjectionService.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/CuratorProjectionService.java b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/CuratorProjectionService.java
index 8b41353..a870447 100644
--- a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/CuratorProjectionService.java
+++ b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/CuratorProjectionService.java
@@ -27,6 +27,8 @@ import com.google.common.collect.Lists;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.api.*;
 import org.apache.curator.framework.recipes.cache.ChildData;
+import org.apache.curator.framework.recipes.cache.NodeCache;
+import org.apache.curator.framework.recipes.cache.NodeCacheListener;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
@@ -316,8 +318,7 @@ public class CuratorProjectionService
                 }
             }
         };
-        final String id = CuratorEntry.newId();
-        entry.addThing(id, leaderLatch, closer);
+        String id = entry.addThing(leaderLatch, closer);
 
         LeaderLatchListener listener = new LeaderLatchListener()
         {
@@ -393,8 +394,7 @@ public class CuratorProjectionService
                 }
             }
         };
-        final String id = CuratorEntry.newId();
-        entry.addThing(id, cache, closer);
+        String id = entry.addThing(cache, closer);
 
         PathChildrenCacheListener listener = new PathChildrenCacheListener()
         {
@@ -438,6 +438,53 @@ public class CuratorProjectionService
         return new RpcChildData(pathChildrenCache.getCurrentData(path));
     }
 
+    @ThriftMethod
+    public NodeCacheProjection startNodeCache(CuratorProjection projection, final String path, boolean dataIsCompressed, boolean buildInitial) throws Exception
+    {
+        final CuratorEntry entry = getEntry(projection);
+
+        final NodeCache cache = new NodeCache(entry.getClient(), path, dataIsCompressed);
+        cache.start(buildInitial);
+
+        Closer<NodeCache> closer = new Closer<NodeCache>()
+        {
+            @Override
+            public void close(NodeCache cache)
+            {
+                try
+                {
+                    cache.close();
+                }
+                catch ( IOException e )
+                {
+                    log.error("Could not close left-over NodeCache for path: " + path, e);
+                }
+            }
+        };
+        String id = entry.addThing(cache, closer);
+
+        NodeCacheListener listener = new NodeCacheListener()
+        {
+            @Override
+            public void nodeChanged() throws Exception
+            {
+                entry.addEvent(new RpcCuratorEvent(RpcCuratorEventType.NODE_CACHE, path));
+            }
+        };
+        cache.getListenable().addListener(listener);
+
+        return new NodeCacheProjection(new GenericProjection(id));
+    }
+
+    @ThriftMethod
+    public RpcChildData getNodeCacheData(CuratorProjection projection, NodeCacheProjection cacheProjection) throws Exception
+    {
+        final CuratorEntry entry = getEntry(projection);
+
+        NodeCache nodeCache = getThing(entry, cacheProjection.projection.id, NodeCache.class);
+        return new RpcChildData(nodeCache.getCurrentData());
+    }
+
     public void addEvent(CuratorProjection projection, RpcCuratorEvent event)
     {
         CuratorEntry entry = connectionManager.get(projection.id);

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/NodeCacheProjection.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/NodeCacheProjection.java b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/NodeCacheProjection.java
new file mode 100644
index 0000000..43d1138
--- /dev/null
+++ b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/projection/NodeCacheProjection.java
@@ -0,0 +1,20 @@
+package org.apache.curator.x.rpc.idl.projection;
+
+import com.facebook.swift.codec.ThriftField;
+import com.facebook.swift.codec.ThriftStruct;
+
+@ThriftStruct
+public class NodeCacheProjection
+{
+    @ThriftField(1)
+    public GenericProjection projection;
+
+    public NodeCacheProjection()
+    {
+    }
+
+    public NodeCacheProjection(GenericProjection projection)
+    {
+        this.projection = projection;
+    }
+}

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/main/thrift/curator.thrift
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/thrift/curator.thrift b/curator-x-rpc/src/main/thrift/curator.thrift
index 2b5e115..6ed104d 100644
--- a/curator-x-rpc/src/main/thrift/curator.thrift
+++ b/curator-x-rpc/src/main/thrift/curator.thrift
@@ -12,7 +12,7 @@ enum CreateMode {
 }
 
 enum CuratorEventType {
-  PING, CREATE, DELETE, EXISTS, GET_DATA, SET_DATA, CHILDREN, SYNC, GET_ACL, SET_ACL, WATCHED, CLOSING, CONNECTION_CONNECTED, CONNECTION_SUSPENDED, CONNECTION_RECONNECTED, CONNECTION_LOST, CONNECTION_READ_ONLY, LEADER, PATH_CHILDREN_CACHE
+  PING, CREATE, DELETE, EXISTS, GET_DATA, SET_DATA, CHILDREN, SYNC, GET_ACL, SET_ACL, WATCHED, CLOSING, CONNECTION_CONNECTED, CONNECTION_SUSPENDED, CONNECTION_RECONNECTED, CONNECTION_LOST, CONNECTION_READ_ONLY, LEADER, PATH_CHILDREN_CACHE, NODE_CACHE
 }
 
 enum EventType {
@@ -58,6 +58,10 @@ struct LeaderProjection {
   1: GenericProjection projection;
 }
 
+struct NodeCacheProjection {
+  1: GenericProjection projection;
+}
+
 struct PathChildrenCacheProjection {
   1: GenericProjection projection;
 }
@@ -188,12 +192,14 @@ service CuratorService {
   OptionalChildrenList getChildren(1: CuratorProjection projection, 2: GetChildrenSpec spec);
   binary getData(1: CuratorProjection projection, 2: GetDataSpec spec);
   list<Participant> getLeaderParticipants(1: CuratorProjection projection, 2: LeaderProjection leaderProjection);
+  ChildData getNodeCacheData(1: CuratorProjection projection, 2: NodeCacheProjection cacheProjection);
   list<ChildData> getPathChildrenCacheData(1: CuratorProjection projection, 2: PathChildrenCacheProjection cacheProjection);
   ChildData getPathChildrenCacheDataForPath(1: CuratorProjection projection, 2: PathChildrenCacheProjection cacheProjection, 3: string path);
   bool isLeader(1: CuratorProjection projection, 2: LeaderProjection leaderProjection);
   CuratorProjection newCuratorProjection(1: string connectionName);
   Stat setData(1: CuratorProjection projection, 2: SetDataSpec spec);
   LeaderResult startLeaderSelector(1: CuratorProjection projection, 2: string path, 3: string participantId, 4: i32 waitForLeadershipMs);
+  NodeCacheProjection startNodeCache(1: CuratorProjection projection, 2: string path, 3: bool dataIsCompressed, 4: bool buildInitial);
   PathChildrenCacheProjection startPathChildrenCache(1: CuratorProjection projection, 2: string path, 3: bool cacheData, 4: bool dataIsCompressed, 5: PathChildrenCacheStartMode startMode);
 }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/985c9ed0/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEventType.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEventType.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEventType.java
index 46c57ae..08013ec 100644
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEventType.java
+++ b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEventType.java
@@ -30,7 +30,8 @@ public enum CuratorEventType implements org.apache.thrift.TEnum {
   CONNECTION_LOST(15),
   CONNECTION_READ_ONLY(16),
   LEADER(17),
-  PATH_CHILDREN_CACHE(18);
+  PATH_CHILDREN_CACHE(18),
+  NODE_CACHE(19);
 
   private final int value;
 
@@ -89,6 +90,8 @@ public enum CuratorEventType implements org.apache.thrift.TEnum {
         return LEADER;
       case 18:
         return PATH_CHILDREN_CACHE;
+      case 19:
+        return NODE_CACHE;
       default:
         return null;
     }