incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [6/8] Removed the session parameter from a few methods in the interface. Now the query statuses are tracked at the server level instead of inside each session.
Date Sun, 03 Mar 2013 19:37:03 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cf92e0ff/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 d27a94b..21c1414 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
@@ -235,48 +235,42 @@ public class Blur {
 
     /**
      * Cancels a query that is executing within the given session.
-     * @param session the Session.
      * @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, String server, String id) throws BlurException, org.apache.thrift.TException;
+    public void cancelQuery(String server, String id) throws BlurException, org.apache.thrift.TException;
 
     /**
      * Returns a list of the query ids of queries that have recently been executed within the given session.
-     * @param session the Session.
      * @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 Map<String,List<String>> queryStatusIdList(Session session, String server) throws BlurException, org.apache.thrift.TException;
+    public Map<String,List<String>> queryStatusIdList(String server) throws BlurException, org.apache.thrift.TException;
 
     /**
      * Returns the query status for the given session and query id, (QueryArgs.id).
-     * @param session the Session.
      * @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 Map<String,QueryStatus> queryStatus(Session session, String server, String id) throws BlurException, org.apache.thrift.TException;
+    public Map<String,QueryStatus> queryStatus(String server, String id) throws BlurException, org.apache.thrift.TException;
 
     /**
-     * Returns the the schema for the given session.
-     * @param session the Session.
+     * Returns the the schema for the given table.
+     * @param tableName the table name.
      * @return the table schema.
      * 
-     * @param session
+     * @param tableName
      */
-    public TableSchema schema(Session session) throws BlurException, org.apache.thrift.TException;
+    public TableSchema schema(String tableName) throws BlurException, org.apache.thrift.TException;
 
     public TableStats tableStats(String table) throws BlurException, org.apache.thrift.TException;
 
@@ -322,13 +316,13 @@ 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, String server, String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.thrift.TException;
+    public void cancelQuery(String server, String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.cancelQuery_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 queryStatusIdList(String server, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.queryStatusIdList_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 queryStatus(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;
+    public void schema(String tableName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.schema_call> resultHandler) throws org.apache.thrift.TException;
 
     public void tableStats(String table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.tableStats_call> resultHandler) throws org.apache.thrift.TException;
 
@@ -837,16 +831,15 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "describe failed: unknown result");
     }
 
-    public void cancelQuery(Session session, String server, String id) throws BlurException, org.apache.thrift.TException
+    public void cancelQuery(String server, String id) throws BlurException, org.apache.thrift.TException
     {
-      send_cancelQuery(session, server, id);
+      send_cancelQuery(server, id);
       recv_cancelQuery();
     }
 
-    public void send_cancelQuery(Session session, String server, String id) throws org.apache.thrift.TException
+    public void send_cancelQuery(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);
@@ -862,16 +855,15 @@ public class Blur {
       return;
     }
 
-    public Map<String,List<String>> queryStatusIdList(Session session, String server) throws BlurException, org.apache.thrift.TException
+    public Map<String,List<String>> queryStatusIdList(String server) throws BlurException, org.apache.thrift.TException
     {
-      send_queryStatusIdList(session, server);
+      send_queryStatusIdList(server);
       return recv_queryStatusIdList();
     }
 
-    public void send_queryStatusIdList(Session session, String server) throws org.apache.thrift.TException
+    public void send_queryStatusIdList(String server) throws org.apache.thrift.TException
     {
       queryStatusIdList_args args = new queryStatusIdList_args();
-      args.setSession(session);
       args.setServer(server);
       sendBase("queryStatusIdList", args);
     }
@@ -889,16 +881,15 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "queryStatusIdList failed: unknown result");
     }
 
-    public Map<String,QueryStatus> queryStatus(Session session, String server, String id) throws BlurException, org.apache.thrift.TException
+    public Map<String,QueryStatus> queryStatus(String server, String id) throws BlurException, org.apache.thrift.TException
     {
-      send_queryStatus(session, server, id);
+      send_queryStatus(server, id);
       return recv_queryStatus();
     }
 
-    public void send_queryStatus(Session session, String server, String id) throws org.apache.thrift.TException
+    public void send_queryStatus(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);
@@ -917,16 +908,16 @@ public class Blur {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "queryStatus failed: unknown result");
     }
 
