incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [32/51] [abbrv] Massive changes to the the thrift API. Getting closer to the final version, this commit also removes the controller from the architecture.
Date Tue, 11 Dec 2012 02:21:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java b/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
index 9f6274c..a0592bd 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
@@ -53,7 +53,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScoreDoc");
 
   private static final org.apache.thrift.protocol.TField SCORE_FIELD_DESC = new org.apache.thrift.protocol.TField("score",
org.apache.thrift.protocol.TType.DOUBLE, (short)1);
-  private static final org.apache.thrift.protocol.TField DOC_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("docLocation",
org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.thrift.protocol.TField DOC_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("docLocation",
org.apache.thrift.protocol.TType.I64, (short)2);
   private static final org.apache.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("fields",
org.apache.thrift.protocol.TType.LIST, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -63,7 +63,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
   }
 
   public double score; // required
-  public DocLocation docLocation; // required
+  public long docLocation; // required
   public List<ByteBuffer> fields; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
@@ -132,6 +132,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
 
   // isset id assignments
   private static final int __SCORE_ISSET_ID = 0;
+  private static final int __DOCLOCATION_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -139,7 +140,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
     tmpMap.put(_Fields.SCORE, new org.apache.thrift.meta_data.FieldMetaData("score", org.apache.thrift.TFieldRequirementType.DEFAULT,

         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.DOC_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("docLocation",
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
DocLocation.class)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.FIELDS, new org.apache.thrift.meta_data.FieldMetaData("fields", org.apache.thrift.TFieldRequirementType.DEFAULT,

         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,

             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
           , true))));
@@ -152,13 +153,14 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
 
   public ScoreDoc(
     double score,
-    DocLocation docLocation,
+    long docLocation,
     List<ByteBuffer> fields)
   {
     this();
     this.score = score;
     setScoreIsSet(true);
     this.docLocation = docLocation;
+    setDocLocationIsSet(true);
     this.fields = fields;
   }
 
@@ -168,9 +170,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
   public ScoreDoc(ScoreDoc other) {
     __isset_bitfield = other.__isset_bitfield;
     this.score = other.score;
-    if (other.isSetDocLocation()) {
-      this.docLocation = new DocLocation(other.docLocation);
-    }
+    this.docLocation = other.docLocation;
     if (other.isSetFields()) {
       List<ByteBuffer> __this__fields = new ArrayList<ByteBuffer>();
       for (ByteBuffer other_element : other.fields) {
@@ -190,7 +190,8 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
   public void clear() {
     setScoreIsSet(false);
     this.score = 0.0;
-    this.docLocation = null;
+    setDocLocationIsSet(false);
+    this.docLocation = 0;
     this.fields = null;
   }
 
@@ -217,28 +218,27 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCORE_ISSET_ID, value);
   }
 
-  public DocLocation getDocLocation() {
+  public long getDocLocation() {
     return this.docLocation;
   }
 
-  public ScoreDoc setDocLocation(DocLocation docLocation) {
+  public ScoreDoc setDocLocation(long docLocation) {
     this.docLocation = docLocation;
+    setDocLocationIsSet(true);
     return this;
   }
 
   public void unsetDocLocation() {
-    this.docLocation = null;
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DOCLOCATION_ISSET_ID);
   }
 
   /** Returns true if field docLocation is set (has been assigned a value) and false otherwise
*/
   public boolean isSetDocLocation() {
-    return this.docLocation != null;
+    return EncodingUtils.testBit(__isset_bitfield, __DOCLOCATION_ISSET_ID);
   }
 
   public void setDocLocationIsSet(boolean value) {
-    if (!value) {
-      this.docLocation = null;
-    }
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DOCLOCATION_ISSET_ID, value);
   }
 
   public int getFieldsSize() {
@@ -294,7 +294,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
       if (value == null) {
         unsetDocLocation();
       } else {
-        setDocLocation((DocLocation)value);
+        setDocLocation((Long)value);
       }
       break;
 
@@ -315,7 +315,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
       return Double.valueOf(getScore());
 
     case DOC_LOCATION:
-      return getDocLocation();
+      return Long.valueOf(getDocLocation());
 
     case FIELDS:
       return getFields();
@@ -363,12 +363,12 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
         return false;
     }
 
-    boolean this_present_docLocation = true && this.isSetDocLocation();
-    boolean that_present_docLocation = true && that.isSetDocLocation();
+    boolean this_present_docLocation = true;
+    boolean that_present_docLocation = true;
     if (this_present_docLocation || that_present_docLocation) {
       if (!(this_present_docLocation && that_present_docLocation))
         return false;
-      if (!this.docLocation.equals(that.docLocation))
+      if (this.docLocation != that.docLocation)
         return false;
     }
 
@@ -452,11 +452,7 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
     first = false;
     if (!first) sb.append(", ");
     sb.append("docLocation:");
-    if (this.docLocation == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.docLocation);
-    }
+    sb.append(this.docLocation);
     first = false;
     if (!first) sb.append(", ");
     sb.append("fields:");
