incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [41/50] [abbrv] Blur-core compiling but several other projects are still broken.
Date Wed, 07 Nov 2012 02:26:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Blur.java b/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
index d8e51a7..9cbbe51 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
@@ -104,16 +104,6 @@ public class Blur {
     public TableDescriptor describe(String table) throws BlurException, org.apache.thrift.TException;
 
     /**
-     * Executes a query against a the given table and returns the results.  If this method is executed against a controller the results will contain the aggregated results from all the shards.  If this method is executed against a shard server the results will only contain aggregated results from the shards of the given table that are being served on the shard server, if any.
-     * @param table the table name.
-     * @param blurQuery the query to execute.
-     * 
-     * @param table
-     * @param blurQuery
-     */
-    public BlurResults query(String table, BlurQuery blurQuery) 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.
      * @param table the table name.
      * @param uuid the uuid of the query.
@@ -155,16 +145,6 @@ public class Blur {
 
     public TableStats tableStats(String table) throws BlurException, org.apache.thrift.TException;
 
-    public List<String> terms(String table, String columnFamily, String columnName, String startWith, short size) throws BlurException, org.apache.thrift.TException;
-
-    public long recordFrequency(String table, String columnFamily, String columnName, String value) throws BlurException, org.apache.thrift.TException;
-
-    public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.thrift.TException;
-
-    public void mutate(RowMutation mutation) throws BlurException, org.apache.thrift.TException;
-
-    public void mutateBatch(List<RowMutation> mutations) throws BlurException, org.apache.thrift.TException;
-
     public void createTable(TableDescriptor tableDescriptor) throws BlurException, org.apache.thrift.TException;
 
     public void enableTable(String table) throws BlurException, org.apache.thrift.TException;
@@ -197,8 +177,6 @@ public class Blur {
 
     public void describe(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.describe_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void query(String table, BlurQuery blurQuery, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.query_call> resultHandler) throws org.apache.thrift.TException;
-
     public void cancelQuery(String table, long uuid, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.thrift.TException;
 
     public void currentQueries(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.currentQueries_call> resultHandler) throws org.apache.thrift.TException;
@@ -213,16 +191,6 @@ public class Blur {
 
     public void tableStats(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.tableStats_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void terms(String table, String columnFamily, String columnName, String startWith, short size, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.terms_call> resultHandler) throws org.apache.thrift.TException;
-
-    public void recordFrequency(String table, String columnFamily, String columnName, String value, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.recordFrequency_call> resultHandler) throws org.apache.thrift.TException;
-
-    public void fetchRow(String table, Selector selector, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.fetchRow_call> resultHandler) throws org.apache.thrift.TException;
-
-    public void mutate(RowMutation mutation, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mutate_call> resultHandler) throws org.apache.thrift.TException;
-
-    public void mutateBatch(List<RowMutation> mutations, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mutateBatch_call> resultHandler) throws org.apache.thrift.TException;
-
     public void createTable(TableDescriptor tableDescriptor, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createTable_call> resultHandler) throws org.apache.thrift.TException;
 
     public void enableTable(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.enableTable_call> resultHandler) throws org.apache.thrift.TException;
@@ -438,33 +406,6 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "describe failed: unknown result");
     }
 
-    public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, org.apache.thrift.TException
-    {
-      send_query(table, blurQuery);
-      return recv_query();
-    }
-
-    public void send_query(String table, BlurQuery blurQuery) throws org.apache.thrift.TException
-    {
-      query_args args = new query_args();
-      args.setTable(table);
-      args.setBlurQuery(blurQuery);
-      sendBase("query", args);
-    }
-
-    public BlurResults recv_query() throws BlurException, org.apache.thrift.TException
-    {
-      query_result result = new query_result();
-      receiveBase(result, "query");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "query failed: unknown result");
-    }
-
     public void cancelQuery(String table, long uuid) throws BlurException, org.apache.thrift.TException
     {
       send_cancelQuery(table, uuid);
@@ -646,138 +587,6 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "tableStats failed: unknown result");
     }
 
-    public List<String> terms(String table, String columnFamily, String columnName, String startWith, short size) throws BlurException, org.apache.thrift.TException
-    {
-      send_terms(table, columnFamily, columnName, startWith, size);
-      return recv_terms();
-    }
-
-    public void send_terms(String table, String columnFamily, String columnName, String startWith, short size) throws org.apache.thrift.TException
-    {
-      terms_args args = new terms_args();
-      args.setTable(table);
-      args.setColumnFamily(columnFamily);
-      args.setColumnName(columnName);
-      args.setStartWith(startWith);
-      args.setSize(size);
-      sendBase("terms", args);
-    }
-
-    public List<String> recv_terms() throws BlurException, org.apache.thrift.TException
-    {
-      terms_result result = new terms_result();
-      receiveBase(result, "terms");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "terms failed: unknown result");
-    }
-
-    public long recordFrequency(String table, String columnFamily, String columnName, String value) throws BlurException, org.apache.thrift.TException
-    {
-      send_recordFrequency(table, columnFamily, columnName, value);
-      return recv_recordFrequency();
-    }
-
-    public void send_recordFrequency(String table, String columnFamily, String columnName, String value) throws org.apache.thrift.TException
-    {
-      recordFrequency_args args = new recordFrequency_args();
-      args.setTable(table);
-      args.setColumnFamily(columnFamily);
-      args.setColumnName(columnName);
-      args.setValue(value);
-      sendBase("recordFrequency", args);
-    }
-
-    public long recv_recordFrequency() throws BlurException, org.apache.thrift.TException
-    {
-      recordFrequency_result result = new recordFrequency_result();
-      receiveBase(result, "recordFrequency");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "recordFrequency failed: unknown result");
-    }
-
-    public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.thrift.TException
-    {
-      send_fetchRow(table, selector);
-      return recv_fetchRow();
-    }
-
-    public void send_fetchRow(String table, Selector selector) throws org.apache.thrift.TException
-    {
-      fetchRow_args args = new fetchRow_args();
-      args.setTable(table);
-      args.setSelector(selector);
-      sendBase("fetchRow", args);
-    }
-
-    public FetchResult recv_fetchRow() throws BlurException, org.apache.thrift.TException
-    {
-      fetchRow_result result = new fetchRow_result();
-      receiveBase(result, "fetchRow");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fetchRow failed: unknown result");
-    }
-
-    public void mutate(RowMutation mutation) throws BlurException, org.apache.thrift.TException
-    {
-      send_mutate(mutation);
-      recv_mutate();
-    }
-
-    public void send_mutate(RowMutation mutation) throws org.apache.thrift.TException
-    {
-      mutate_args args = new mutate_args();
-      args.setMutation(mutation);
-      sendBase("mutate", args);
-    }
-
-    public void recv_mutate() throws BlurException, org.apache.thrift.TException
-    {
-      mutate_result result = new mutate_result();
-      receiveBase(result, "mutate");
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      return;
-    }
-
-    public void mutateBatch(List<RowMutation> mutations) throws BlurException, org.apache.thrift.TException
-    {
-      send_mutateBatch(mutations);
-      recv_mutateBatch();
-    }
-
-    public void send_mutateBatch(List<RowMutation> mutations) throws org.apache.thrift.TException
-    {
-      mutateBatch_args args = new mutateBatch_args();
-      args.setMutations(mutations);
-      sendBase("mutateBatch", args);
-    }
-
-    public void recv_mutateBatch() throws BlurException, org.apache.thrift.TException
-    {
-      mutateBatch_result result = new mutateBatch_result();
-      receiveBase(result, "mutateBatch");
-      if (result.ex != null) {
-        throw result.ex;
-      }
-      return;
-    }
-
     public void createTable(TableDescriptor tableDescriptor) throws BlurException, org.apache.thrift.TException
     {
       send_createTable(tableDescriptor);
@@ -1179,41 +988,6 @@ public class Blur {
       }
     }
 
-    public void query(String table, BlurQuery blurQuery, org.apache.thrift.async.AsyncMethodCallback<query_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      query_call method_call = new query_call(table, blurQuery, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class query_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String table;
-      private BlurQuery blurQuery;
-      public query_call(String table, BlurQuery blurQuery, org.apache.thrift.async.AsyncMethodCallback<query_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.table = table;
-        this.blurQuery = blurQuery;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("query", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        query_args args = new query_args();
-        args.setTable(table);
-        args.setBlurQuery(blurQuery);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public BlurResults getResult() throws BlurException, 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_query();
-      }
-    }
-
     public void cancelQuery(String table, long uuid, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cancelQuery_call method_call = new cancelQuery_call(table, uuid, resultHandler, this, ___protocolFactory, ___transport);
@@ -1444,190 +1218,6 @@ public class Blur {
       }
     }
 
-    public void terms(String table, String columnFamily, String columnName, String startWith, short size, org.apache.thrift.async.AsyncMethodCallback<terms_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      terms_call method_call = new terms_call(table, columnFamily, columnName, startWith, size, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class terms_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String table;
-      private String columnFamily;
-      private String columnName;
-      private String startWith;
-      private short size;
-      public terms_call(String table, String columnFamily, String columnName, String startWith, short size, org.apache.thrift.async.AsyncMethodCallback<terms_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.table = table;
-        this.columnFamily = columnFamily;
-        this.columnName = columnName;
-        this.startWith = startWith;
-        this.size = size;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("terms", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        terms_args args = new terms_args();
-        args.setTable(table);
-        args.setColumnFamily(columnFamily);
-        args.setColumnName(columnName);
-        args.setStartWith(startWith);
-        args.setSize(size);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public 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!");
-        }
-        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_terms();
-      }
-    }
-
-    public void recordFrequency(String table, String columnFamily, String columnName, String value, org.apache.thrift.async.AsyncMethodCallback<recordFrequency_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      recordFrequency_call method_call = new recordFrequency_call(table, columnFamily, columnName, value, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class recordFrequency_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String table;
-      private String columnFamily;
-      private String columnName;
-      private String value;
-      public recordFrequency_call(String table, String columnFamily, String columnName, String value, org.apache.thrift.async.AsyncMethodCallback<recordFrequency_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.table = table;
-        this.columnFamily = columnFamily;
-        this.columnName = columnName;
-        this.value = value;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("recordFrequency", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        recordFrequency_args args = new recordFrequency_args();
-        args.setTable(table);
-        args.setColumnFamily(columnFamily);
-        args.setColumnName(columnName);
-        args.setValue(value);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public long getResult() throws BlurException, 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_recordFrequency();
-      }
-    }
-
-    public void fetchRow(String table, Selector selector, org.apache.thrift.async.AsyncMethodCallback<fetchRow_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      fetchRow_call method_call = new fetchRow_call(table, selector, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class fetchRow_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String table;
-      private Selector selector;
-      public fetchRow_call(String table, Selector selector, org.apache.thrift.async.AsyncMethodCallback<fetchRow_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.table = table;
-        this.selector = selector;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fetchRow", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        fetchRow_args args = new fetchRow_args();
-        args.setTable(table);
-        args.setSelector(selector);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public FetchResult getResult() throws BlurException, 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_fetchRow();
-      }
-    }
-
-    public void mutate(RowMutation mutation, org.apache.thrift.async.AsyncMethodCallback<mutate_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      mutate_call method_call = new mutate_call(mutation, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class mutate_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private RowMutation mutation;
-      public mutate_call(RowMutation mutation, org.apache.thrift.async.AsyncMethodCallback<mutate_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.mutation = mutation;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutate", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        mutate_args args = new mutate_args();
-        args.setMutation(mutation);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public void getResult() throws BlurException, 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);
-        (new Client(prot)).recv_mutate();
-      }
-    }
-
-    public void mutateBatch(List<RowMutation> mutations, org.apache.thrift.async.AsyncMethodCallback<mutateBatch_call> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      mutateBatch_call method_call = new mutateBatch_call(mutations, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class mutateBatch_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private List<RowMutation> mutations;
-      public mutateBatch_call(List<RowMutation> mutations, org.apache.thrift.async.AsyncMethodCallback<mutateBatch_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.mutations = mutations;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateBatch", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        mutateBatch_args args = new mutateBatch_args();
-        args.setMutations(mutations);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public void getResult() throws BlurException, 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);
-        (new Client(prot)).recv_mutateBatch();
-      }
-    }
-
     public void createTable(TableDescriptor tableDescriptor, org.apache.thrift.async.AsyncMethodCallback<createTable_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       createTable_call method_call = new createTable_call(tableDescriptor, resultHandler, this, ___protocolFactory, ___transport);
@@ -1875,7 +1465,6 @@ public class Blur {
       processMap.put("tableList", new tableList());
       processMap.put("tableListByCluster", new tableListByCluster());
       processMap.put("describe", new describe());
-      processMap.put("query", new query());
       processMap.put("cancelQuery", new cancelQuery());
       processMap.put("currentQueries", new currentQueries());
       processMap.put("queryStatusIdList", new queryStatusIdList());
@@ -1883,11 +1472,6 @@ public class Blur {
       processMap.put("schema", new schema());
       processMap.put("getTableStats", new getTableStats());
       processMap.put("tableStats", new tableStats());
-      processMap.put("terms", new terms());
-      processMap.put("recordFrequency", new recordFrequency());
-      processMap.put("fetchRow", new fetchRow());
-      processMap.put("mutate", new mutate());
-      processMap.put("mutateBatch", new mutateBatch());
       processMap.put("createTable", new createTable());
       processMap.put("enableTable", new enableTable());
       processMap.put("disableTable", new disableTable());
@@ -2066,47 +1650,23 @@ public class Blur {
       }
     }
 
-    public static class query<I extends Iface> extends org.apache.thrift.ProcessFunction<I, query_args> {
-      public query() {
-        super("query");
+    public static class cancelQuery<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cancelQuery_args> {
+      public cancelQuery() {
+        super("cancelQuery");
       }
 
-      public query_args getEmptyArgsInstance() {
-        return new query_args();
+      public cancelQuery_args getEmptyArgsInstance() {
+        return new cancelQuery_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public query_result getResult(I iface, query_args args) throws org.apache.thrift.TException {
-        query_result result = new query_result();
+      public cancelQuery_result getResult(I iface, cancelQuery_args args) throws org.apache.thrift.TException {
+        cancelQuery_result result = new cancelQuery_result();
         try {
-          result.success = iface.query(args.table, args.blurQuery);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
-    public static class cancelQuery<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cancelQuery_args> {
-      public cancelQuery() {
-        super("cancelQuery");
-      }
-
-      public cancelQuery_args getEmptyArgsInstance() {
-        return new cancelQuery_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public cancelQuery_result getResult(I iface, cancelQuery_args args) throws org.apache.thrift.TException {
-        cancelQuery_result result = new cancelQuery_result();
-        try {
-          iface.cancelQuery(args.table, args.uuid);
+          iface.cancelQuery(args.table, args.uuid);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2258,127 +1818,6 @@ public class Blur {
       }
     }
 
-    public static class terms<I extends Iface> extends org.apache.thrift.ProcessFunction<I, terms_args> {
-      public terms() {
-        super("terms");
-      }
-
-      public terms_args getEmptyArgsInstance() {
-        return new terms_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public terms_result getResult(I iface, terms_args args) throws org.apache.thrift.TException {
-        terms_result result = new terms_result();
-        try {
-          result.success = iface.terms(args.table, args.columnFamily, args.columnName, args.startWith, args.size);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
-    public static class recordFrequency<I extends Iface> extends org.apache.thrift.ProcessFunction<I, recordFrequency_args> {
-      public recordFrequency() {
-        super("recordFrequency");
-      }
-
-      public recordFrequency_args getEmptyArgsInstance() {
-        return new recordFrequency_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public recordFrequency_result getResult(I iface, recordFrequency_args args) throws org.apache.thrift.TException {
-        recordFrequency_result result = new recordFrequency_result();
-        try {
-          result.success = iface.recordFrequency(args.table, args.columnFamily, args.columnName, args.value);
-          result.setSuccessIsSet(true);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
-    public static class fetchRow<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchRow_args> {
-      public fetchRow() {
-        super("fetchRow");
-      }
-
-      public fetchRow_args getEmptyArgsInstance() {
-        return new fetchRow_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public fetchRow_result getResult(I iface, fetchRow_args args) throws org.apache.thrift.TException {
-        fetchRow_result result = new fetchRow_result();
-        try {
-          result.success = iface.fetchRow(args.table, args.selector);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
-    public static class mutate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mutate_args> {
-      public mutate() {
-        super("mutate");
-      }
-
-      public mutate_args getEmptyArgsInstance() {
-        return new mutate_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public mutate_result getResult(I iface, mutate_args args) throws org.apache.thrift.TException {
-        mutate_result result = new mutate_result();
-        try {
-          iface.mutate(args.mutation);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
-    public static class mutateBatch<I extends Iface> extends org.apache.thrift.ProcessFunction<I, mutateBatch_args> {
-      public mutateBatch() {
-        super("mutateBatch");
-      }
-
-      public mutateBatch_args getEmptyArgsInstance() {
-        return new mutateBatch_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public mutateBatch_result getResult(I iface, mutateBatch_args args) throws org.apache.thrift.TException {
-        mutateBatch_result result = new mutateBatch_result();
-        try {
-          iface.mutateBatch(args.mutations);
-        } catch (BlurException ex) {
-          result.ex = ex;
-        }
-        return result;
-      }
-    }
-
     public static class createTable<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createTable_args> {
       public createTable() {
         super("createTable");
@@ -8224,25 +7663,25 @@ public class Blur {
 
   }
 
-  public static class query_args implements org.apache.thrift.TBase<query_args, query_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("query_args");
+  public static class cancelQuery_args implements org.apache.thrift.TBase<cancelQuery_args, cancelQuery_args._Fields>, java.io.Serializable, Cloneable   {
+    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 TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField BLUR_QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("blurQuery", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.I64, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new query_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new query_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new cancelQuery_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new cancelQuery_argsTupleSchemeFactory());
     }
 
     public String table; // required
-    public BlurQuery blurQuery; // required
+    public long uuid; // 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 {
       TABLE((short)1, "table"),
-      BLUR_QUERY((short)2, "blurQuery");
+      UUID((short)2, "uuid");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -8259,8 +7698,8 @@ public class Blur {
         switch(fieldId) {
           case 1: // TABLE
             return TABLE;
-          case 2: // BLUR_QUERY
-            return BLUR_QUERY;
+          case 2: // UUID
+            return UUID;
           default:
             return null;
         }
@@ -8301,56 +7740,59 @@ public class Blur {
     }
 
     // isset id assignments
+    private static final int __UUID_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.TABLE, new org.apache.thrift.meta_data.FieldMetaData("table", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.BLUR_QUERY, new org.apache.thrift.meta_data.FieldMetaData("blurQuery", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BlurQuery.class)));
+      tmpMap.put(_Fields.UUID, new org.apache.thrift.meta_data.FieldMetaData("uuid", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(query_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelQuery_args.class, metaDataMap);
     }
 
-    public query_args() {
+    public cancelQuery_args() {
     }
 
-    public query_args(
+    public cancelQuery_args(
       String table,
-      BlurQuery blurQuery)
+      long uuid)
     {
       this();
       this.table = table;
-      this.blurQuery = blurQuery;
+      this.uuid = uuid;
+      setUuidIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public query_args(query_args other) {
+    public cancelQuery_args(cancelQuery_args other) {
+      __isset_bitfield = other.__isset_bitfield;
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      if (other.isSetBlurQuery()) {
-        this.blurQuery = new BlurQuery(other.blurQuery);
-      }
+      this.uuid = other.uuid;
     }
 
-    public query_args deepCopy() {
-      return new query_args(this);
+    public cancelQuery_args deepCopy() {
+      return new cancelQuery_args(this);
     }
 
     @Override
     public void clear() {
       this.table = null;
-      this.blurQuery = null;
+      setUuidIsSet(false);
+      this.uuid = 0;
     }
 
     public String getTable() {
       return this.table;
     }
 
-    public query_args setTable(String table) {
+    public cancelQuery_args setTable(String table) {
       this.table = table;
       return this;
     }
@@ -8370,28 +7812,27 @@ public class Blur {
       }
     }
 
-    public BlurQuery getBlurQuery() {
-      return this.blurQuery;
+    public long getUuid() {
+      return this.uuid;
     }
 
-    public query_args setBlurQuery(BlurQuery blurQuery) {
-      this.blurQuery = blurQuery;
+    public cancelQuery_args setUuid(long uuid) {
+      this.uuid = uuid;
+      setUuidIsSet(true);
       return this;
     }
 
-    public void unsetBlurQuery() {
-      this.blurQuery = null;
+    public void unsetUuid() {
+      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
     }
 
-    /** Returns true if field blurQuery is set (has been assigned a value) and false otherwise */
-    public boolean isSetBlurQuery() {
-      return this.blurQuery != null;
+    /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
+    public boolean isSetUuid() {
+      return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
     }
 
-    public void setBlurQueryIsSet(boolean value) {
-      if (!value) {
-        this.blurQuery = null;
-      }
+    public void setUuidIsSet(boolean value) {
+      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
     }
 
     public void setFieldValue(_Fields field, Object value) {
@@ -8404,11 +7845,11 @@ public class Blur {
         }
         break;
 
-      case BLUR_QUERY:
+      case UUID:
         if (value == null) {
-          unsetBlurQuery();
+          unsetUuid();
         } else {
-          setBlurQuery((BlurQuery)value);
+          setUuid((Long)value);
         }
         break;
 
@@ -8420,8 +7861,8 @@ public class Blur {
       case TABLE:
         return getTable();
 
-      case BLUR_QUERY:
-        return getBlurQuery();
+      case UUID:
+        return Long.valueOf(getUuid());
 
       }
       throw new IllegalStateException();
@@ -8436,8 +7877,8 @@ public class Blur {
       switch (field) {
       case TABLE:
         return isSetTable();
-      case BLUR_QUERY:
-        return isSetBlurQuery();
+      case UUID:
+        return isSetUuid();
       }
       throw new IllegalStateException();
     }
@@ -8446,12 +7887,12 @@ public class Blur {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof query_args)
-        return this.equals((query_args)that);
+      if (that instanceof cancelQuery_args)
+        return this.equals((cancelQuery_args)that);
       return false;
     }
 
-    public boolean equals(query_args that) {
+    public boolean equals(cancelQuery_args that) {
       if (that == null)
         return false;
 
@@ -8464,12 +7905,12 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_blurQuery = true && this.isSetBlurQuery();
-      boolean that_present_blurQuery = true && that.isSetBlurQuery();
-      if (this_present_blurQuery || that_present_blurQuery) {
-        if (!(this_present_blurQuery && that_present_blurQuery))
+      boolean this_present_uuid = true;
+      boolean that_present_uuid = true;
+      if (this_present_uuid || that_present_uuid) {
+        if (!(this_present_uuid && that_present_uuid))
           return false;
-        if (!this.blurQuery.equals(that.blurQuery))
+        if (this.uuid != that.uuid)
           return false;
       }
 
@@ -8481,13 +7922,13 @@ public class Blur {
       return 0;
     }
 
-    public int compareTo(query_args other) {
+    public int compareTo(cancelQuery_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      query_args typedOther = (query_args)other;
+      cancelQuery_args typedOther = (cancelQuery_args)other;
 
       lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable());
       if (lastComparison != 0) {
@@ -8499,12 +7940,12 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBlurQuery()).compareTo(typedOther.isSetBlurQuery());
+      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetBlurQuery()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blurQuery, typedOther.blurQuery);
+      if (isSetUuid()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -8526,7 +7967,7 @@ public class Blur {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("query_args(");
+      StringBuilder sb = new StringBuilder("cancelQuery_args(");
       boolean first = true;
 
       sb.append("table:");
@@ -8537,12 +7978,8 @@ public class Blur {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("blurQuery:");
-      if (this.blurQuery == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.blurQuery);
-      }
+      sb.append("uuid:");
+      sb.append(this.uuid);
       first = false;
       sb.append(")");
       return sb.toString();
@@ -8551,9 +7988,6 @@ public class Blur {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (blurQuery != null) {
-        blurQuery.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -8566,21 +8000,23 @@ 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);
       }
     }
 
-    private static class query_argsStandardSchemeFactory implements SchemeFactory {
-      public query_argsStandardScheme getScheme() {
-        return new query_argsStandardScheme();
+    private static class cancelQuery_argsStandardSchemeFactory implements SchemeFactory {
+      public cancelQuery_argsStandardScheme getScheme() {
+        return new cancelQuery_argsStandardScheme();
       }
     }
 
-    private static class query_argsStandardScheme extends StandardScheme<query_args> {
+    private static class cancelQuery_argsStandardScheme extends StandardScheme<cancelQuery_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, query_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, cancelQuery_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -8598,11 +8034,10 @@ public class Blur {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // BLUR_QUERY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.blurQuery = new BlurQuery();
-                struct.blurQuery.read(iprot);
-                struct.setBlurQueryIsSet(true);
+            case 2: // UUID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.uuid = iprot.readI64();
+                struct.setUuidIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -8618,7 +8053,7 @@ public class Blur {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, query_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, cancelQuery_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -8627,46 +8062,44 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        if (struct.blurQuery != null) {
-          oprot.writeFieldBegin(BLUR_QUERY_FIELD_DESC);
-          struct.blurQuery.write(oprot);
-          oprot.writeFieldEnd();
-        }
+        oprot.writeFieldBegin(UUID_FIELD_DESC);
+        oprot.writeI64(struct.uuid);
+        oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class query_argsTupleSchemeFactory implements SchemeFactory {
-      public query_argsTupleScheme getScheme() {
-        return new query_argsTupleScheme();
+    private static class cancelQuery_argsTupleSchemeFactory implements SchemeFactory {
+      public cancelQuery_argsTupleScheme getScheme() {
+        return new cancelQuery_argsTupleScheme();
       }
     }
 
-    private static class query_argsTupleScheme extends TupleScheme<query_args> {
+    private static class cancelQuery_argsTupleScheme extends TupleScheme<cancelQuery_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, query_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, cancelQuery_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetTable()) {
           optionals.set(0);
         }
-        if (struct.isSetBlurQuery()) {
+        if (struct.isSetUuid()) {
           optionals.set(1);
         }
         oprot.writeBitSet(optionals, 2);
         if (struct.isSetTable()) {
           oprot.writeString(struct.table);
         }
-        if (struct.isSetBlurQuery()) {
-          struct.blurQuery.write(oprot);
+        if (struct.isSetUuid()) {
+          oprot.writeI64(struct.uuid);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, query_args struct) throws org.apache.thrift.TException {
+      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);
         if (incoming.get(0)) {
@@ -8674,33 +8107,29 @@ public class Blur {
           struct.setTableIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.blurQuery = new BlurQuery();
-          struct.blurQuery.read(iprot);
-          struct.setBlurQueryIsSet(true);
+          struct.uuid = iprot.readI64();
+          struct.setUuidIsSet(true);
         }
       }
     }
 
   }
 
-  public static class query_result implements org.apache.thrift.TBase<query_result, query_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("query_result");
+  public static class cancelQuery_result implements org.apache.thrift.TBase<cancelQuery_result, cancelQuery_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancelQuery_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);
     private static final org.apache.thrift.protocol.TField EX_FIELD_DESC = new org.apache.thrift.protocol.TField("ex", 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 query_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new query_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new cancelQuery_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new cancelQuery_resultTupleSchemeFactory());
     }
 
-    public BlurResults success; // required
     public BlurException ex; // 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 {
-      SUCCESS((short)0, "success"),
       EX((short)1, "ex");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -8716,8 +8145,6 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 0: // SUCCESS
-            return SUCCESS;
           case 1: // EX
             return EX;
           default:
@@ -8763,77 +8190,45 @@ public class Blur {
     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.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, BlurResults.class)));
       tmpMap.put(_Fields.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(query_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelQuery_result.class, metaDataMap);
     }
 
-    public query_result() {
+    public cancelQuery_result() {
     }
 
-    public query_result(
-      BlurResults success,
+    public cancelQuery_result(
       BlurException ex)
     {
       this();
-      this.success = success;
       this.ex = ex;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public query_result(query_result other) {
-      if (other.isSetSuccess()) {
-        this.success = new BlurResults(other.success);
-      }
+    public cancelQuery_result(cancelQuery_result other) {
       if (other.isSetEx()) {
         this.ex = new BlurException(other.ex);
       }
     }
 
-    public query_result deepCopy() {
-      return new query_result(this);
+    public cancelQuery_result deepCopy() {
+      return new cancelQuery_result(this);
     }
 
     @Override
     public void clear() {
-      this.success = null;
       this.ex = null;
     }
 
-    public BlurResults getSuccess() {
-      return this.success;
-    }
-
-    public query_result setSuccess(BlurResults success) {
-      this.success = success;
-      return this;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    /** Returns true if field success is set (has been assigned a value) and false otherwise */
-    public boolean isSetSuccess() {
-      return this.success != null;
-    }
-
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
-    }
-
     public BlurException getEx() {
       return this.ex;
     }
 
-    public query_result setEx(BlurException ex) {
+    public cancelQuery_result setEx(BlurException ex) {
       this.ex = ex;
       return this;
     }
@@ -8855,14 +8250,6 @@ public class Blur {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((BlurResults)value);
-        }
-        break;
-
       case EX:
         if (value == null) {
           unsetEx();
@@ -8876,9 +8263,6 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return getSuccess();
-
       case EX:
         return getEx();
 
@@ -8893,8 +8277,6 @@ public class Blur {
       }
 
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
       case EX:
         return isSetEx();
       }
@@ -8905,24 +8287,15 @@ public class Blur {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof query_result)
-        return this.equals((query_result)that);
+      if (that instanceof cancelQuery_result)
+        return this.equals((cancelQuery_result)that);
       return false;
     }
 
-    public boolean equals(query_result that) {
+    public boolean equals(cancelQuery_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ex = true && this.isSetEx();
       boolean that_present_ex = true && that.isSetEx();
       if (this_present_ex || that_present_ex) {
@@ -8940,24 +8313,14 @@ public class Blur {
       return 0;
     }
 
-    public int compareTo(query_result other) {
+    public int compareTo(cancelQuery_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      query_result typedOther = (query_result)other;
+      cancelQuery_result typedOther = (cancelQuery_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetEx()).compareTo(typedOther.isSetEx());
       if (lastComparison != 0) {
         return lastComparison;
@@ -8985,17 +8348,9 @@ public class Blur {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("query_result(");
+      StringBuilder sb = new StringBuilder("cancelQuery_result(");
       boolean first = true;
 
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("ex:");
       if (this.ex == null) {
         sb.append("null");
@@ -9010,9 +8365,6 @@ public class Blur {
     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 {
@@ -9031,15 +8383,15 @@ public class Blur {
       }
     }
 
-    private static class query_resultStandardSchemeFactory implements SchemeFactory {
-      public query_resultStandardScheme getScheme() {
-        return new query_resultStandardScheme();
+    private static class cancelQuery_resultStandardSchemeFactory implements SchemeFactory {
+      public cancelQuery_resultStandardScheme getScheme() {
+        return new cancelQuery_resultStandardScheme();
       }
     }
 
-    private static class query_resultStandardScheme extends StandardScheme<query_result> {
+    private static class cancelQuery_resultStandardScheme extends StandardScheme<cancelQuery_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, query_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, cancelQuery_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -9049,15 +8401,6 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.success = new BlurResults();
-                struct.success.read(iprot);
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 1: // EX
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
                 struct.ex = new BlurException();
@@ -9078,15 +8421,10 @@ public class Blur {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, query_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, cancelQuery_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.writeFieldEnd();
-        }
         if (struct.ex != null) {
           oprot.writeFieldBegin(EX_FIELD_DESC);
           struct.ex.write(oprot);
@@ -9098,43 +8436,32 @@ public class Blur {
 
     }
 
-    private static class query_resultTupleSchemeFactory implements SchemeFactory {
-      public query_resultTupleScheme getScheme() {
-        return new query_resultTupleScheme();
+    private static class cancelQuery_resultTupleSchemeFactory implements SchemeFactory {
+      public cancelQuery_resultTupleScheme getScheme() {
+        return new cancelQuery_resultTupleScheme();
       }
     }
 
-    private static class query_resultTupleScheme extends TupleScheme<query_result> {
+    private static class cancelQuery_resultTupleScheme extends TupleScheme<cancelQuery_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, query_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, cancelQuery_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetSuccess()) {
-          optionals.set(0);
-        }
         if (struct.isSetEx()) {
-          optionals.set(1);
-        }
-        oprot.writeBitSet(optionals, 2);
-        if (struct.isSetSuccess()) {
-          struct.success.write(oprot);
+          optionals.set(0);
         }
+        oprot.writeBitSet(optionals, 1);
         if (struct.isSetEx()) {
           struct.ex.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, query_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, cancelQuery_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
-          struct.success = new BlurResults();
-          struct.success.read(iprot);
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
           struct.ex = new BlurException();
           struct.ex.read(iprot);
           struct.setExIsSet(true);
@@ -9144,25 +8471,22 @@ public class Blur {
 
   }
 
-  public static class cancelQuery_args implements org.apache.thrift.TBase<cancelQuery_args, cancelQuery_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancelQuery_args");
+  public static class currentQueries_args implements org.apache.thrift.TBase<currentQueries_args, currentQueries_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("currentQueries_args");
 
     private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.I64, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new cancelQuery_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelQuery_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new currentQueries_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new currentQueries_argsTupleSchemeFactory());
     }
 
     public String table; // required
-    public long uuid; // 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 {
-      TABLE((short)1, "table"),
-      UUID((short)2, "uuid");
+      TABLE((short)1, "table");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -9179,8 +8503,6 @@ public class Blur {
         switch(fieldId) {
           case 1: // TABLE
             return TABLE;
-          case 2: // UUID
-            return UUID;
           default:
             return null;
         }
@@ -9221,59 +8543,48 @@ public class Blur {
     }
 
     // isset id assignments
-    private static final int __UUID_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.TABLE, new org.apache.thrift.meta_data.FieldMetaData("table", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.UUID, new org.apache.thrift.meta_data.FieldMetaData("uuid", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelQuery_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(currentQueries_args.class, metaDataMap);
     }
 
-    public cancelQuery_args() {
+    public currentQueries_args() {
     }
 
-    public cancelQuery_args(
-      String table,
-      long uuid)
+    public currentQueries_args(
+      String table)
     {
       this();
       this.table = table;
-      this.uuid = uuid;
-      setUuidIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public cancelQuery_args(cancelQuery_args other) {
-      __isset_bitfield = other.__isset_bitfield;
+    public currentQueries_args(currentQueries_args other) {
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      this.uuid = other.uuid;
     }
 
-    public cancelQuery_args deepCopy() {
-      return new cancelQuery_args(this);
+    public currentQueries_args deepCopy() {
+      return new currentQueries_args(this);
     }
 
     @Override
     public void clear() {
       this.table = null;
-      setUuidIsSet(false);
-      this.uuid = 0;
     }
 
     public String getTable() {
       return this.table;
     }
 
-    public cancelQuery_args setTable(String table) {
+    public currentQueries_args setTable(String table) {
       this.table = table;
       return this;
     }
@@ -9293,29 +8604,6 @@ public class Blur {
       }
     }
 
-    public long getUuid() {
-      return this.uuid;
-    }
-
-    public cancelQuery_args setUuid(long uuid) {
-      this.uuid = uuid;
-      setUuidIsSet(true);
-      return this;
-    }
-
-    public void unsetUuid() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
-    }
-
-    /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
-    public boolean isSetUuid() {
-      return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
-    }
-
-    public void setUuidIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case TABLE:
@@ -9326,14 +8614,6 @@ public class Blur {
         }
         break;
 
-      case UUID:
-        if (value == null) {
-          unsetUuid();
-        } else {
-          setUuid((Long)value);
-        }
-        break;
-
       }
     }
 
@@ -9342,9 +8622,6 @@ public class Blur {
       case TABLE:
         return getTable();
 
-      case UUID:
-        return Long.valueOf(getUuid());
-
       }
       throw new IllegalStateException();
     }
@@ -9358,8 +8635,6 @@ public class Blur {
       switch (field) {
       case TABLE:
         return isSetTable();
-      case UUID:
-        return isSetUuid();
       }
       throw new IllegalStateException();
     }
@@ -9368,12 +8643,12 @@ public class Blur {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof cancelQuery_args)
-        return this.equals((cancelQuery_args)that);
+      if (that instanceof currentQueries_args)
+        return this.equals((currentQueries_args)that);
       return false;
     }
 
-    public boolean equals(cancelQuery_args that) {
+    public boolean equals(currentQueries_args that) {
       if (that == null)
         return false;
 
@@ -9386,15 +8661,6 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_uuid = true;
-      boolean that_present_uuid = true;
-      if (this_present_uuid || that_present_uuid) {
-        if (!(this_present_uuid && that_present_uuid))
-          return false;
-        if (this.uuid != that.uuid)
-          return false;
-      }
-
       return true;
     }
 
@@ -9403,13 +8669,13 @@ public class Blur {
       return 0;
     }
 
-    public int compareTo(cancelQuery_args other) {
+    public int compareTo(currentQueries_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      cancelQuery_args typedOther = (cancelQuery_args)other;
+      currentQueries_args typedOther = (currentQueries_args)other;
 
       lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable());
       if (lastComparison != 0) {
@@ -9421,16 +8687,6 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetUuid()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -9448,7 +8704,7 @@ public class Blur {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("cancelQuery_args(");
+      StringBuilder sb = new StringBuilder("currentQueries_args(");
       boolean first = true;
 
       sb.append("table:");
@@ -9458,10 +8714,6 @@ public class Blur {
         sb.append(this.table);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("uuid:");
-      sb.append(this.uuid);
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -9481,23 +8733,21 @@ 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);
       }
     }
 
-    private static class cancelQuery_argsStandardSchemeFactory implements SchemeFactory {
-      public cancelQuery_argsStandardScheme getScheme() {
-        return new cancelQuery_argsStandardScheme();
+    private static class currentQueries_argsStandardSchemeFactory implements SchemeFactory {
+      public currentQueries_argsStandardScheme getScheme() {
+        return new currentQueries_argsStandardScheme();
       }
     }
 
-    private static class cancelQuery_argsStandardScheme extends StandardScheme<cancelQuery_args> {
+    private static class currentQueries_argsStandardScheme extends StandardScheme<currentQueries_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, cancelQuery_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, currentQueries_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -9515,14 +8765,6 @@ public class Blur {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // UUID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.uuid = iprot.readI64();
-                struct.setUuidIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -9534,7 +8776,7 @@ public class Blur {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, cancelQuery_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, currentQueries_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -9543,74 +8785,64 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        oprot.writeFieldBegin(UUID_FIELD_DESC);
-        oprot.writeI64(struct.uuid);
-        oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class cancelQuery_argsTupleSchemeFactory implements SchemeFactory {
-      public cancelQuery_argsTupleScheme getScheme() {
-        return new cancelQuery_argsTupleScheme();
+    private static class currentQueries_argsTupleSchemeFactory implements SchemeFactory {
+      public currentQueries_argsTupleScheme getScheme() {
+        return new currentQueries_argsTupleScheme();
       }
     }
 
-    private static class cancelQuery_argsTupleScheme extends TupleScheme<cancelQuery_args> {
+    private static class currentQueries_argsTupleScheme extends TupleScheme<currentQueries_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, cancelQuery_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, currentQueries_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetTable()) {
           optionals.set(0);
         }
-        if (struct.isSetUuid()) {
-          optionals.set(1);
-        }
-        oprot.writeBitSet(optionals, 2);
+        oprot.writeBitSet(optionals, 1);
         if (struct.isSetTable()) {
           oprot.writeString(struct.table);
         }
-        if (struct.isSetUuid()) {
-          oprot.writeI64(struct.uuid);
-        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, cancelQuery_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, currentQueries_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.table = iprot.readString();
           struct.setTableIsSet(true);
         }
-        if (incoming.get(1)) {
-          struct.uuid = iprot.readI64();
-          struct.setUuidIsSet(true);
-        }
       }
     }
 
   }
 
-  public static class cancelQuery_result implements org.apache.thrift.TBase<cancelQuery_result, cancelQuery_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("cancelQuery_result");
+  public static class currentQueries_result implements org.apache.thrift.TBase<currentQueries_result, currentQueries_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("currentQueries_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 EX_FIELD_DESC = new org.apache.thrift.protocol.TField("ex", 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 cancelQuery_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelQuery_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new currentQueries_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new currentQueries_resultTupleSchemeFactory());
     }
 
+    public List<BlurQueryStatus> success; // required
     public BlurException ex; // 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 {
+      SUCCESS((short)0, "success"),
       EX((short)1, "ex");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -9626,6 +8858,8 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
           case 1: // EX
             return EX;
           default:
@@ -9671,5037 +8905,73 @@ public class Blur {
     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.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+      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, BlurQueryStatus.class))));
+      tmpMap.put(_Fields.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelQuery_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(currentQueries_result.class, metaDataMap);
     }
 
-    public cancelQuery_result() {
+    public currentQueries_result() {
     }
 
-    public cancelQuery_result(
+    public currentQueries_result(
+      List<BlurQueryStatus> success,
       BlurException ex)
     {
       this();
+      this.success = success;
       this.ex = ex;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public cancelQuery_result(cancelQuery_result other) {
+    public currentQueries_result(currentQueries_result other) {
+      if (other.isSetSuccess()) {
+        List<BlurQueryStatus> __this__success = new ArrayList<BlurQueryStatus>();
+        for (BlurQueryStatus other_element : other.success) {
+          __this__success.add(new BlurQueryStatus(other_element));
+        }
+        this.success = __this__success;
+      }
       if (other.isSetEx()) {
         this.ex = new BlurException(other.ex);
       }
     }
 
-    public cancelQuery_result deepCopy() {
-      return new cancelQuery_result(this);
+    public currentQueries_result deepCopy() {
+      return new currentQueries_result(this);
     }
 
     @Override
     public void clear() {
+      this.success = null;
       this.ex = null;
     }
 
-    public BlurException getEx() {
-      return this.ex;
-    }
-
-    public cancelQuery_result setEx(BlurException ex) {
-      this.ex = ex;
-      return this;
-    }
-
-    public void unsetEx() {
-      this.ex = null;
-    }
-
-    /** Returns true if field ex is set (has been assigned a value) and false otherwise */
-    public boolean isSetEx() {
-      return this.ex != null;
-    }
-
-    public void setExIsSet(boolean value) {
-      if (!value) {
-        this.ex = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case EX:
-        if (value == null) {
-          unsetEx();
-        } else {
-          setEx((BlurException)value);
-        }
-        break;
-
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case EX:
-        return getEx();
-
-      }
-      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 EX:
-        return isSetEx();
-      }
-      throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof cancelQuery_result)
-        return this.equals((cancelQuery_result)that);
-      return false;
-    }
-
-    public boolean equals(cancelQuery_result that) {
-      if (that == null)
-        return false;
-
-      boolean this_present_ex = true && this.isSetEx();
-      boolean that_present_ex = true && that.isSetEx();
-      if (this_present_ex || that_present_ex) {
-        if (!(this_present_ex && that_present_ex))
-          return false;
-        if (!this.ex.equals(that.ex))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    public int compareTo(cancelQuery_result other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-      cancelQuery_result typedOther = (cancelQuery_result)other;
-
-      lastComparison = Boolean.valueOf(isSetEx()).compareTo(typedOther.isSetEx());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetEx()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ex, typedOther.ex);
-        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("cancelQuery_result(");
-      boolean first = true;
-
-      sb.append("ex:");
-      if (this.ex == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ex);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws org.apache.thrift.TException {
-      // check for required fields
-      // check for sub-struct validity
-    }
-
-    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 cancelQuery_resultStandardSchemeFactory implements SchemeFactory {
-      public cancelQuery_resultStandardScheme getScheme() {
-        return new cancelQuery_resultStandardScheme();
-      }
-    }
-
-    private static class cancelQuery_resultStandardScheme extends StandardScheme<cancelQuery_result> {
-
-      public void read(org.apache.thrift.protocol.TProtocol iprot, cancelQuery_result 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: // EX
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ex = new BlurException();
-                struct.ex.read(iprot);
-                struct.setExIsSet(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, cancelQuery_result struct) throws org.apache.thrift.TException {
-        struct.validate();
-
-        oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.ex != null) {
-          oprot.writeFieldBegin(EX_FIELD_DESC);
-          struct.ex.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-
-    }
-
-    private static class cancelQuery_resultTupleSchemeFactory implements SchemeFactory {
-      public cancelQuery_resultTupleScheme getScheme() {
-        return new cancelQuery_resultTupleScheme();
-      }
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
     }
 
-    private static class cancelQuery_resultTupleScheme extends TupleScheme<cancelQuery_result> {
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, cancelQuery_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
-        if (struct.isSetEx()) {
-          optionals.set(0);
-        }
-        oprot.writeBitSet(optionals, 1);
-        if (struct.isSetEx()) {
-          struct.ex.write(oprot);
-        }
-      }
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, cancelQuery_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
-        if (incoming.get(0)) {
-          struct.ex = new BlurException();
-          struct.ex.read(iprot);
-          struct.setExIsSet(true);
-        }
-      }
-    }
-
-  }
-
-  public static class currentQueries_args implements org.apache.thrift.TBase<currentQueries_args, currentQueries_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("currentQueries_args");
-
-    private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new currentQueries_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new currentQueries_argsTupleSchemeFactory());
-    }
-
-    public String table; // 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 {
-      TABLE((short)1, "table");
-
-      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) {


<TRUNCATED>

Mime
View raw message