incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [7/8] Working on https://issues.apache.org/jira/browse/BLUR-42. Not tested yet, and no cancel implementation.
Date Tue, 29 Jan 2013 15:01:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
index 47d8976..d27a94b 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
@@ -234,35 +234,40 @@ public class Blur {
     public TableDescriptor describe(String table) throws BlurException, org.apache.thrift.TException;
 
     /**
-     * Cancels a query that is executing against the given table with the given uuid.
-     * NOTE, the cancel call maybe take some time for the query actually stops executing.
+     * Cancels a query that is executing within the given session.
      * @param session the Session.
-     * @param id the uuid of the query.
+     * @param server the server name to receive the call, null for all servers.
+     * @param id the id of the query, (QueryArgs.id).
      * 
      * @param session
+     * @param server
      * @param id
      */
-    public void cancelQuery(Session session, long id) throws BlurException, org.apache.thrift.TException;
+    public void cancelQuery(Session session, String server, String id) throws BlurException, org.apache.thrift.TException;
 
     /**
-     * Returns a list of the query ids of queries that have recently been executed for the given table.
+     * Returns a list of the query ids of queries that have recently been executed within the given session.
      * @param session the Session.
-     * @return the uuids of the query status objects.
+     * @param server the server name to receive the call, null for all servers.
+     * @return the ids of the query objects, (QueryArgs.id).
      * 
      * @param session
+     * @param server
      */
-    public List<Long> queryStatusIdList(Session session) throws BlurException, org.apache.thrift.TException;
+    public Map<String,List<String>> queryStatusIdList(Session session, String server) throws BlurException, org.apache.thrift.TException;
 
     /**
-     * Returns the query status for the given table and query uuid.
+     * Returns the query status for the given session and query id, (QueryArgs.id).
      * @param session the Session.
-     * @param id the uuid of the query.
-     * @return the query status for the given.
+     * @param server the server name to receive the call, null for all servers.
+     * @param id the id of the query, (QueryArgs.id).
+     * @return a map of server to the query status for the given session and id.
      * 
      * @param session
+     * @param server
      * @param id
      */
-    public QueryStatus queryStatus(Session session, long id) throws BlurException, org.apache.thrift.TException;
+    public Map<String,QueryStatus> queryStatus(Session session, String server, String id) throws BlurException, org.apache.thrift.TException;
 
     /**
      * Returns the the schema for the given session.
@@ -317,11 +322,11 @@ public class Blur {
 
     public void describe(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.describe_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void cancelQuery(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.thrift.TException;
+    public void cancelQuery(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void queryStatusIdList(Session session, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException;
+    public void queryStatusIdList(Session session, String server, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void queryStatus(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.queryStatus_call> resultHandler) throws org.apache.thrift.TException;
+    public void queryStatus(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.queryStatus_call> resultHandler) throws org.apache.thrift.TException;
 
     public void schema(Session session, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.schema_call> resultHandler) throws org.apache.thrift.TException;
 
@@ -832,16 +837,17 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "describe failed: unknown result");
     }
 
-    public void cancelQuery(Session session, long id) throws BlurException, org.apache.thrift.TException
+    public void cancelQuery(Session session, String server, String id) throws BlurException, org.apache.thrift.TException
     {
-      send_cancelQuery(session, id);
+      send_cancelQuery(session, server, id);
       recv_cancelQuery();
     }
 
-    public void send_cancelQuery(Session session, long id) throws org.apache.thrift.TException
+    public void send_cancelQuery(Session session, String server, String id) throws org.apache.thrift.TException
     {
       cancelQuery_args args = new cancelQuery_args();
       args.setSession(session);
+      args.setServer(server);
       args.setId(id);
       sendBase("cancelQuery", args);
     }
@@ -856,20 +862,21 @@ public class Blur {
       return;
     }
 
-    public List<Long> queryStatusIdList(Session session) throws BlurException, org.apache.thrift.TException
+    public Map<String,List<String>> queryStatusIdList(Session session, String server) throws BlurException, org.apache.thrift.TException
     {
-      send_queryStatusIdList(session);
+      send_queryStatusIdList(session, server);
       return recv_queryStatusIdList();
     }
 
-    public void send_queryStatusIdList(Session session) throws org.apache.thrift.TException
+    public void send_queryStatusIdList(Session session, String server) throws org.apache.thrift.TException
     {
       queryStatusIdList_args args = new queryStatusIdList_args();
       args.setSession(session);
+      args.setServer(server);
       sendBase("queryStatusIdList", args);
     }
 
-    public List<Long> recv_queryStatusIdList() throws BlurException, org.apache.thrift.TException
+    public Map<String,List<String>> recv_queryStatusIdList() throws BlurException, org.apache.thrift.TException
     {
       queryStatusIdList_result result = new queryStatusIdList_result();
       receiveBase(result, "queryStatusIdList");
@@ -882,21 +889,22 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "queryStatusIdList failed: unknown result");
     }
 
-    public QueryStatus queryStatus(Session session, long id) throws BlurException, org.apache.thrift.TException
+    public Map<String,QueryStatus> queryStatus(Session session, String server, String id) throws BlurException, org.apache.thrift.TException
     {
-      send_queryStatus(session, id);
+      send_queryStatus(session, server, id);
       return recv_queryStatus();
     }
 
-    public void send_queryStatus(Session session, long id) throws org.apache.thrift.TException
+    public void send_queryStatus(Session session, String server, String id) throws org.apache.thrift.TException
     {
       queryStatus_args args = new queryStatus_args();
       args.setSession(session);
+      args.setServer(server);
       args.setId(id);
       sendBase("queryStatus", args);
     }
 
-    public QueryStatus recv_queryStatus() throws BlurException, org.apache.thrift.TException
+    public Map<String,QueryStatus> recv_queryStatus() throws BlurException, org.apache.thrift.TException
     {
       queryStatus_result result = new queryStatus_result();
       receiveBase(result, "queryStatus");
@@ -1608,19 +1616,21 @@ public class Blur {
       }
     }
 
-    public void cancelQuery(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.thrift.TException {
+    public void cancelQuery(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      cancelQuery_call method_call = new cancelQuery_call(session, id, resultHandler, this, ___protocolFactory, ___transport);
+      cancelQuery_call method_call = new cancelQuery_call(session, server, id, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class cancelQuery_call extends org.apache.thrift.async.TAsyncMethodCall {
       private Session session;
-      private long id;
-      public cancelQuery_call(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String server;
+      private String id;
+      public cancelQuery_call(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> 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.session = session;
+        this.server = server;
         this.id = id;
       }
 
@@ -1628,6 +1638,7 @@ public class Blur {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("cancelQuery", org.apache.thrift.protocol.TMessageType.CALL, 0));
         cancelQuery_args args = new cancelQuery_args();
         args.setSession(session);
+        args.setServer(server);
         args.setId(id);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1643,29 +1654,32 @@ public class Blur {
       }
     }
 
-    public void queryStatusIdList(Session session, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException {
+    public void queryStatusIdList(Session session, String server, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      queryStatusIdList_call method_call = new queryStatusIdList_call(session, resultHandler, this, ___protocolFactory, ___transport);
+      queryStatusIdList_call method_call = new queryStatusIdList_call(session, server, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class queryStatusIdList_call extends org.apache.thrift.async.TAsyncMethodCall {
       private Session session;
-      public queryStatusIdList_call(Session session, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String server;
+      public queryStatusIdList_call(Session session, String server, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> 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.session = session;
+        this.server = server;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("queryStatusIdList", org.apache.thrift.protocol.TMessageType.CALL, 0));
         queryStatusIdList_args args = new queryStatusIdList_args();
         args.setSession(session);
+        args.setServer(server);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public List<Long> getResult() throws BlurException, org.apache.thrift.TException {
+      public Map<String,List<String>> getResult() throws BlurException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -1675,19 +1689,21 @@ public class Blur {
       }
     }
 
-    public void queryStatus(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<queryStatus_call> resultHandler) throws org.apache.thrift.TException {
+    public void queryStatus(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<queryStatus_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      queryStatus_call method_call = new queryStatus_call(session, id, resultHandler, this, ___protocolFactory, ___transport);
+      queryStatus_call method_call = new queryStatus_call(session, server, id, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class queryStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
       private Session session;
-      private long id;
-      public queryStatus_call(Session session, long id, org.apache.thrift.async.AsyncMethodCallback<queryStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String server;
+      private String id;
+      public queryStatus_call(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<queryStatus_call> 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.session = session;
+        this.server = server;
         this.id = id;
       }
 
@@ -1695,12 +1711,13 @@ public class Blur {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("queryStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
         queryStatus_args args = new queryStatus_args();
         args.setSession(session);
+        args.setServer(server);
         args.setId(id);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public QueryStatus getResult() throws BlurException, org.apache.thrift.TException {
+      public Map<String,QueryStatus> getResult() throws BlurException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -2287,7 +2304,7 @@ public class Blur {
       public cancelQuery_result getResult(I iface, cancelQuery_args args) throws org.apache.thrift.TException {
         cancelQuery_result result = new cancelQuery_result();
         try {
-          iface.cancelQuery(args.session, args.id);
+          iface.cancelQuery(args.session, args.server, args.id);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2311,7 +2328,7 @@ public class Blur {
       public queryStatusIdList_result getResult(I iface, queryStatusIdList_args args) throws org.apache.thrift.TException {
         queryStatusIdList_result result = new queryStatusIdList_result();
         try {
-          result.success = iface.queryStatusIdList(args.session);
+          result.success = iface.queryStatusIdList(args.session, args.server);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2335,7 +2352,7 @@ public class Blur {
       public queryStatus_result getResult(I iface, queryStatus_args args) throws org.apache.thrift.TException {
         queryStatus_result result = new queryStatus_result();
         try {
-          result.success = iface.queryStatus(args.session, args.id);
+          result.success = iface.queryStatus(args.session, args.server, args.id);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -4058,14 +4075,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list118 = iprot.readListBegin();
-                  struct.success = new ArrayList<TopFieldDocs>(_list118.size);
-                  for (int _i119 = 0; _i119 < _list118.size; ++_i119)
+                  org.apache.thrift.protocol.TList _list108 = iprot.readListBegin();
+                  struct.success = new ArrayList<TopFieldDocs>(_list108.size);
+                  for (int _i109 = 0; _i109 < _list108.size; ++_i109)
                   {
-                    TopFieldDocs _elem120; // required
-                    _elem120 = new TopFieldDocs();
-                    _elem120.read(iprot);
-                    struct.success.add(_elem120);
+                    TopFieldDocs _elem110; // required
+                    _elem110 = new TopFieldDocs();
+                    _elem110.read(iprot);
+                    struct.success.add(_elem110);
                   }
                   iprot.readListEnd();
                 }
@@ -4102,9 +4119,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (TopFieldDocs _iter121 : struct.success)
+            for (TopFieldDocs _iter111 : struct.success)
             {
-              _iter121.write(oprot);
+              _iter111.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -4143,9 +4160,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (TopFieldDocs _iter122 : struct.success)
+            for (TopFieldDocs _iter112 : struct.success)
             {
-              _iter122.write(oprot);
+              _iter112.write(oprot);
             }
           }
         }
@@ -4160,14 +4177,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list123 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<TopFieldDocs>(_list123.size);
-            for (int _i124 = 0; _i124 < _list123.size; ++_i124)
+            org.apache.thrift.protocol.TList _list113 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<TopFieldDocs>(_list113.size);
+            for (int _i114 = 0; _i114 < _list113.size; ++_i114)
             {
-              TopFieldDocs _elem125; // required
-              _elem125 = new TopFieldDocs();
-              _elem125.read(iprot);
-              struct.success.add(_elem125);
+              TopFieldDocs _elem115; // required
+              _elem115 = new TopFieldDocs();
+              _elem115.read(iprot);
+              struct.success.add(_elem115);
             }
           }
           struct.setSuccessIsSet(true);
@@ -4677,13 +4694,13 @@ public class Blur {
             case 2: // DOC_LOCATIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list126 = iprot.readListBegin();
-                  struct.docLocations = new ArrayList<Long>(_list126.size);
-                  for (int _i127 = 0; _i127 < _list126.size; ++_i127)
+                  org.apache.thrift.protocol.TList _list116 = iprot.readListBegin();
+                  struct.docLocations = new ArrayList<Long>(_list116.size);
+                  for (int _i117 = 0; _i117 < _list116.size; ++_i117)
                   {
-                    long _elem128; // required
-                    _elem128 = iprot.readI64();
-                    struct.docLocations.add(_elem128);
+                    long _elem118; // required
+                    _elem118 = iprot.readI64();
+                    struct.docLocations.add(_elem118);
                   }
                   iprot.readListEnd();
                 }
@@ -4695,13 +4712,13 @@ public class Blur {
             case 4: // FIELDS
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set129 = iprot.readSetBegin();
-                  struct.fields = new HashSet<String>(2*_set129.size);
-                  for (int _i130 = 0; _i130 < _set129.size; ++_i130)
+                  org.apache.thrift.protocol.TSet _set119 = iprot.readSetBegin();
+                  struct.fields = new HashSet<String>(2*_set119.size);
+                  for (int _i120 = 0; _i120 < _set119.size; ++_i120)
                   {
-                    String _elem131; // required
-                    _elem131 = iprot.readString();
-                    struct.fields.add(_elem131);
+                    String _elem121; // required
+                    _elem121 = iprot.readString();
+                    struct.fields.add(_elem121);
                   }
                   iprot.readSetEnd();
                 }
@@ -4734,9 +4751,9 @@ public class Blur {
           oprot.writeFieldBegin(DOC_LOCATIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.docLocations.size()));
-            for (long _iter132 : struct.docLocations)
+            for (long _iter122 : struct.docLocations)
             {
-              oprot.writeI64(_iter132);
+              oprot.writeI64(_iter122);
             }
             oprot.writeListEnd();
           }
@@ -4746,9 +4763,9 @@ public class Blur {
           oprot.writeFieldBegin(FIELDS_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.fields.size()));
-            for (String _iter133 : struct.fields)
+            for (String _iter123 : struct.fields)
             {
-              oprot.writeString(_iter133);
+              oprot.writeString(_iter123);
             }
             oprot.writeSetEnd();
           }
@@ -4788,18 +4805,18 @@ public class Blur {
         if (struct.isSetDocLocations()) {
           {
             oprot.writeI32(struct.docLocations.size());
-            for (long _iter134 : struct.docLocations)
+            for (long _iter124 : struct.docLocations)
             {
-              oprot.writeI64(_iter134);
+              oprot.writeI64(_iter124);
             }
           }
         }
         if (struct.isSetFields()) {
           {
             oprot.writeI32(struct.fields.size());
-            for (String _iter135 : struct.fields)
+            for (String _iter125 : struct.fields)
             {
-              oprot.writeString(_iter135);
+              oprot.writeString(_iter125);
             }
           }
         }
@@ -4816,26 +4833,26 @@ public class Blur {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list136 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-            struct.docLocations = new ArrayList<Long>(_list136.size);
-            for (int _i137 = 0; _i137 < _list136.size; ++_i137)
+            org.apache.thrift.protocol.TList _list126 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            struct.docLocations = new ArrayList<Long>(_list126.size);
+            for (int _i127 = 0; _i127 < _list126.size; ++_i127)
             {
-              long _elem138; // required
-              _elem138 = iprot.readI64();
-              struct.docLocations.add(_elem138);
+              long _elem128; // required
+              _elem128 = iprot.readI64();
+              struct.docLocations.add(_elem128);
             }
           }
           struct.setDocLocationsIsSet(true);
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TSet _set139 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.fields = new HashSet<String>(2*_set139.size);
-            for (int _i140 = 0; _i140 < _set139.size; ++_i140)
+            org.apache.thrift.protocol.TSet _set129 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.fields = new HashSet<String>(2*_set129.size);
+            for (int _i130 = 0; _i130 < _set129.size; ++_i130)
             {
-              String _elem141; // required
-              _elem141 = iprot.readString();
-              struct.fields.add(_elem141);
+              String _elem131; // required
+              _elem131 = iprot.readString();
+              struct.fields.add(_elem131);
             }
           }
           struct.setFieldsIsSet(true);
@@ -5231,14 +5248,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list142 = iprot.readListBegin();
-                  struct.success = new ArrayList<Document>(_list142.size);
-                  for (int _i143 = 0; _i143 < _list142.size; ++_i143)
+                  org.apache.thrift.protocol.TList _list132 = iprot.readListBegin();
+                  struct.success = new ArrayList<Document>(_list132.size);
+                  for (int _i133 = 0; _i133 < _list132.size; ++_i133)
                   {
-                    Document _elem144; // required
-                    _elem144 = new Document();
-                    _elem144.read(iprot);
-                    struct.success.add(_elem144);
+                    Document _elem134; // required
+                    _elem134 = new Document();
+                    _elem134.read(iprot);
+                    struct.success.add(_elem134);
                   }
                   iprot.readListEnd();
                 }
@@ -5275,9 +5292,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Document _iter145 : struct.success)
+            for (Document _iter135 : struct.success)
             {
-              _iter145.write(oprot);
+              _iter135.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -5316,9 +5333,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Document _iter146 : struct.success)
+            for (Document _iter136 : struct.success)
             {
-              _iter146.write(oprot);
+              _iter136.write(oprot);
             }
           }
         }
@@ -5333,14 +5350,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list147 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Document>(_list147.size);
-            for (int _i148 = 0; _i148 < _list147.size; ++_i148)
+            org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Document>(_list137.size);
+            for (int _i138 = 0; _i138 < _list137.size; ++_i138)
             {
-              Document _elem149; // required
-              _elem149 = new Document();
-              _elem149.read(iprot);
-              struct.success.add(_elem149);
+              Document _elem139; // required
+              _elem139 = new Document();
+              _elem139.read(iprot);
+              struct.success.add(_elem139);
             }
           }
           struct.setSuccessIsSet(true);
@@ -6468,14 +6485,14 @@ public class Blur {
             case 2: // DOCUMENTS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list150 = iprot.readListBegin();
-                  struct.documents = new ArrayList<Document>(_list150.size);
-                  for (int _i151 = 0; _i151 < _list150.size; ++_i151)
+                  org.apache.thrift.protocol.TList _list140 = iprot.readListBegin();
+                  struct.documents = new ArrayList<Document>(_list140.size);
+                  for (int _i141 = 0; _i141 < _list140.size; ++_i141)
                   {
-                    Document _elem152; // required
-                    _elem152 = new Document();
-                    _elem152.read(iprot);
-                    struct.documents.add(_elem152);
+                    Document _elem142; // required
+                    _elem142 = new Document();
+                    _elem142.read(iprot);
+                    struct.documents.add(_elem142);
                   }
                   iprot.readListEnd();
                 }
@@ -6508,9 +6525,9 @@ public class Blur {
           oprot.writeFieldBegin(DOCUMENTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.documents.size()));
-            for (Document _iter153 : struct.documents)
+            for (Document _iter143 : struct.documents)
             {
-              _iter153.write(oprot);
+              _iter143.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -6547,9 +6564,9 @@ public class Blur {
         if (struct.isSetDocuments()) {
           {
             oprot.writeI32(struct.documents.size());
-            for (Document _iter154 : struct.documents)
+            for (Document _iter144 : struct.documents)
             {
-              _iter154.write(oprot);
+              _iter144.write(oprot);
             }
           }
         }
@@ -6566,14 +6583,14 @@ public class Blur {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list155 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.documents = new ArrayList<Document>(_list155.size);
-            for (int _i156 = 0; _i156 < _list155.size; ++_i156)
+            org.apache.thrift.protocol.TList _list145 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.documents = new ArrayList<Document>(_list145.size);
+            for (int _i146 = 0; _i146 < _list145.size; ++_i146)
             {
-              Document _elem157; // required
-              _elem157 = new Document();
-              _elem157.read(iprot);
-              struct.documents.add(_elem157);
+              Document _elem147; // required
+              _elem147 = new Document();
+              _elem147.read(iprot);
+              struct.documents.add(_elem147);
             }
           }
           struct.setDocumentsIsSet(true);
@@ -6969,14 +6986,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list158 = iprot.readListBegin();
-                  struct.success = new ArrayList<Generation>(_list158.size);
-                  for (int _i159 = 0; _i159 < _list158.size; ++_i159)
+                  org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
+                  struct.success = new ArrayList<Generation>(_list148.size);
+                  for (int _i149 = 0; _i149 < _list148.size; ++_i149)
                   {
-                    Generation _elem160; // required
-                    _elem160 = new Generation();
-                    _elem160.read(iprot);
-                    struct.success.add(_elem160);
+                    Generation _elem150; // required
+                    _elem150 = new Generation();
+                    _elem150.read(iprot);
+                    struct.success.add(_elem150);
                   }
                   iprot.readListEnd();
                 }
@@ -7013,9 +7030,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Generation _iter161 : struct.success)
+            for (Generation _iter151 : struct.success)
             {
-              _iter161.write(oprot);
+              _iter151.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7054,9 +7071,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Generation _iter162 : struct.success)
+            for (Generation _iter152 : struct.success)
             {
-              _iter162.write(oprot);
+              _iter152.write(oprot);
             }
           }
         }
@@ -7071,14 +7088,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list163 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Generation>(_list163.size);
-            for (int _i164 = 0; _i164 < _list163.size; ++_i164)
+            org.apache.thrift.protocol.TList _list153 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Generation>(_list153.size);
+            for (int _i154 = 0; _i154 < _list153.size; ++_i154)
             {
-              Generation _elem165; // required
-              _elem165 = new Generation();
-              _elem165.read(iprot);
-              struct.success.add(_elem165);
+              Generation _elem155; // required
+              _elem155 = new Generation();
+              _elem155.read(iprot);
+              struct.success.add(_elem155);
             }
           }
           struct.setSuccessIsSet(true);
@@ -7491,14 +7508,14 @@ public class Blur {
             case 2: // QUERIES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list166 = iprot.readListBegin();
-                  struct.queries = new ArrayList<Query>(_list166.size);
-                  for (int _i167 = 0; _i167 < _list166.size; ++_i167)
+                  org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
+                  struct.queries = new ArrayList<Query>(_list156.size);
+                  for (int _i157 = 0; _i157 < _list156.size; ++_i157)
                   {
-                    Query _elem168; // required
-                    _elem168 = new Query();
-                    _elem168.read(iprot);
-                    struct.queries.add(_elem168);
+                    Query _elem158; // required
+                    _elem158 = new Query();
+                    _elem158.read(iprot);
+                    struct.queries.add(_elem158);
                   }
                   iprot.readListEnd();
                 }
@@ -7531,9 +7548,9 @@ public class Blur {
           oprot.writeFieldBegin(QUERIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.queries.size()));
-            for (Query _iter169 : struct.queries)
+            for (Query _iter159 : struct.queries)
             {
-              _iter169.write(oprot);
+              _iter159.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7570,9 +7587,9 @@ public class Blur {
         if (struct.isSetQueries()) {
           {
             oprot.writeI32(struct.queries.size());
-            for (Query _iter170 : struct.queries)
+            for (Query _iter160 : struct.queries)
             {
-              _iter170.write(oprot);
+              _iter160.write(oprot);
             }
           }
         }
@@ -7589,14 +7606,14 @@ public class Blur {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list171 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.queries = new ArrayList<Query>(_list171.size);
-            for (int _i172 = 0; _i172 < _list171.size; ++_i172)
+            org.apache.thrift.protocol.TList _list161 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.queries = new ArrayList<Query>(_list161.size);
+            for (int _i162 = 0; _i162 < _list161.size; ++_i162)
             {
-              Query _elem173; // required
-              _elem173 = new Query();
-              _elem173.read(iprot);
-              struct.queries.add(_elem173);
+              Query _elem163; // required
+              _elem163 = new Query();
+              _elem163.read(iprot);
+              struct.queries.add(_elem163);
             }
           }
           struct.setQueriesIsSet(true);
@@ -7992,14 +8009,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list174 = iprot.readListBegin();
-                  struct.success = new ArrayList<Generation>(_list174.size);
-                  for (int _i175 = 0; _i175 < _list174.size; ++_i175)
+                  org.apache.thrift.protocol.TList _list164 = iprot.readListBegin();
+                  struct.success = new ArrayList<Generation>(_list164.size);
+                  for (int _i165 = 0; _i165 < _list164.size; ++_i165)
                   {
-                    Generation _elem176; // required
-                    _elem176 = new Generation();
-                    _elem176.read(iprot);
-                    struct.success.add(_elem176);
+                    Generation _elem166; // required
+                    _elem166 = new Generation();
+                    _elem166.read(iprot);
+                    struct.success.add(_elem166);
                   }
                   iprot.readListEnd();
                 }
@@ -8036,9 +8053,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Generation _iter177 : struct.success)
+            for (Generation _iter167 : struct.success)
             {
-              _iter177.write(oprot);
+              _iter167.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -8077,9 +8094,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Generation _iter178 : struct.success)
+            for (Generation _iter168 : struct.success)
             {
-              _iter178.write(oprot);
+              _iter168.write(oprot);
             }
           }
         }
@@ -8094,14 +8111,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list179 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Generation>(_list179.size);
-            for (int _i180 = 0; _i180 < _list179.size; ++_i180)
+            org.apache.thrift.protocol.TList _list169 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Generation>(_list169.size);
+            for (int _i170 = 0; _i170 < _list169.size; ++_i170)
             {
-              Generation _elem181; // required
-              _elem181 = new Generation();
-              _elem181.read(iprot);
-              struct.success.add(_elem181);
+              Generation _elem171; // required
+              _elem171 = new Generation();
+              _elem171.read(iprot);
+              struct.success.add(_elem171);
             }
           }
           struct.setSuccessIsSet(true);
@@ -8514,14 +8531,14 @@ public class Blur {
             case 2: // TERMS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list182 = iprot.readListBegin();
-                  struct.terms = new ArrayList<Term>(_list182.size);
-                  for (int _i183 = 0; _i183 < _list182.size; ++_i183)
+                  org.apache.thrift.protocol.TList _list172 = iprot.readListBegin();
+                  struct.terms = new ArrayList<Term>(_list172.size);
+                  for (int _i173 = 0; _i173 < _list172.size; ++_i173)
                   {
-                    Term _elem184; // required
-                    _elem184 = new Term();
-                    _elem184.read(iprot);
-                    struct.terms.add(_elem184);
+                    Term _elem174; // required
+                    _elem174 = new Term();
+                    _elem174.read(iprot);
+                    struct.terms.add(_elem174);
                   }
                   iprot.readListEnd();
                 }
@@ -8554,9 +8571,9 @@ public class Blur {
           oprot.writeFieldBegin(TERMS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.terms.size()));
-            for (Term _iter185 : struct.terms)
+            for (Term _iter175 : struct.terms)
             {
-              _iter185.write(oprot);
+              _iter175.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -8593,9 +8610,9 @@ public class Blur {
         if (struct.isSetTerms()) {
           {
             oprot.writeI32(struct.terms.size());
-            for (Term _iter186 : struct.terms)
+            for (Term _iter176 : struct.terms)
             {
-              _iter186.write(oprot);
+              _iter176.write(oprot);
             }
           }
         }
@@ -8612,14 +8629,14 @@ public class Blur {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list187 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.terms = new ArrayList<Term>(_list187.size);
-            for (int _i188 = 0; _i188 < _list187.size; ++_i188)
+            org.apache.thrift.protocol.TList _list177 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.terms = new ArrayList<Term>(_list177.size);
+            for (int _i178 = 0; _i178 < _list177.size; ++_i178)
             {
-              Term _elem189; // required
-              _elem189 = new Term();
-              _elem189.read(iprot);
-              struct.terms.add(_elem189);
+              Term _elem179; // required
+              _elem179 = new Term();
+              _elem179.read(iprot);
+              struct.terms.add(_elem179);
             }
           }
           struct.setTermsIsSet(true);
@@ -9015,14 +9032,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list190 = iprot.readListBegin();
-                  struct.success = new ArrayList<Generation>(_list190.size);
-                  for (int _i191 = 0; _i191 < _list190.size; ++_i191)
+                  org.apache.thrift.protocol.TList _list180 = iprot.readListBegin();
+                  struct.success = new ArrayList<Generation>(_list180.size);
+                  for (int _i181 = 0; _i181 < _list180.size; ++_i181)
                   {
-                    Generation _elem192; // required
-                    _elem192 = new Generation();
-                    _elem192.read(iprot);
-                    struct.success.add(_elem192);
+                    Generation _elem182; // required
+                    _elem182 = new Generation();
+                    _elem182.read(iprot);
+                    struct.success.add(_elem182);
                   }
                   iprot.readListEnd();
                 }
@@ -9059,9 +9076,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Generation _iter193 : struct.success)
+            for (Generation _iter183 : struct.success)
             {
-              _iter193.write(oprot);
+              _iter183.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -9100,9 +9117,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Generation _iter194 : struct.success)
+            for (Generation _iter184 : struct.success)
             {
-              _iter194.write(oprot);
+              _iter184.write(oprot);
             }
           }
         }
@@ -9117,14 +9134,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list195 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Generation>(_list195.size);
-            for (int _i196 = 0; _i196 < _list195.size; ++_i196)
+            org.apache.thrift.protocol.TList _list185 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Generation>(_list185.size);
+            for (int _i186 = 0; _i186 < _list185.size; ++_i186)
             {
-              Generation _elem197; // required
-              _elem197 = new Generation();
-              _elem197.read(iprot);
-              struct.success.add(_elem197);
+              Generation _elem187; // required
+              _elem187 = new Generation();
+              _elem187.read(iprot);
+              struct.success.add(_elem187);
             }
           }
           struct.setSuccessIsSet(true);
@@ -9537,14 +9554,14 @@ public class Blur {
             case 2: // UPDATE_PACKAGES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list198 = iprot.readListBegin();
-                  struct.updatePackages = new ArrayList<UpdatePackage>(_list198.size);
-                  for (int _i199 = 0; _i199 < _list198.size; ++_i199)
+                  org.apache.thrift.protocol.TList _list188 = iprot.readListBegin();
+                  struct.updatePackages = new ArrayList<UpdatePackage>(_list188.size);
+                  for (int _i189 = 0; _i189 < _list188.size; ++_i189)
                   {
-                    UpdatePackage _elem200; // required
-                    _elem200 = new UpdatePackage();
-                    _elem200.read(iprot);
-                    struct.updatePackages.add(_elem200);
+                    UpdatePackage _elem190; // required
+                    _elem190 = new UpdatePackage();
+                    _elem190.read(iprot);
+                    struct.updatePackages.add(_elem190);
                   }
                   iprot.readListEnd();
                 }
@@ -9577,9 +9594,9 @@ public class Blur {
           oprot.writeFieldBegin(UPDATE_PACKAGES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.updatePackages.size()));
-            for (UpdatePackage _iter201 : struct.updatePackages)
+            for (UpdatePackage _iter191 : struct.updatePackages)
             {
-              _iter201.write(oprot);
+              _iter191.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -9616,9 +9633,9 @@ public class Blur {
         if (struct.isSetUpdatePackages()) {
           {
             oprot.writeI32(struct.updatePackages.size());
-            for (UpdatePackage _iter202 : struct.updatePackages)
+            for (UpdatePackage _iter192 : struct.updatePackages)
             {
-              _iter202.write(oprot);
+              _iter192.write(oprot);
             }
           }
         }
@@ -9635,14 +9652,14 @@ public class Blur {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list203 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.updatePackages = new ArrayList<UpdatePackage>(_list203.size);
-            for (int _i204 = 0; _i204 < _list203.size; ++_i204)
+            org.apache.thrift.protocol.TList _list193 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.updatePackages = new ArrayList<UpdatePackage>(_list193.size);
+            for (int _i194 = 0; _i194 < _list193.size; ++_i194)
             {
-              UpdatePackage _elem205; // required
-              _elem205 = new UpdatePackage();
-              _elem205.read(iprot);
-              struct.updatePackages.add(_elem205);
+              UpdatePackage _elem195; // required
+              _elem195 = new UpdatePackage();
+              _elem195.read(iprot);
+              struct.updatePackages.add(_elem195);
             }
           }
           struct.setUpdatePackagesIsSet(true);
@@ -10038,14 +10055,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list206 = iprot.readListBegin();
-                  struct.success = new ArrayList<Generation>(_list206.size);
-                  for (int _i207 = 0; _i207 < _list206.size; ++_i207)
+                  org.apache.thrift.protocol.TList _list196 = iprot.readListBegin();
+                  struct.success = new ArrayList<Generation>(_list196.size);
+                  for (int _i197 = 0; _i197 < _list196.size; ++_i197)
                   {
-                    Generation _elem208; // required
-                    _elem208 = new Generation();
-                    _elem208.read(iprot);
-                    struct.success.add(_elem208);
+                    Generation _elem198; // required
+                    _elem198 = new Generation();
+                    _elem198.read(iprot);
+                    struct.success.add(_elem198);
                   }
                   iprot.readListEnd();
                 }
@@ -10082,9 +10099,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Generation _iter209 : struct.success)
+            for (Generation _iter199 : struct.success)
             {
-              _iter209.write(oprot);
+              _iter199.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -10123,9 +10140,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Generation _iter210 : struct.success)
+            for (Generation _iter200 : struct.success)
             {
-              _iter210.write(oprot);
+              _iter200.write(oprot);
             }
           }
         }
@@ -10140,14 +10157,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list211 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Generation>(_list211.size);
-            for (int _i212 = 0; _i212 < _list211.size; ++_i212)
+            org.apache.thrift.protocol.TList _list201 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Generation>(_list201.size);
+            for (int _i202 = 0; _i202 < _list201.size; ++_i202)
             {
-              Generation _elem213; // required
-              _elem213 = new Generation();
-              _elem213.read(iprot);
-              struct.success.add(_elem213);
+              Generation _elem203; // required
+              _elem203 = new Generation();
+              _elem203.read(iprot);
+              struct.success.add(_elem203);
             }
           }
           struct.setSuccessIsSet(true);
@@ -10548,14 +10565,14 @@ public class Blur {
             case 1: // GENERATIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list214 = iprot.readListBegin();
-                  struct.generations = new ArrayList<Generation>(_list214.size);
-                  for (int _i215 = 0; _i215 < _list214.size; ++_i215)
+                  org.apache.thrift.protocol.TList _list204 = iprot.readListBegin();
+                  struct.generations = new ArrayList<Generation>(_list204.size);
+                  for (int _i205 = 0; _i205 < _list204.size; ++_i205)
                   {
-                    Generation _elem216; // required
-                    _elem216 = new Generation();
-                    _elem216.read(iprot);
-                    struct.generations.add(_elem216);
+                    Generation _elem206; // required
+                    _elem206 = new Generation();
+                    _elem206.read(iprot);
+                    struct.generations.add(_elem206);
                   }
                   iprot.readListEnd();
                 }
@@ -10591,9 +10608,9 @@ public class Blur {
           oprot.writeFieldBegin(GENERATIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.generations.size()));
-            for (Generation _iter217 : struct.generations)
+            for (Generation _iter207 : struct.generations)
             {
-              _iter217.write(oprot);
+              _iter207.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -10630,9 +10647,9 @@ public class Blur {
         if (struct.isSetGenerations()) {
           {
             oprot.writeI32(struct.generations.size());
-            for (Generation _iter218 : struct.generations)
+            for (Generation _iter208 : struct.generations)
             {
-              _iter218.write(oprot);
+              _iter208.write(oprot);
             }
           }
         }
@@ -10647,14 +10664,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list219 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.generations = new ArrayList<Generation>(_list219.size);
-            for (int _i220 = 0; _i220 < _list219.size; ++_i220)
+            org.apache.thrift.protocol.TList _list209 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.generations = new ArrayList<Generation>(_list209.size);
+            for (int _i210 = 0; _i210 < _list209.size; ++_i210)
             {
-              Generation _elem221; // required
-              _elem221 = new Generation();
-              _elem221.read(iprot);
-              struct.generations.add(_elem221);
+              Generation _elem211; // required
+              _elem211 = new Generation();
+              _elem211.read(iprot);
+              struct.generations.add(_elem211);
             }
           }
           struct.setGenerationsIsSet(true);
@@ -11656,13 +11673,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list222 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list222.size);
-                  for (int _i223 = 0; _i223 < _list222.size; ++_i223)
+                  org.apache.thrift.protocol.TList _list212 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list212.size);
+                  for (int _i213 = 0; _i213 < _list212.size; ++_i213)
                   {
-                    String _elem224; // required
-                    _elem224 = iprot.readString();
-                    struct.success.add(_elem224);
+                    String _elem214; // required
+                    _elem214 = iprot.readString();
+                    struct.success.add(_elem214);
                   }
                   iprot.readListEnd();
                 }
@@ -11699,9 +11716,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter225 : struct.success)
+            for (String _iter215 : struct.success)
             {
-              oprot.writeString(_iter225);
+              oprot.writeString(_iter215);
             }
             oprot.writeListEnd();
           }
@@ -11740,9 +11757,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter226 : struct.success)
+            for (String _iter216 : struct.success)
             {
-              oprot.writeString(_iter226);
+              oprot.writeString(_iter216);
             }
           }
         }
@@ -11757,13 +11774,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list227.size);
-            for (int _i228 = 0; _i228 < _list227.size; ++_i228)
+            org.apache.thrift.protocol.TList _list217 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list217.size);
+            for (int _i218 = 0; _i218 < _list217.size; ++_i218)
             {
-              String _elem229; // required
-              _elem229 = iprot.readString();
-              struct.success.add(_elem229);
+              String _elem219; // required
+              _elem219 = iprot.readString();
+              struct.success.add(_elem219);
             }
           }
           struct.setSuccessIsSet(true);
@@ -12618,13 +12635,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list230 = iprot.readListBegin();
-                  struct.success = new ArrayList<Integer>(_list230.size);
-                  for (int _i231 = 0; _i231 < _list230.size; ++_i231)
+                  org.apache.thrift.protocol.TList _list220 = iprot.readListBegin();
+                  struct.success = new ArrayList<Integer>(_list220.size);
+                  for (int _i221 = 0; _i221 < _list220.size; ++_i221)
                   {
-                    int _elem232; // required
-                    _elem232 = iprot.readI32();
-                    struct.success.add(_elem232);
+                    int _elem222; // required
+                    _elem222 = iprot.readI32();
+                    struct.success.add(_elem222);
                   }
                   iprot.readListEnd();
                 }
@@ -12661,9 +12678,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.success.size()));
-            for (int _iter233 : struct.success)
+            for (int _iter223 : struct.success)
             {
-              oprot.writeI32(_iter233);
+              oprot.writeI32(_iter223);
             }
             oprot.writeListEnd();
           }
@@ -12702,9 +12719,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (int _iter234 : struct.success)
+            for (int _iter224 : struct.success)
             {
-              oprot.writeI32(_iter234);
+              oprot.writeI32(_iter224);
             }
           }
         }
@@ -12719,13 +12736,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list235 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.success = new ArrayList<Integer>(_list235.size);
-            for (int _i236 = 0; _i236 < _list235.size; ++_i236)
+            org.apache.thrift.protocol.TList _list225 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+            struct.success = new ArrayList<Integer>(_list225.size);
+            for (int _i226 = 0; _i226 < _list225.size; ++_i226)
             {
-              int _elem237; // required
-              _elem237 = iprot.readI32();
-              struct.success.add(_elem237);
+              int _elem227; // required
+              _elem227 = iprot.readI32();
+              struct.success.add(_elem227);
             }
           }
           struct.setSuccessIsSet(true);
@@ -13485,16 +13502,16 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map238 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,ShardLayout>(2*_map238.size);
-                  for (int _i239 = 0; _i239 < _map238.size; ++_i239)
+                  org.apache.thrift.protocol.TMap _map228 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,ShardLayout>(2*_map228.size);
+                  for (int _i229 = 0; _i229 < _map228.size; ++_i229)
                   {
-                    String _key240; // required
-                    ShardLayout _val241; // optional
-                    _key240 = iprot.readString();
-                    _val241 = new ShardLayout();
-                    _val241.read(iprot);
-                    struct.success.put(_key240, _val241);
+                    String _key230; // required
+                    ShardLayout _val231; // optional
+                    _key230 = iprot.readString();
+                    _val231 = new ShardLayout();
+                    _val231.read(iprot);
+                    struct.success.put(_key230, _val231);
                   }
                   iprot.readMapEnd();
                 }
@@ -13531,10 +13548,10 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Map.Entry<String, ShardLayout> _iter242 : struct.success.entrySet())
+            for (Map.Entry<String, ShardLayout> _iter232 : struct.success.entrySet())
             {
-              oprot.writeString(_iter242.getKey());
-              _iter242.getValue().write(oprot);
+              oprot.writeString(_iter232.getKey());
+              _iter232.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -13573,10 +13590,10 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, ShardLayout> _iter243 : struct.success.entrySet())
+            for (Map.Entry<String, ShardLayout> _iter233 : struct.success.entrySet())
             {
-              oprot.writeString(_iter243.getKey());
-              _iter243.getValue().write(oprot);
+              oprot.writeString(_iter233.getKey());
+              _iter233.getValue().write(oprot);
             }
           }
         }
@@ -13591,16 +13608,16 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map244 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new HashMap<String,ShardLayout>(2*_map244.size);
-            for (int _i245 = 0; _i245 < _map244.size; ++_i245)
+            org.apache.thrift.protocol.TMap _map234 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new HashMap<String,ShardLayout>(2*_map234.size);
+            for (int _i235 = 0; _i235 < _map234.size; ++_i235)
             {
-              String _key246; // required
-              ShardLayout _val247; // optional
-              _key246 = iprot.readString();
-              _val247 = new ShardLayout();
-              _val247.read(iprot);
-              struct.success.put(_key246, _val247);
+              String _key236; // required
+              ShardLayout _val237; // optional
+              _key236 = iprot.readString();
+              _val237 = new ShardLayout();
+              _val237.read(iprot);
+              struct.success.put(_key236, _val237);
             }
           }
           struct.setSuccessIsSet(true);
@@ -14247,13 +14264,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list248 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list248.size);
-                  for (int _i249 = 0; _i249 < _list248.size; ++_i249)
+                  org.apache.thrift.protocol.TList _list238 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list238.size);
+                  for (int _i239 = 0; _i239 < _list238.size; ++_i239)
                   {
-                    String _elem250; // required
-                    _elem250 = iprot.readString();
-                    struct.success.add(_elem250);
+                    String _elem240; // required
+                    _elem240 = iprot.readString();
+                    struct.success.add(_elem240);
                   }
                   iprot.readListEnd();
                 }
@@ -14290,9 +14307,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter251 : struct.success)
+            for (String _iter241 : struct.success)
             {
-              oprot.writeString(_iter251);
+              oprot.writeString(_iter241);
             }
             oprot.writeListEnd();
           }
@@ -14331,9 +14348,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter252 : struct.success)
+            for (String _iter242 : struct.success)
             {
-              oprot.writeString(_iter252);
+              oprot.writeString(_iter242);
             }
           }
         }
@@ -14348,13 +14365,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list253 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list253.size);
-            for (int _i254 = 0; _i254 < _list253.size; ++_i254)
+            org.apache.thrift.protocol.TList _list243 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list243.size);
+            for (int _i244 = 0; _i244 < _list243.size; ++_i244)
             {
-              String _elem255; // required
-              _elem255 = iprot.readString();
-              struct.success.add(_elem255);
+              String _elem245; // required
+              _elem245 = iprot.readString();
+              struct.success.add(_elem245);
             }
           }
           struct.setSuccessIsSet(true);
@@ -18833,7 +18850,8 @@ public class Blur {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancelQuery_args");
 
     private static final org.apache.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("session", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)2);
+    private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -18842,12 +18860,14 @@ public class Blur {
     }
 
     public Session session; // required
-    public long id; // required
+    public String server; // required
+    public String id; // 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 {
       SESSION((short)1, "session"),
-      ID((short)2, "id");
+      SERVER((short)2, "server"),
+      ID((short)3, "id");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -18864,7 +18884,9 @@ public class Blur {
         switch(fieldId) {
           case 1: // SESSION
             return SESSION;
-          case 2: // ID
+          case 2: // SERVER
+            return SERVER;
+          case 3: // ID
             return ID;
           default:
             return null;
@@ -18906,15 +18928,15 @@ public class Blur {
     }
 
     // isset id assignments
-    private static final int __ID_ISSET_ID = 0;
-    private byte __isset_bitfield = 0;
     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.SESSION, new org.apache.thrift.meta_data.FieldMetaData("session", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Session.class)));
+      tmpMap.put(_Fields.SERVER, new org.apache.thrift.meta_data.FieldMetaData("server", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelQuery_args.class, metaDataMap);
     }
@@ -18924,23 +18946,28 @@ public class Blur {
 
     public cancelQuery_args(
       Session session,
-      long id)
+      String server,
+      String id)
     {
       this();
       this.session = session;
+      this.server = server;
       this.id = id;
-      setIdIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
     public cancelQuery_args(cancelQuery_args other) {
-      __isset_bitfield = other.__isset_bitfield;
       if (other.isSetSession()) {
         this.session = new Session(other.session);
       }
-      this.id = other.id;
+      if (other.isSetServer()) {
+        this.server = other.server;
+      }
+      if (other.isSetId()) {
+        this.id = other.id;
+      }
     }
 
     public cancelQuery_args deepCopy() {
@@ -18950,8 +18977,8 @@ public class Blur {
     @Override
     public void clear() {
       this.session = null;
-      setIdIsSet(false);
-      this.id = 0;
+      this.server = null;
+      this.id = null;
     }
 
     public Session getSession() {
@@ -18978,27 +19005,52 @@ public class Blur {
       }
     }
 
-    public long getId() {
+    public String getServer() {
+      return this.server;
+    }
+
+    public cancelQuery_args setServer(String server) {
+      this.server = server;
+      return this;
+    }
+
+    public void unsetServer() {
+      this.server = null;
+    }
+
+    /** Returns true if field server is set (has been assigned a value) and false otherwise */
+    public boolean isSetServer() {
+      return this.server != null;
+    }
+
+    public void setServerIsSet(boolean value) {
+      if (!value) {
+        this.server = null;
+      }
+    }
+
+    public String getId() {
       return this.id;
     }
 
-    public cancelQuery_args setId(long id) {
+    public cancelQuery_args setId(String id) {
       this.id = id;
-      setIdIsSet(true);
       return this;
     }
 
     public void unsetId() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
+      this.id = null;
     }
 
     /** Returns true if field id is set (has been assigned a value) and false otherwise */
     public boolean isSetId() {
-      return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
+      return this.id != null;
     }
 
     public void setIdIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
+      if (!value) {
+        this.id = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
@@ -19011,11 +19063,19 @@ public class Blur {
         }
         break;
 
+      case SERVER:
+        if (value == null) {
+          unsetServer();
+        } else {
+          setServer((String)value);
+        }
+        break;
+
       case ID:
         if (value == null) {
           unsetId();
         } else {
-          setId((Long)value);
+          setId((String)value);
         }
         break;
 
@@ -19027,8 +19087,11 @@ public class Blur {
       case SESSION:
         return getSession();
 
+      case SERVER:
+        return getServer();
+
       case ID:
-        return Long.valueOf(getId());
+        return getId();
 
       }
       throw new IllegalStateException();
@@ -19043,6 +19106,8 @@ public class Blur {
       switch (field) {
       case SESSION:
         return isSetSession();
+      case SERVER:
+        return isSetServer();
       case ID:
         return isSetId();
       }
@@ -19071,12 +19136,21 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_id = true;
-      boolean that_present_id = true;
+      boolean this_present_server = true && this.isSetServer();
+      boolean that_present_server = true && that.isSetServer();
+      if (this_present_server || that_present_server) {
+        if (!(this_present_server && that_present_server))
+          return false;
+        if (!this.server.equals(that.server))
+          return false;
+      }
+
+      boolean this_present_id = true && this.isSetId();
+      boolean that_present_id = true && that.isSetId();
       if (this_present_id || that_present_id) {
         if (!(this_present_id && that_present_id))
           return false;
-        if (this.id != that.id)
+        if (!this.id.equals(that.id))
           return false;
       }
 
@@ -19106,6 +19180,16 @@ public class Blur {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServer()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, typedOther.server);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -19144,8 +19228,20 @@ public class Blur {
       }
       first = false;
       if (!first) sb.append(", ");
+      sb.append("server:");
+      if (this.server == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.server);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("id:");
-      sb.append(this.id);
+      if (this.id == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.id);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
@@ -19169,8 +19265,6 @@ public class Blur {
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
         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);
@@ -19204,9 +19298,17 @@ public class Blur {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.id = iprot.readI64();
+            case 2: // SERVER
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.server = iprot.readString();
+                struct.setServerIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.id = iprot.readString();
                 struct.setIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -19232,9 +19334,16 @@ public class Blur {
           struct.session.write(oprot);
           oprot.writeFieldEnd();
         }
-        oprot.writeFieldBegin(ID_FIELD_DESC);
-        oprot.writeI64(struct.id);
-        oprot.writeFieldEnd();
+        if (struct.server != null) {
+          oprot.writeFieldBegin(SERVER_FIELD_DESC);
+          oprot.writeString(struct.server);
+          oprot.writeFieldEnd();
+        }
+        if (struct.id != null) {
+          oprot.writeFieldBegin(ID_FIELD_DESC);
+          oprot.writeString(struct.id);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -19256,29 +19365,39 @@ public class Blur {
         if (struct.isSetSession()) {
           optionals.set(0);
         }
-        if (struct.isSetId()) {
+        if (struct.isSetServer()) {
           optionals.set(1);
         }
-        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetId()) {
+          optionals.set(2);
+        }
+        oprot.writeBitSet(optionals, 3);
         if (struct.isSetSession()) {
           struct.session.write(oprot);
         }
+        if (struct.isSetServer()) {
+          oprot.writeString(struct.server);
+        }
         if (struct.isSetId()) {
-          oprot.writeI64(struct.id);
+          oprot.writeString(struct.id);
         }
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancelQuery_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.session = new Session();
           struct.session.read(iprot);
           struct.setSessionIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.id = iprot.readI64();
+          struct.server = iprot.readString();
+          struct.setServerIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.id = iprot.readString();
           struct.setIdIsSet(true);
         }
       }
@@ -19646,6 +19765,7 @@ public class Blur {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("queryStatusIdList_args");
 
     private static final org.apache.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("session", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -19654,10 +19774,12 @@ public class Blur {
     }
 
     public Session session; // required
+    public String server; // 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 {
-      SESSION((short)1, "session");
+      SESSION((short)1, "session"),
+      SERVER((short)2, "server");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -19674,6 +19796,8 @@ public class Blur {
         switch(fieldId) {
           case 1: // SESSION
             return SESSION;
+          case 2: // SERVER
+            return SERVER;
           default:
             return null;
         }
@@ -19719,6 +19843,8 @@ public class Blur {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION, new org.apache.thrift.meta_data.FieldMetaData("session", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Session.class)));
+      tmpMap.put(_Fields.SERVER, new org.apache.thrift.meta_data.FieldMetaData("server", 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(queryStatusIdList_args.class, metaDataMap);
     }
@@ -19727,10 +19853,12 @@ public class Blur {
     }
 
     public queryStatusIdList_args(
-      Session session)
+      Session session,
+      String server)
     {
       this();
       this.session = session;
+      this.server = server;
     }
 
     /**
@@ -19740,6 +19868,9 @@ public class Blur {
       if (other.isSetSession()) {
         this.session = new Session(other.session);
       }
+      if (other.isSetServer()) {
+        this.server = other.server;
+      }
     }
 
     public queryStatusIdList_args deepCopy() {
@@ -19749,6 +19880,7 @@ public class Blur {
     @Override
     public void clear() {
       this.session = null;
+      this.server = null;
     }
 
     public Session getSession() {
@@ -19775,6 +19907,30 @@ public class Blur {
       }
     }
 
+    public String getServer() {
+      return this.server;
+    }
+
+    public queryStatusIdList_args setServer(String server) {
+      this.server = server;
+      return this;
+    }
+
+    public void unsetServer() {
+      this.server = null;
+    }
+
+    /** Returns true if field server is set (has been assigned a value) and false otherwise */
+    public boolean isSetServer() {
+      return this.server != null;
+    }
+
+    public void setServerIsSet(boolean value) {
+      if (!value) {
+        this.server = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SESSION:
@@ -19785,6 +19941,14 @@ public class Blur {
         }
         break;
 
+      case SERVER:
+        if (value == null) {
+          unsetServer();
+        } else {
+          setServer((String)value);
+        }
+        break;
+
       }
     }
 
@@ -19793,6 +19957,9 @@ public class Blur {
       case SESSION:
         return getSession();
 
+      case SERVER:
+        return getServer();
+
       }
       throw new IllegalStateException();
     }
@@ -19806,6 +19973,8 @@ public class Blur {
       switch (field) {
       case SESSION:
         return isSetSession();
+      case SERVER:
+        return isSetServer();
       }
       throw new IllegalStateException();
     }
@@ -19832,6 +20001,15 @@ public class Blur {
           return false;
       }
 
+      boolean this_present_server = true && this.isSetServer();
+      boolean that_present_server = true && that.isSetServer();
+      if (this_present_server || that_present_server) {
+        if (!(this_present_server && that_present_server))
+          return false;
+        if (!this.server.equals(that.server))
+          return false;
+      }
+
       return true;
     }
 
@@ -19858,6 +20036,16 @@ public class Blur {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServer()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, typedOther.server);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -19885,6 +20073,14 @@ public class Blur {
         sb.append(this.session);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("server:");
+      if (this.server == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.server);
+      }
+      first = false;
       sb.append(")");
    

<TRUNCATED>

Mime
View raw message