@@ -473,9 +469,6 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
-    if (docLocation != null) {
-      docLocation.validate();
-    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -523,9 +516,8 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
             }
             break;
           case 2: // DOC_LOCATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.docLocation = new DocLocation();
-              struct.docLocation.read(iprot);
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.docLocation = iprot.readI64();
               struct.setDocLocationIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -534,13 +526,13 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
           case 4: // FIELDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list92 = iprot.readListBegin();
-                struct.fields = new ArrayList<ByteBuffer>(_list92.size);
-                for (int _i93 = 0; _i93 < _list92.size; ++_i93)
+                org.apache.thrift.protocol.TList _list72 = iprot.readListBegin();
+                struct.fields = new ArrayList<ByteBuffer>(_list72.size);
+                for (int _i73 = 0; _i73 < _list72.size; ++_i73)
                 {
-                  ByteBuffer _elem94; // required
-                  _elem94 = iprot.readBinary();
-                  struct.fields.add(_elem94);
+                  ByteBuffer _elem74; // required
+                  _elem74 = iprot.readBinary();
+                  struct.fields.add(_elem74);
                 }
                 iprot.readListEnd();
               }
@@ -567,18 +559,16 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
       oprot.writeFieldBegin(SCORE_FIELD_DESC);
       oprot.writeDouble(struct.score);
       oprot.writeFieldEnd();
-      if (struct.docLocation != null) {
-        oprot.writeFieldBegin(DOC_LOCATION_FIELD_DESC);
-        struct.docLocation.write(oprot);
-        oprot.writeFieldEnd();
-      }
+      oprot.writeFieldBegin(DOC_LOCATION_FIELD_DESC);
+      oprot.writeI64(struct.docLocation);
+      oprot.writeFieldEnd();
       if (struct.fields != null) {
         oprot.writeFieldBegin(FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
struct.fields.size()));
-          for (ByteBuffer _iter95 : struct.fields)
+          for (ByteBuffer _iter75 : struct.fields)
           {
-            oprot.writeBinary(_iter95);
+            oprot.writeBinary(_iter75);
           }
           oprot.writeListEnd();
         }
@@ -616,14 +606,14 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
         oprot.writeDouble(struct.score);
       }
       if (struct.isSetDocLocation()) {
-        struct.docLocation.write(oprot);
+        oprot.writeI64(struct.docLocation);
       }
       if (struct.isSetFields()) {
         {
           oprot.writeI32(struct.fields.size());
-          for (ByteBuffer _iter96 : struct.fields)
+          for (ByteBuffer _iter76 : struct.fields)
           {
-            oprot.writeBinary(_iter96);
+            oprot.writeBinary(_iter76);
           }
         }
       }
@@ -638,19 +628,18 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc,
ScoreDoc._Fie
         struct.setScoreIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.docLocation = new DocLocation();
-        struct.docLocation.read(iprot);
+        struct.docLocation = iprot.readI64();
         struct.setDocLocationIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