-    public TableSchema schema(Session session) throws BlurException, org.apache.thrift.TException
+    public TableSchema schema(String tableName) throws BlurException, org.apache.thrift.TException
     {
-      send_schema(session);
+      send_schema(tableName);
       return recv_schema();
     }
 
-    public void send_schema(Session session) throws org.apache.thrift.TException
+    public void send_schema(String tableName) throws org.apache.thrift.TException
     {
       schema_args args = new schema_args();
-      args.setSession(session);
+      args.setTableName(tableName);
       sendBase("schema", args);
     }
 
@@ -1616,20 +1607,18 @@ public class Blur {
       }
     }
 
-    public void cancelQuery(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.thrift.TException {
+    public void cancelQuery(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, server, id, resultHandler, this, ___protocolFactory, ___transport);
+      cancelQuery_call method_call = new cancelQuery_call(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 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 {
+      public cancelQuery_call(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;
       }
@@ -1637,7 +1626,6 @@ public class Blur {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         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);
@@ -1654,26 +1642,23 @@ public class Blur {
       }
     }
 
-    public void queryStatusIdList(Session session, String server, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException {
+    public void queryStatusIdList(String server, org.apache.thrift.async.AsyncMethodCallback<queryStatusIdList_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      queryStatusIdList_call method_call = new queryStatusIdList_call(session, server, resultHandler, this, ___protocolFactory, ___transport);
+      queryStatusIdList_call method_call = new queryStatusIdList_call(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;
       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 {
+      public queryStatusIdList_call(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();
@@ -1689,20 +1674,18 @@ public class Blur {
       }
     }
 
-    public void queryStatus(Session session, String server, String id, org.apache.thrift.async.AsyncMethodCallback<queryStatus_call> resultHandler) throws org.apache.thrift.TException {
+    public void queryStatus(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, server, id, resultHandler, this, ___protocolFactory, ___transport);
+      queryStatus_call method_call = new queryStatus_call(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 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 {
+      public queryStatus_call(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;
       }
@@ -1710,7 +1693,6 @@ public class Blur {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         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);
@@ -1727,24 +1709,24 @@ public class Blur {
       }
     }
 
-    public void schema(Session session, org.apache.thrift.async.AsyncMethodCallback<schema_call> resultHandler) throws org.apache.thrift.TException {
+    public void schema(String tableName, org.apache.thrift.async.AsyncMethodCallback<schema_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      schema_call method_call = new schema_call(session, resultHandler, this, ___protocolFactory, ___transport);
+      schema_call method_call = new schema_call(tableName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class schema_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private Session session;
-      public schema_call(Session session, org.apache.thrift.async.AsyncMethodCallback<schema_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 tableName;
+      public schema_call(String tableName, org.apache.thrift.async.AsyncMethodCallback<schema_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.tableName = tableName;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("schema", org.apache.thrift.protocol.TMessageType.CALL, 0));
         schema_args args = new schema_args();
-        args.setSession(session);
+        args.setTableName(tableName);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -2304,7 +2286,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.server, args.id);
+          iface.cancelQuery(args.server, args.id);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2328,7 +2310,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, args.server);
+          result.success = iface.queryStatusIdList(args.server);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2352,7 +2334,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.server, args.id);
+          result.success = iface.queryStatus(args.server, args.id);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -2376,7 +2358,7 @@ public class Blur {
       public schema_result getResult(I iface, schema_args args) throws org.apache.thrift.TException {
         schema_result result = new schema_result();
         try {
-          result.success = iface.schema(args.session);
+          result.success = iface.schema(args.tableName);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -18849,9 +18831,8 @@ 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");
 
-    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 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 org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (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.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -18859,15 +18840,13 @@ public class Blur {
       schemes.put(TupleScheme.class, new cancelQuery_argsTupleSchemeFactory());
     }
 
-    public Session session; // 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"),
-      SERVER((short)2, "server"),
-      ID((short)3, "id");
+      SERVER((short)1, "server"),
+      ID((short)2, "id");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -18882,11 +18861,9 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SESSION
-            return SESSION;
-          case 2: // SERVER
+          case 1: // SERVER
             return SERVER;
-          case 3: // ID
+          case 2: // ID
             return ID;
           default:
             return null;
@@ -18931,8 +18908,6 @@ 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.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, 
@@ -18945,12 +18920,10 @@ public class Blur {
     }
 
     public cancelQuery_args(
-      Session session,
       String server,
       String id)
     {
       this();
-      this.session = session;
       this.server = server;
       this.id = id;
     }
@@ -18959,9 +18932,6 @@ public class Blur {
      * Performs a deep copy on <i>other</i>.
      */
     public cancelQuery_args(cancelQuery_args other) {
-      if (other.isSetSession()) {
-        this.session = new Session(other.session);
-      }
       if (other.isSetServer()) {
         this.server = other.server;
       }
@@ -18976,35 +18946,10 @@ public class Blur {
 
     @Override
     public void clear() {
-      this.session = null;
       this.server = null;
       this.id = null;
     }
 
-    public Session getSession() {
-      return this.session;
-    }
-
-    public cancelQuery_args setSession(Session session) {
-      this.session = session;
-      return this;
-    }
-
-    public void unsetSession() {
-      this.session = null;
-    }
-
-    /** Returns true if field session is set (has been assigned a value) and false otherwise */
-    public boolean isSetSession() {
-      return this.session != null;
-    }
-
-    public void setSessionIsSet(boolean value) {
-      if (!value) {
-        this.session = null;
-      }
-    }
-
     public String getServer() {
       return this.server;
     }
@@ -19055,14 +19000,6 @@ public class Blur {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SESSION:
-        if (value == null) {
-          unsetSession();
-        } else {
-          setSession((Session)value);
-        }
-        break;
-
       case SERVER:
         if (value == null) {
           unsetServer();
@@ -19084,9 +19021,6 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SESSION:
-        return getSession();
-
       case SERVER:
         return getServer();
 
@@ -19104,8 +19038,6 @@ public class Blur {
       }
 
       switch (field) {
-      case SESSION:
-        return isSetSession();
       case SERVER:
         return isSetServer();
       case ID:
@@ -19127,15 +19059,6 @@ public class Blur {
       if (that == null)
         return false;
 
-      boolean this_present_session = true && this.isSetSession();
-      boolean that_present_session = true && that.isSetSession();
-      if (this_present_session || that_present_session) {
-        if (!(this_present_session && that_present_session))
-          return false;
-        if (!this.session.equals(that.session))
-          return false;
-      }
-
       boolean this_present_server = true && this.isSetServer();
       boolean that_present_server = true && that.isSetServer();
       if (this_present_server || that_present_server) {
@@ -19170,16 +19093,6 @@ public class Blur {
       int lastComparison = 0;
       cancelQuery_args typedOther = (cancelQuery_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSession()).compareTo(typedOther.isSetSession());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSession()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, typedOther.session);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer());
       if (lastComparison != 0) {
         return lastComparison;
@@ -19220,14 +19133,6 @@ public class Blur {
       StringBuilder sb = new StringBuilder("cancelQuery_args(");
       boolean first = true;
 
-      sb.append("session:");
-      if (this.session == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.session);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("server:");
       if (this.server == null) {
         sb.append("null");
@@ -19250,9 +19155,6 @@ public class Blur {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (session != null) {
-        session.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -19289,16 +19191,7 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 1: // SESSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.session = new Session();
-                struct.session.read(iprot);
-                struct.setSessionIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // SERVER
+            case 1: // SERVER
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.server = iprot.readString();
                 struct.setServerIsSet(true);
@@ -19306,7 +19199,7 @@ public class Blur {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // ID
+            case 2: // ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.id = iprot.readString();
                 struct.setIdIsSet(true);
@@ -19329,11 +19222,6 @@ public class Blur {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.session != null) {
-          oprot.writeFieldBegin(SESSION_FIELD_DESC);
-          struct.session.write(oprot);
-          oprot.writeFieldEnd();
-        }
         if (struct.server != null) {
           oprot.writeFieldBegin(SERVER_FIELD_DESC);
           oprot.writeString(struct.server);
@@ -19362,19 +19250,13 @@ public class Blur {
       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.isSetSession()) {
-          optionals.set(0);
-        }
         if (struct.isSetServer()) {
-          optionals.set(1);
+          optionals.set(0);
         }
         if (struct.isSetId()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
-        if (struct.isSetSession()) {
-          struct.session.write(oprot);
+          optionals.set(1);
         }
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetServer()) {
           oprot.writeString(struct.server);
         }
@@ -19386,17 +19268,12 @@ public class Blur {
       @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(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
-          struct.session = new Session();
-          struct.session.read(iprot);
-          struct.setSessionIsSet(true);
-        }
-        if (incoming.get(1)) {
           struct.server = iprot.readString();
           struct.setServerIsSet(true);
         }
-        if (incoming.get(2)) {
+        if (incoming.get(1)) {
           struct.id = iprot.readString();
           struct.setIdIsSet(true);
         }
@@ -19764,8 +19641,7 @@ public class Blur {
   public static class queryStatusIdList_args implements org.apache.thrift.TBase<queryStatusIdList_args, queryStatusIdList_args._Fields>, java.io.Serializable, Cloneable   {
     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 org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -19773,13 +19649,11 @@ public class Blur {
       schemes.put(TupleScheme.class, new queryStatusIdList_argsTupleSchemeFactory());
     }
 
-    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"),
-      SERVER((short)2, "server");
+      SERVER((short)1, "server");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -19794,9 +19668,7 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SESSION
-            return SESSION;
-          case 2: // SERVER
+          case 1: // SERVER
             return SERVER;
           default:
             return null;
@@ -19841,8 +19713,6 @@ 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.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);
@@ -19853,11 +19723,9 @@ public class Blur {
     }
 
     public queryStatusIdList_args(
-      Session session,
       String server)
     {
       this();
-      this.session = session;
       this.server = server;
     }
 
@@ -19865,9 +19733,6 @@ public class Blur {
      * Performs a deep copy on <i>other</i>.
      */
     public queryStatusIdList_args(queryStatusIdList_args other) {
-      if (other.isSetSession()) {
-        this.session = new Session(other.session);
-      }
       if (other.isSetServer()) {
         this.server = other.server;
       }
@@ -19879,34 +19744,9 @@ public class Blur {
 
     @Override
     public void clear() {
-      this.session = null;
       this.server = null;
     }
 
-    public Session getSession() {
-      return this.session;
-    }
-
-    public queryStatusIdList_args setSession(Session session) {
-      this.session = session;
-      return this;
-    }
-
-    public void unsetSession() {
-      this.session = null;
-    }
-
-    /** Returns true if field session is set (has been assigned a value) and false otherwise */
-    public boolean isSetSession() {
-      return this.session != null;
-    }
-
-    public void setSessionIsSet(boolean value) {
-      if (!value) {
-        this.session = null;
-      }
-    }
-
     public String getServer() {
       return this.server;
     }
@@ -19933,14 +19773,6 @@ public class Blur {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SESSION:
-        if (value == null) {
-          unsetSession();
-        } else {
-          setSession((Session)value);
-        }
-        break;
-
       case SERVER:
         if (value == null) {
           unsetServer();
@@ -19954,9 +19786,6 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SESSION:
-        return getSession();
-
       case SERVER:
         return getServer();
 
@@ -19971,8 +19800,6 @@ public class Blur {
       }
 
       switch (field) {
-      case SESSION:
-        return isSetSession();
       case SERVER:
         return isSetServer();
       }
@@ -19992,15 +19819,6 @@ public class Blur {
       if (that == null)
         return false;
 
-      boolean this_present_session = true && this.isSetSession();
-      boolean that_present_session = true && that.isSetSession();
-      if (this_present_session || that_present_session) {
-        if (!(this_present_session && that_present_session))
-          return false;
-        if (!this.session.equals(that.session))
-          return false;
-      }
-
       boolean this_present_server = true && this.isSetServer();
       boolean that_present_server = true && that.isSetServer();
       if (this_present_server || that_present_server) {
@@ -20026,16 +19844,6 @@ public class Blur {
       int lastComparison = 0;
       queryStatusIdList_args typedOther = (queryStatusIdList_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSession()).compareTo(typedOther.isSetSession());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSession()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, typedOther.session);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer());
       if (lastComparison != 0) {
         return lastComparison;
@@ -20066,14 +19874,6 @@ public class Blur {
       StringBuilder sb = new StringBuilder("queryStatusIdList_args(");
       boolean first = true;
 
-      sb.append("session:");
-      if (this.session == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.session);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("server:");
       if (this.server == null) {
         sb.append("null");
@@ -20088,9 +19888,6 @@ public class Blur {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (session != null) {
-        session.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -20127,16 +19924,7 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 1: // SESSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.session = new Session();
-                struct.session.read(iprot);
-                struct.setSessionIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // SERVER
+            case 1: // SERVER
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.server = iprot.readString();
                 struct.setServerIsSet(true);
@@ -20159,11 +19947,6 @@ public class Blur {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.session != null) {
-          oprot.writeFieldBegin(SESSION_FIELD_DESC);
-          struct.session.write(oprot);
-          oprot.writeFieldEnd();
-        }
         if (struct.server != null) {
           oprot.writeFieldBegin(SERVER_FIELD_DESC);
           oprot.writeString(struct.server);
@@ -20187,16 +19970,10 @@ public class Blur {
       public void write(org.apache.thrift.protocol.TProtocol prot, queryStatusIdList_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetSession()) {
-          optionals.set(0);
-        }
         if (struct.isSetServer()) {
-          optionals.set(1);
-        }
-        oprot.writeBitSet(optionals, 2);
-        if (struct.isSetSession()) {
-          struct.session.write(oprot);
+          optionals.set(0);
         }
+        oprot.writeBitSet(optionals, 1);
         if (struct.isSetServer()) {
           oprot.writeString(struct.server);
         }
@@ -20205,13 +19982,8 @@ public class Blur {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryStatusIdList_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.session = new Session();
-          struct.session.read(iprot);
-          struct.setSessionIsSet(true);
-        }
-        if (incoming.get(1)) {
           struct.server = iprot.readString();
           struct.setServerIsSet(true);
         }
@@ -20778,9 +20550,8 @@ public class Blur {
   public static class queryStatus_args implements org.apache.thrift.TBase<queryStatus_args, queryStatus_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("queryStatus_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 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 org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (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.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -20788,15 +20559,13 @@ public class Blur {
       schemes.put(TupleScheme.class, new queryStatus_argsTupleSchemeFactory());
     }
 
-    public Session session; // 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"),
-      SERVER((short)2, "server"),
-      ID((short)3, "id");
+      SERVER((short)1, "server"),
+      ID((short)2, "id");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -20811,11 +20580,9 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SESSION
-            return SESSION;
-          case 2: // SERVER
+          case 1: // SERVER
             return SERVER;
-          case 3: // ID
+          case 2: // ID
             return ID;
           default:
             return null;
@@ -20860,8 +20627,6 @@ 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.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, 
@@ -20874,12 +20639,10 @@ public class Blur {
     }
 
     public queryStatus_args(
-      Session session,
       String server,
       String id)
     {
       this();
-      this.session = session;
       this.server = server;
       this.id = id;
     }
@@ -20888,9 +20651,6 @@ public class Blur {
      * Performs a deep copy on <i>other</i>.
      */
     public queryStatus_args(queryStatus_args other) {
-      if (other.isSetSession()) {
-        this.session = new Session(other.session);
-      }
       if (other.isSetServer()) {
         this.server = other.server;
       }
@@ -20905,35 +20665,10 @@ public class Blur {
 
     @Override
     public void clear() {
-      this.session = null;
       this.server = null;
       this.id = null;
     }
 
-    public Session getSession() {
-      return this.session;
-    }
-
-    public queryStatus_args setSession(Session session) {
-      this.session = session;
-      return this;
-    }
-
-    public void unsetSession() {
-      this.session = null;
-    }
-
-    /** Returns true if field session is set (has been assigned a value) and false otherwise */
-    public boolean isSetSession() {
-      return this.session != null;
-    }
-
-    public void setSessionIsSet(boolean value) {
-      if (!value) {
-        this.session = null;
-      }
-    }
-
     public String getServer() {
       return this.server;
     }
@@ -20984,14 +20719,6 @@ public class Blur {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SESSION:
-        if (value == null) {
-          unsetSession();
-        } else {
-          setSession((Session)value);
-        }
-        break;
-
       case SERVER:
         if (value == null) {
           unsetServer();
@@ -21013,9 +20740,6 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SESSION:
-        return getSession();
-
       case SERVER:
         return getServer();
 
@@ -21033,8 +20757,6 @@ public class Blur {
       }
 
       switch (field) {
-      case SESSION:
-        return isSetSession();
       case SERVER:
         return isSetServer();
       case ID:
@@ -21056,15 +20778,6 @@ public class Blur {
       if (that == null)
         return false;
 
-      boolean this_present_session = true && this.isSetSession();
-      boolean that_present_session = true && that.isSetSession();
-      if (this_present_session || that_present_session) {
-        if (!(this_present_session && that_present_session))
-          return false;
-        if (!this.session.equals(that.session))
-          return false;
-      }
-
       boolean this_present_server = true && this.isSetServer();
       boolean that_present_server = true && that.isSetServer();
       if (this_present_server || that_present_server) {
@@ -21099,16 +20812,6 @@ public class Blur {
       int lastComparison = 0;
       queryStatus_args typedOther = (queryStatus_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSession()).compareTo(typedOther.isSetSession());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSession()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, typedOther.session);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer());
       if (lastComparison != 0) {
         return lastComparison;
@@ -21149,14 +20852,6 @@ public class Blur {
       StringBuilder sb = new StringBuilder("queryStatus_args(");
       boolean first = true;
 
-      sb.append("session:");
-      if (this.session == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.session);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("server:");
       if (this.server == null) {
         sb.append("null");
@@ -21179,9 +20874,6 @@ public class Blur {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (session != null) {
-        session.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -21218,16 +20910,7 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 1: // SESSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.session = new Session();
-                struct.session.read(iprot);
-                struct.setSessionIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // SERVER
+            case 1: // SERVER
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.server = iprot.readString();
                 struct.setServerIsSet(true);
@@ -21235,7 +20918,7 @@ public class Blur {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // ID
+            case 2: // ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.id = iprot.readString();
                 struct.setIdIsSet(true);
@@ -21258,11 +20941,6 @@ public class Blur {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.session != null) {
-          oprot.writeFieldBegin(SESSION_FIELD_DESC);
-          struct.session.write(oprot);
-          oprot.writeFieldEnd();
-        }
         if (struct.server != null) {
           oprot.writeFieldBegin(SERVER_FIELD_DESC);
           oprot.writeString(struct.server);
@@ -21291,19 +20969,13 @@ public class Blur {
       public void write(org.apache.thrift.protocol.TProtocol prot, queryStatus_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetSession()) {
-          optionals.set(0);
-        }
         if (struct.isSetServer()) {
-          optionals.set(1);
+          optionals.set(0);
         }
         if (struct.isSetId()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
-        if (struct.isSetSession()) {
-          struct.session.write(oprot);
+          optionals.set(1);
         }
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetServer()) {
           oprot.writeString(struct.server);
         }
@@ -21315,17 +20987,12 @@ public class Blur {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryStatus_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
-          struct.session = new Session();
-          struct.session.read(iprot);
-          struct.setSessionIsSet(true);
-        }
-        if (incoming.get(1)) {
           struct.server = iprot.readString();
           struct.setServerIsSet(true);
         }
-        if (incoming.get(2)) {
+        if (incoming.get(1)) {
           struct.id = iprot.readString();
           struct.setIdIsSet(true);
         }
@@ -21858,7 +21525,7 @@ public class Blur {
   public static class schema_args implements org.apache.thrift.TBase<schema_args, schema_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("schema_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 TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -21866,11 +21533,11 @@ public class Blur {
       schemes.put(TupleScheme.class, new schema_argsTupleSchemeFactory());
     }
 
-    public Session session; // required
+    public String tableName; // 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");
+      TABLE_NAME((short)1, "tableName");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -21885,8 +21552,8 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SESSION
-            return SESSION;
+          case 1: // TABLE_NAME
+            return TABLE_NAME;
           default:
             return null;
         }
@@ -21930,8 +21597,8 @@ 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.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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", 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(schema_args.class, metaDataMap);
     }
@@ -21940,18 +21607,18 @@ public class Blur {
     }
 
     public schema_args(
-      Session session)
+      String tableName)
     {
       this();
-      this.session = session;
+      this.tableName = tableName;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
     public schema_args(schema_args other) {
-      if (other.isSetSession()) {
-        this.session = new Session(other.session);
+      if (other.isSetTableName()) {
+        this.tableName = other.tableName;
       }
     }
 
@@ -21961,40 +21628,40 @@ public class Blur {
 
     @Override
     public void clear() {
-      this.session = null;
+      this.tableName = null;
     }
 
-    public Session getSession() {
-      return this.session;
+    public String getTableName() {
+      return this.tableName;
     }
 
-    public schema_args setSession(Session session) {
-      this.session = session;
+    public schema_args setTableName(String tableName) {
+      this.tableName = tableName;
       return this;
     }
 
-    public void unsetSession() {
-      this.session = null;
+    public void unsetTableName() {
+      this.tableName = null;
     }
 
-    /** Returns true if field session is set (has been assigned a value) and false otherwise */
-    public boolean isSetSession() {
-      return this.session != null;
+    /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
+    public boolean isSetTableName() {
+      return this.tableName != null;
     }
 
-    public void setSessionIsSet(boolean value) {
+    public void setTableNameIsSet(boolean value) {
       if (!value) {
-        this.session = null;
+        this.tableName = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SESSION:
+      case TABLE_NAME:
         if (value == null) {
-          unsetSession();
+          unsetTableName();
         } else {
-          setSession((Session)value);
+          setTableName((String)value);
         }
         break;
 
@@ -22003,8 +21670,8 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SESSION:
-        return getSession();
+      case TABLE_NAME:
+        return getTableName();
 
       }
       throw new IllegalStateException();
@@ -22017,8 +21684,8 @@ public class Blur {
       }
 
       switch (field) {
-      case SESSION:
-        return isSetSession();
+      case TABLE_NAME:
+        return isSetTableName();
       }
       throw new IllegalStateException();
     }
@@ -22036,12 +21703,12 @@ public class Blur {
       if (that == null)
         return false;
 
-      boolean this_present_session = true && this.isSetSession();
-      boolean that_present_session = true && that.isSetSession();
-      if (this_present_session || that_present_session) {
-        if (!(this_present_session && that_present_session))
+      boolean this_present_tableName = true && this.isSetTableName();
+      boolean that_present_tableName = true && that.isSetTableName();
+      if (this_present_tableName || that_present_tableName) {
+        if (!(this_present_tableName && that_present_tableName))
           return false;
-        if (!this.session.equals(that.session))
+        if (!this.tableName.equals(that.tableName))
           return false;
       }
 
@@ -22061,12 +21728,12 @@ public class Blur {
       int lastComparison = 0;
       schema_args typedOther = (schema_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSession()).compareTo(typedOther.isSetSession());
+      lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetSession()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, typedOther.session);
+      if (isSetTableName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -22091,11 +21758,11 @@ public class Blur {
       StringBuilder sb = new StringBuilder("schema_args(");
       boolean first = true;
 
-      sb.append("session:");
-      if (this.session == null) {
+      sb.append("tableName:");
+      if (this.tableName == null) {
         sb.append("null");
       } else {
-        sb.append(this.session);
+        sb.append(this.tableName);
       }
       first = false;
       sb.append(")");
@@ -22105,9 +21772,6 @@ public class Blur {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (session != null) {
-        session.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -22144,11 +21808,10 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 1: // SESSION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.session = new Session();
-                struct.session.read(iprot);
-                struct.setSessionIsSet(true);
+            case 1: // TABLE_NAME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -22168,9 +21831,9 @@ public class Blur {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.session != null) {
-          oprot.writeFieldBegin(SESSION_FIELD_DESC);
-          struct.session.write(oprot);
+        if (struct.tableName != null) {
+          oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
+          oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -22191,12 +21854,12 @@ public class Blur {
       public void write(org.apache.thrift.protocol.TProtocol prot, schema_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetSession()) {
+        if (struct.isSetTableName()) {
           optionals.set(0);
         }
         oprot.writeBitSet(optionals, 1);
-        if (struct.isSetSession()) {
-          struct.session.write(oprot);
+        if (struct.isSetTableName()) {
+          oprot.writeString(struct.tableName);
         }
       }
 
@@ -22205,9 +21868,8 @@ public class Blur {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
-          struct.session = new Session();
-          struct.session.read(iprot);
-          struct.setSessionIsSet(true);
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cf92e0ff/src/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/Blur.thrift b/src/distribution/src/main/scripts/interface/Blur.thrift
index 74a12ab..b8cc0f0 100644
--- a/src/distribution/src/main/scripts/interface/Blur.thrift
+++ b/src/distribution/src/main/scripts/interface/Blur.thrift
@@ -702,35 +702,32 @@ service Blur {
 
   /**
    * Cancels a query that is executing within the given session.
-   * @param session the Session.
    * @param server the server name to receive the call, null for all servers.
    * @param id the id of the query, (QueryArgs.id).
    */
-  void cancelQuery(1:Session session, 2:string server, 3:string id) throws (1:BlurException ex)
+  void cancelQuery(1:string server, 2:string id) throws (1:BlurException ex)
 
   /**
    * Returns a list of the query ids of queries that have recently been executed within the given session.
-   * @param session the Session.
    * @param server the server name to receive the call, null for all servers.
    * @return the ids of the query objects, (QueryArgs.id).
    */
-  map<string,list<string>> queryStatusIdList(1:Session session, 2:string server) throws (1:BlurException ex)
+  map<string,list<string>> queryStatusIdList(1:string server) throws (1:BlurException ex)
 
   /**
    * Returns the query status for the given session and query id, (QueryArgs.id).
-   * @param session the Session.
    * @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.
    */
-  map<string,QueryStatus> queryStatus(1:Session session, 2:string server, 3:string id) throws (1:BlurException ex)
+  map<string,QueryStatus> queryStatus(1:string server, 2:string id) throws (1:BlurException ex)
 
   /**
-   * Returns the the schema for the given session.
-   * @param session the Session.
+   * Returns the the schema for the given table.
+   * @param tableName the table name.
    * @return the table schema.
    */
-  TableSchema schema(1:Session session) throws (1:BlurException ex)
+  TableSchema schema(1:string tableName) throws (1:BlurException ex)
 
   //TODO
   TableStats tableStats(1:string table) throws (1:BlurException ex)

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cf92e0ff/src/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-html/Blur.html b/src/distribution/src/main/scripts/interface/gen-html/Blur.html
index 0083c21..26b331f 100644
--- a/src/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/src/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -473,37 +473,31 @@ block until natural refresh occurs.
 </pre>Returns a table descriptor for the given table.
 @param table the table name.
 <br/></div><div class="definition"><h4 id="Fn_Blur_cancelQuery">Function: Blur.cancelQuery</h4>
-<pre><code>void</code> cancelQuery(<code><a href="Blur.html#Struct_Session">Session</a></code> session,
-                 <code>string</code> server,
+<pre><code>void</code> cancelQuery(<code>string</code> server,
                  <code>string</code> id)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Cancels a query that is executing within the given session.
-@param session the Session.
 @param server the server name to receive the call, null for all servers.
 @param id the id of the query, (QueryArgs.id).
 <br/></div><div class="definition"><h4 id="Fn_Blur_queryStatusIdList">Function: Blur.queryStatusIdList</h4>
-<pre><code>map&lt;<code>string</code>, <code>list&lt;<code>string</code>&gt;</code>&gt;</code> queryStatusIdList(<code><a href="Blur.html#Struct_Session">Session</a></code> session,
-                                          <code>string</code> server)
+<pre><code>map&lt;<code>string</code>, <code>list&lt;<code>string</code>&gt;</code>&gt;</code> queryStatusIdList(<code>string</code> server)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of the query ids of queries that have recently been executed within the given session.
-@param session the Session.
 @param server the server name to receive the call, null for all servers.
 @return the ids of the query objects, (QueryArgs.id).
 <br/></div><div class="definition"><h4 id="Fn_Blur_queryStatus">Function: Blur.queryStatus</h4>
-<pre><code>map&lt;<code>string</code>, <code><a href="Blur.html#Struct_QueryStatus">QueryStatus</a></code>&gt;</code> queryStatus(<code><a href="Blur.html#Struct_Session">Session</a></code> session,
-                                   <code>string</code> server,
+<pre><code>map&lt;<code>string</code>, <code><a href="Blur.html#Struct_QueryStatus">QueryStatus</a></code>&gt;</code> queryStatus(<code>string</code> server,
                                    <code>string</code> id)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns the query status for the given session and query id, (QueryArgs.id).
-@param session the Session.
 @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.
 <br/></div><div class="definition"><h4 id="Fn_Blur_schema">Function: Blur.schema</h4>
-<pre><code><a href="Blur.html#Struct_TableSchema">TableSchema</a></code> schema(<code><a href="Blur.html#Struct_Session">Session</a></code> session)
+<pre><code><a href="Blur.html#Struct_TableSchema">TableSchema</a></code> schema(<code>string</code> tableName)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>Returns the the schema for the given session.
-@param session the Session.
+</pre>Returns the the schema for the given table.
+@param tableName the table name.
 @return the table schema.
 <br/></div><div class="definition"><h4 id="Fn_Blur_tableStats">Function: Blur.tableStats</h4>
 <pre><code><a href="Blur.html#Struct_TableStats">TableStats</a></code> tableStats(<code>string</code> table)


Mime
View raw message