iprot.readI32());
-          struct.fields = new ArrayList<ByteBuffer>(_list97.size);
-          for (int _i98 = 0; _i98 < _list97.size; ++_i98)
+          org.apache.thrift.protocol.TList _list77 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
iprot.readI32());
+          struct.fields = new ArrayList<ByteBuffer>(_list77.size);
+          for (int _i78 = 0; _i78 < _list77.size; ++_i78)
           {
-            ByteBuffer _elem99; // required
-            _elem99 = iprot.readBinary();
-            struct.fields.add(_elem99);
+            ByteBuffer _elem79; // required
+            _elem79 = iprot.readBinary();
+            struct.fields.add(_elem79);
           }
         }
         struct.setFieldsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/ScoreType.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/ScoreType.java b/interface/gen-java/org/apache/blur/thrift/generated/ScoreType.java
deleted file mode 100644
index fd75598..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/ScoreType.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.blur.thrift.generated;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * The scoring type used during a SuperQuery to score multi Record hits within a ColumnFamily.<br/><br/>
- * SUPER - During a multi Record match, a calculation of the best match Record plus how often
it occurs within the match Row produces the score that is used in the scoring of the SuperQuery.<br/><br/>
- * AGGREGATE - During a multi Record match, the aggregate score of all the Records within
a ColumnFamily is used in the scoring of the SuperQuery.<br/><br/>
- * BEST - During a multi Record match, the best score of all the Records within a ColumnFamily
is used in the scoring of the SuperQuery.<br/><br/>
- * CONSTANT - A constant score of 1 is used in the scoring of the SuperQuery.<br/>
- */
-public enum ScoreType implements org.apache.thrift.TEnum {
-  SUPER(0),
-  AGGREGATE(1),
-  BEST(2),
-  CONSTANT(3);
-
-  private final int value;
-
-  private ScoreType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static ScoreType findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return SUPER;
-      case 1:
-        return AGGREGATE;
-      case 2:
-        return BEST;
-      case 3:
-        return CONSTANT;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/Session.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Session.java b/interface/gen-java/org/apache/blur/thrift/generated/Session.java
index 38f8898..7726ff0 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/Session.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/Session.java
@@ -53,7 +53,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Session");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId",
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("properties",
org.apache.thrift.protocol.TType.MAP, (short)2);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -62,12 +61,10 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
   }
 
   public String sessionId; // required
-  public Map<String,String> properties; // 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_ID((short)1, "sessionId"),
-    PROPERTIES((short)2, "properties");
+    SESSION_ID((short)1, "sessionId");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -84,8 +81,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
       switch(fieldId) {
         case 1: // SESSION_ID
           return SESSION_ID;
-        case 2: // PROPERTIES
-          return PROPERTIES;
         default:
           return null;
       }
@@ -131,10 +126,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId",
org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("properties",
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,

-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),

-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Session.class, metaDataMap);
   }
@@ -143,12 +134,10 @@ public class Session implements org.apache.thrift.TBase<Session,
Session._Fields
   }
 
   public Session(
-    String sessionId,
-    Map<String,String> properties)
+    String sessionId)
   {
     this();
     this.sessionId = sessionId;
-    this.properties = properties;
   }
 
   /**
@@ -158,21 +147,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
     if (other.isSetSessionId()) {
       this.sessionId = other.sessionId;
     }
-    if (other.isSetProperties()) {
-      Map<String,String> __this__properties = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.properties.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__properties_copy_key = other_element_key;
-
-        String __this__properties_copy_value = other_element_value;
-
-        __this__properties.put(__this__properties_copy_key, __this__properties_copy_value);
-      }
-      this.properties = __this__properties;
-    }
   }
 
   public Session deepCopy() {
@@ -182,7 +156,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
   @Override
   public void clear() {
     this.sessionId = null;
-    this.properties = null;
   }
 
   public String getSessionId() {
@@ -209,41 +182,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
     }
   }
 
-  public int getPropertiesSize() {
-    return (this.properties == null) ? 0 : this.properties.size();
-  }
-
-  public void putToProperties(String key, String val) {
-    if (this.properties == null) {
-      this.properties = new HashMap<String,String>();
-    }
-    this.properties.put(key, val);
-  }
-
-  public Map<String,String> getProperties() {
-    return this.properties;
-  }
-
-  public Session setProperties(Map<String,String> properties) {
-    this.properties = properties;
-    return this;
-  }
-
-  public void unsetProperties() {
-    this.properties = null;
-  }
-
-  /** Returns true if field properties is set (has been assigned a value) and false otherwise
*/
-  public boolean isSetProperties() {
-    return this.properties != null;
-  }
-
-  public void setPropertiesIsSet(boolean value) {
-    if (!value) {
-      this.properties = null;
-    }
-  }
-
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case SESSION_ID:
@@ -254,14 +192,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
       }
       break;
 
-    case PROPERTIES:
-      if (value == null) {
-        unsetProperties();
-      } else {
-        setProperties((Map<String,String>)value);
-      }
-      break;
-
     }
   }
 
@@ -270,9 +200,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
     case SESSION_ID:
       return getSessionId();
 
-    case PROPERTIES:
-      return getProperties();
-
     }
     throw new IllegalStateException();
   }
@@ -286,8 +213,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
     switch (field) {
     case SESSION_ID:
       return isSetSessionId();
-    case PROPERTIES:
-      return isSetProperties();
     }
     throw new IllegalStateException();
   }
@@ -314,15 +239,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
         return false;
     }
 
-    boolean this_present_properties = true && this.isSetProperties();
-    boolean that_present_properties = true && that.isSetProperties();
-    if (this_present_properties || that_present_properties) {
-      if (!(this_present_properties && that_present_properties))
-        return false;
-      if (!this.properties.equals(that.properties))
-        return false;
-    }
-
     return true;
   }
 
@@ -349,16 +265,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetProperties()).compareTo(typedOther.isSetProperties());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetProperties()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, typedOther.properties);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     return 0;
   }
 
@@ -386,14 +292,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
       sb.append(this.sessionId);
     }
     first = false;
-    if (!first) sb.append(", ");
-    sb.append("properties:");
-    if (this.properties == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.properties);
-    }
-    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -445,26 +343,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // PROPERTIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin();
-                struct.properties = new HashMap<String,String>(2*_map74.size);
-                for (int _i75 = 0; _i75 < _map74.size; ++_i75)
-                {
-                  String _key76; // required
-                  String _val77; // optional
-                  _key76 = iprot.readString();
-                  _val77 = iprot.readString();
-                  struct.properties.put(_key76, _val77);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setPropertiesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -485,19 +363,6 @@ public class Session implements org.apache.thrift.TBase<Session, Session._Fields
         oprot.writeString(struct.sessionId);
         oprot.writeFieldEnd();
       }
-      if (struct.properties != null) {
-        oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, struct.properties.size()));
-          for (Map.Entry<String, String> _iter78 : struct.properties.entrySet())
-          {
-            oprot.writeString(_iter78.getKey());
-            oprot.writeString(_iter78.getValue());
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -519,48 +384,20 @@ public class Session implements org.apache.thrift.TBase<Session,
Session._Fields
       if (struct.isSetSessionId()) {
         optionals.set(0);
       }
-      if (struct.isSetProperties()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
+      oprot.writeBitSet(optionals, 1);
       if (struct.isSetSessionId()) {
         oprot.writeString(struct.sessionId);
       }
-      if (struct.isSetProperties()) {
-        {
-          oprot.writeI32(struct.properties.size());
-          for (Map.Entry<String, String> _iter79 : struct.properties.entrySet())
-          {
-            oprot.writeString(_iter79.getKey());
-            oprot.writeString(_iter79.getValue());
-          }
-        }
-      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Session 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.sessionId = iprot.readString();
         struct.setSessionIdIsSet(true);
       }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.properties = new HashMap<String,String>(2*_map80.size);
-          for (int _i81 = 0; _i81 < _map80.size; ++_i81)
-          {
-            String _key82; // required
-            String _val83; // optional
-            _key82 = iprot.readString();
-            _val83 = iprot.readString();
-            struct.properties.put(_key82, _val83);
-          }
-        }
-        struct.setPropertiesIsSet(true);
-      }
     }
   }
 


Mime
View raw message