http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java index d0dd35d..7005321 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java @@ -21725,7 +21725,7 @@ public class Blur { struct.success = new HashMap<String,List<String>>(2*_map294.size); for (int _i295 = 0; _i295 < _map294.size; ++_i295) { - String _key296; // required + String _key296; // optional List<String> _val297; // required _key296 = iprot.readString(); { @@ -21853,7 +21853,7 @@ public class Blur { struct.success = new HashMap<String,List<String>>(2*_map305.size); for (int _i306 = 0; _i306 < _map305.size; ++_i306) { - String _key307; // required + String _key307; // optional List<String> _val308; // required _key307 = iprot.readString(); { @@ -36456,7 +36456,7 @@ public class Blur { struct.success = new HashMap<String,String>(2*_map384.size); for (int _i385 = 0; _i385 < _map384.size; ++_i385) { - String _key386; // required + String _key386; // optional String _val387; // required _key386 = iprot.readString(); _val387 = iprot.readString(); @@ -36561,7 +36561,7 @@ public class Blur { struct.success = new HashMap<String,String>(2*_map390.size); for (int _i391 = 0; _i391 < _map390.size; ++_i391) { - String _key392; // required + String _key392; // optional String _val393; // required _key392 = iprot.readString(); _val393 = iprot.readString(); @@ -37354,7 +37354,7 @@ public class Blur { struct.success = new HashMap<String,Map<String,ShardState>>(2*_map394.size); for (int _i395 = 0; _i395 < _map394.size; ++_i395) { - String _key396; // required + String _key396; // optional Map<String,ShardState> _val397; // required _key396 = iprot.readString(); { @@ -37362,7 +37362,7 @@ public class Blur { _val397 = new HashMap<String,ShardState>(2*_map398.size); for (int _i399 = 0; _i399 < _map398.size; ++_i399) { - String _key400; // required + String _key400; // optional ShardState _val401; // required _key400 = iprot.readString(); _val401 = ShardState.findByValue(iprot.readI32()); @@ -37486,7 +37486,7 @@ public class Blur { struct.success = new HashMap<String,Map<String,ShardState>>(2*_map406.size); for (int _i407 = 0; _i407 < _map406.size; ++_i407) { - String _key408; // required + String _key408; // optional Map<String,ShardState> _val409; // required _key408 = iprot.readString(); { @@ -37494,7 +37494,7 @@ public class Blur { _val409 = new HashMap<String,ShardState>(2*_map410.size); for (int _i411 = 0; _i411 < _map410.size; ++_i411) { - String _key412; // required + String _key412; // optional ShardState _val413; // required _key412 = iprot.readString(); _val413 = ShardState.findByValue(iprot.readI32()); @@ -38979,7 +38979,7 @@ public class Blur { struct.success = new HashMap<String,String>(2*_map414.size); for (int _i415 = 0; _i415 < _map414.size; ++_i415) { - String _key416; // required + String _key416; // optional String _val417; // required _key416 = iprot.readString(); _val417 = iprot.readString(); @@ -39084,7 +39084,7 @@ public class Blur { struct.success = new HashMap<String,String>(2*_map420.size); for (int _i421 = 0; _i421 < _map420.size; ++_i421) { - String _key422; // required + String _key422; // optional String _val423; // required _key422 = iprot.readString(); _val423 = iprot.readString(); @@ -39916,7 +39916,7 @@ public class Blur { struct.success = new HashMap<String,Metric>(2*_map432.size); for (int _i433 = 0; _i433 < _map432.size; ++_i433) { - String _key434; // required + String _key434; // optional Metric _val435; // required _key434 = iprot.readString(); _val435 = new Metric(); @@ -40022,7 +40022,7 @@ public class Blur { struct.success = new HashMap<String,Metric>(2*_map438.size); for (int _i439 = 0; _i439 < _map438.size; ++_i439) { - String _key440; // required + String _key440; // optional Metric _val441; // required _key440 = iprot.readString(); _val441 = new Metric();
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java index a9caf29..6cac5a1 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java @@ -1050,7 +1050,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. struct.cpuTimes = new HashMap<String,CpuTime>(2*_map126.size); for (int _i127 = 0; _i127 < _map126.size; ++_i127) { - String _key128; // required + String _key128; // optional CpuTime _val129; // required _key128 = iprot.readString(); _val129 = new CpuTime(); @@ -1263,7 +1263,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. struct.cpuTimes = new HashMap<String,CpuTime>(2*_map132.size); for (int _i133 = 0; _i133 < _map132.size; ++_i133) { - String _key134; // required + String _key134; // optional CpuTime _val135; // required _key134 = iprot.readString(); _val135 = new CpuTime(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java index a7fc566..aa923cc 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java @@ -900,7 +900,7 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas struct.shardInfo = new HashMap<String,Long>(2*_map84.size); for (int _i85 = 0; _i85 < _map84.size; ++_i85) { - String _key86; // required + String _key86; // optional long _val87; // required _key86 = iprot.readString(); _val87 = iprot.readI64(); @@ -1146,7 +1146,7 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas struct.shardInfo = new HashMap<String,Long>(2*_map105.size); for (int _i106 = 0; _i106 < _map105.size; ++_i106) { - String _key107; // required + String _key107; // optional long _val108; // required _key107 = iprot.readString(); _val108 = iprot.readI64(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java index 0ebf5a7..55d1744 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java @@ -992,7 +992,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0 struct.properties = new HashMap<String,String>(2*_map136.size); for (int _i137 = 0; _i137 < _map136.size; ++_i137) { - String _key138; // required + String _key138; // optional String _val139; // required _key138 = iprot.readString(); _val139 = iprot.readString(); @@ -1167,7 +1167,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0 struct.properties = new HashMap<String,String>(2*_map142.size); for (int _i143 = 0; _i143 < _map142.size; ++_i143) { - String _key144; // required + String _key144; // optional String _val145; // required _key144 = iprot.readString(); _val145 = iprot.readString(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java index ccb417c..8e2be42 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java @@ -707,7 +707,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.strMap = new HashMap<String,String>(2*_map202.size); for (int _i203 = 0; _i203 < _map202.size; ++_i203) { - String _key204; // required + String _key204; // optional String _val205; // required _key204 = iprot.readString(); _val205 = iprot.readString(); @@ -727,7 +727,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.longMap = new HashMap<String,Long>(2*_map206.size); for (int _i207 = 0; _i207 < _map206.size; ++_i207) { - String _key208; // required + String _key208; // optional long _val209; // required _key208 = iprot.readString(); _val209 = iprot.readI64(); @@ -747,7 +747,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.doubleMap = new HashMap<String,Double>(2*_map210.size); for (int _i211 = 0; _i211 < _map210.size; ++_i211) { - String _key212; // required + String _key212; // optional double _val213; // required _key212 = iprot.readString(); _val213 = iprot.readDouble(); @@ -899,7 +899,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.strMap = new HashMap<String,String>(2*_map220.size); for (int _i221 = 0; _i221 < _map220.size; ++_i221) { - String _key222; // required + String _key222; // optional String _val223; // required _key222 = iprot.readString(); _val223 = iprot.readString(); @@ -914,7 +914,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.longMap = new HashMap<String,Long>(2*_map224.size); for (int _i225 = 0; _i225 < _map224.size; ++_i225) { - String _key226; // required + String _key226; // optional long _val227; // required _key226 = iprot.readString(); _val227 = iprot.readI64(); @@ -929,7 +929,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met struct.doubleMap = new HashMap<String,Double>(2*_map228.size); for (int _i229 = 0; _i229 < _map228.size; ++_i229) { - String _key230; // required + String _key230; // optional double _val231; // required _key230 = iprot.readString(); _val231 = iprot.readDouble(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Response.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Response.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Response.java index 6354606..1e36a12 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Response.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Response.java @@ -206,7 +206,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res shardToValue = new HashMap<Shard,ValueObject>(2*_map240.size); for (int _i241 = 0; _i241 < _map240.size; ++_i241) { - Shard _key242; // required + Shard _key242; // optional ValueObject _val243; // required _key242 = new Shard(); _key242.read(iprot); @@ -229,7 +229,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res serverToValue = new HashMap<Server,ValueObject>(2*_map244.size); for (int _i245 = 0; _i245 < _map244.size; ++_i245) { - Server _key246; // required + Server _key246; // optional ValueObject _val247; // required _key246 = new Server(); _key246.read(iprot); @@ -310,7 +310,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res shardToValue = new HashMap<Shard,ValueObject>(2*_map250.size); for (int _i251 = 0; _i251 < _map250.size; ++_i251) { - Shard _key252; // required + Shard _key252; // optional ValueObject _val253; // required _key252 = new Shard(); _key252.read(iprot); @@ -328,7 +328,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res serverToValue = new HashMap<Server,ValueObject>(2*_map254.size); for (int _i255 = 0; _i255 < _map254.size; ++_i255) { - Server _key256; // required + Server _key256; // optional ValueObject _val257; // required _key256 = new Server(); _key256.read(iprot); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java index ef3191c..39e1dbb 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java @@ -492,7 +492,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map146.size); for (int _i147 = 0; _i147 < _map146.size; ++_i147) { - String _key148; // required + String _key148; // optional Map<String,ColumnDefinition> _val149; // required _key148 = iprot.readString(); { @@ -500,7 +500,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch _val149 = new HashMap<String,ColumnDefinition>(2*_map150.size); for (int _i151 = 0; _i151 < _map150.size; ++_i151) { - String _key152; // required + String _key152; // optional ColumnDefinition _val153; // required _key152 = iprot.readString(); _val153 = new ColumnDefinition(); @@ -620,7 +620,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map158.size); for (int _i159 = 0; _i159 < _map158.size; ++_i159) { - String _key160; // required + String _key160; // optional Map<String,ColumnDefinition> _val161; // required _key160 = iprot.readString(); { @@ -628,7 +628,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch _val161 = new HashMap<String,ColumnDefinition>(2*_map162.size); for (int _i163 = 0; _i163 < _map162.size; ++_i163) { - String _key164; // required + String _key164; // optional ColumnDefinition _val165; // required _key164 = iprot.readString(); _val165 = new ColumnDefinition(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java index 37385d7..af622c5 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java @@ -1304,7 +1304,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map29.size); for (int _i30 = 0; _i30 < _map29.size; ++_i30) { - String _key31; // required + String _key31; // optional Set<String> _val32; // required _key31 = iprot.readString(); { @@ -1603,7 +1603,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map50.size); for (int _i51 = 0; _i51 < _map50.size; ++_i51) { - String _key52; // required + String _key52; // optional Set<String> _val53; // required _key52 = iprot.readString(); { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Shard.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Shard.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Shard.java index 751be40..6945aac 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Shard.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Shard.java @@ -52,7 +52,8 @@ import java.util.Arrays; public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shard, Shard._Fields>, java.io.Serializable, Cloneable { private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("Shard"); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SHARD_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("shard", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SHARD_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("shard", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -60,11 +61,13 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar schemes.put(TupleScheme.class, new ShardTupleSchemeFactory()); } + public String table; // required public String shard; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum { - SHARD((short)1, "shard"); + TABLE((short)1, "table"), + SHARD((short)2, "shard"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -79,7 +82,9 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // SHARD + case 1: // TABLE + return TABLE; + case 2: // SHARD return SHARD; default: return null; @@ -124,6 +129,8 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, + new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))); tmpMap.put(_Fields.SHARD, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("shard", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -134,9 +141,11 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar } public Shard( + String table, String shard) { this(); + this.table = table; this.shard = shard; } @@ -144,6 +153,9 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar * Performs a deep copy on <i>other</i>. */ public Shard(Shard other) { + if (other.isSetTable()) { + this.table = other.table; + } if (other.isSetShard()) { this.shard = other.shard; } @@ -155,9 +167,34 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar @Override public void clear() { + this.table = null; this.shard = null; } + public String getTable() { + return this.table; + } + + public Shard setTable(String table) { + this.table = table; + return this; + } + + public void unsetTable() { + this.table = null; + } + + /** Returns true if field table is set (has been assigned a value) and false otherwise */ + public boolean isSetTable() { + return this.table != null; + } + + public void setTableIsSet(boolean value) { + if (!value) { + this.table = null; + } + } + public String getShard() { return this.shard; } @@ -184,6 +221,14 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar public void setFieldValue(_Fields field, Object value) { switch (field) { + case TABLE: + if (value == null) { + unsetTable(); + } else { + setTable((String)value); + } + break; + case SHARD: if (value == null) { unsetShard(); @@ -197,6 +242,9 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar public Object getFieldValue(_Fields field) { switch (field) { + case TABLE: + return getTable(); + case SHARD: return getShard(); @@ -211,6 +259,8 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar } switch (field) { + case TABLE: + return isSetTable(); case SHARD: return isSetShard(); } @@ -230,6 +280,15 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar if (that == null) return false; + boolean this_present_table = true && this.isSetTable(); + boolean that_present_table = true && that.isSetTable(); + if (this_present_table || that_present_table) { + if (!(this_present_table && that_present_table)) + return false; + if (!this.table.equals(that.table)) + return false; + } + boolean this_present_shard = true && this.isSetShard(); boolean that_present_shard = true && that.isSetShard(); if (this_present_shard || that_present_shard) { @@ -255,6 +314,16 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar int lastComparison = 0; Shard typedOther = (Shard)other; + lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTable()) { + lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.table, typedOther.table); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetShard()).compareTo(typedOther.isSetShard()); if (lastComparison != 0) { return lastComparison; @@ -285,6 +354,14 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar StringBuilder sb = new StringBuilder("Shard("); boolean first = true; + sb.append("table:"); + if (this.table == null) { + sb.append("null"); + } else { + sb.append(this.table); + } + first = false; + if (!first) sb.append(", "); sb.append("shard:"); if (this.shard == null) { sb.append("null"); @@ -335,7 +412,15 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar break; } switch (schemeField.id) { - case 1: // SHARD + case 1: // TABLE + if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) { + struct.table = iprot.readString(); + struct.setTableIsSet(true); + } else { + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // SHARD if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) { struct.shard = iprot.readString(); struct.setShardIsSet(true); @@ -358,6 +443,11 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.table != null) { + oprot.writeFieldBegin(TABLE_FIELD_DESC); + oprot.writeString(struct.table); + oprot.writeFieldEnd(); + } if (struct.shard != null) { oprot.writeFieldBegin(SHARD_FIELD_DESC); oprot.writeString(struct.shard); @@ -381,10 +471,16 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, Shard struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetShard()) { + if (struct.isSetTable()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetShard()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetTable()) { + oprot.writeString(struct.table); + } if (struct.isSetShard()) { oprot.writeString(struct.shard); } @@ -393,8 +489,12 @@ public class Shard implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Shar @Override public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, Shard struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { + struct.table = iprot.readString(); + struct.setTableIsSet(true); + } + if (incoming.get(1)) { struct.shard = iprot.readString(); struct.setShardIsSet(true); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java index 3793c00..1a08bc0 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java @@ -1799,7 +1799,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0. struct.tableProperties = new HashMap<String,String>(2*_map172.size); for (int _i173 = 0; _i173 < _map172.size; ++_i173) { - String _key174; // required + String _key174; // optional String _val175; // required _key174 = iprot.readString(); _val175 = iprot.readString(); @@ -1843,7 +1843,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0. struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map176.size); for (int _i177 = 0; _i177 < _map176.size; ++_i177) { - String _key178; // required + String _key178; // optional String _val179; // required _key178 = iprot.readString(); _val179 = iprot.readString(); @@ -2169,7 +2169,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0. struct.tableProperties = new HashMap<String,String>(2*_map194.size); for (int _i195 = 0; _i195 < _map194.size; ++_i195) { - String _key196; // required + String _key196; // optional String _val197; // required _key196 = iprot.readString(); _val197 = iprot.readString(); @@ -2196,7 +2196,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0. struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map198.size); for (int _i199 = 0; _i199 < _map198.size; ++_i199) { - String _key200; // required + String _key200; // optional String _val201; // required _key200 = iprot.readString(); _val201 = iprot.readString(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java index 8f152a6..33b0f91 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java @@ -480,8 +480,8 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User, struct.attributes = new HashMap<String,String>(2*_map0.size); for (int _i1 = 0; _i1 < _map0.size; ++_i1) { - String _key2; // required - String _val3; // optional + String _key2; // optional + String _val3; // required _key2 = iprot.readString(); _val3 = iprot.readString(); struct.attributes.put(_key2, _val3); @@ -580,8 +580,8 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User, struct.attributes = new HashMap<String,String>(2*_map6.size); for (int _i7 = 0; _i7 < _map6.size; ++_i7) { - String _key8; // required - String _val9; // optional + String _key8; // optional + String _val9; // required _key8 = iprot.readString(); _val9 = iprot.readString(); struct.attributes.put(_key8, _val9); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-js/Blur_types.js ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-js/Blur_types.js b/distribution/src/main/scripts/interface/gen-js/Blur_types.js index 5b7fb9e..bf040e8 100644 --- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js +++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js @@ -3901,8 +3901,12 @@ Value.prototype.write = function(output) { }; Shard = function(args) { + this.table = null; this.shard = null; if (args) { + if (args.table !== undefined) { + this.table = args.table; + } if (args.shard !== undefined) { this.shard = args.shard; } @@ -3924,14 +3928,18 @@ Shard.prototype.read = function(input) { { case 1: if (ftype == Thrift.Type.STRING) { - this.shard = input.readString().value; + this.table = input.readString().value; } else { input.skip(ftype); } break; - case 0: + case 2: + if (ftype == Thrift.Type.STRING) { + this.shard = input.readString().value; + } else { input.skip(ftype); - break; + } + break; default: input.skip(ftype); } @@ -3943,8 +3951,13 @@ Shard.prototype.read = function(input) { Shard.prototype.write = function(output) { output.writeStructBegin('Shard'); + if (this.table !== null && this.table !== undefined) { + output.writeFieldBegin('table', Thrift.Type.STRING, 1); + output.writeString(this.table); + output.writeFieldEnd(); + } if (this.shard !== null && this.shard !== undefined) { - output.writeFieldBegin('shard', Thrift.Type.STRING, 1); + output.writeFieldBegin('shard', Thrift.Type.STRING, 2); output.writeString(this.shard); output.writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm index e351c55..d0eb402 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm @@ -4080,14 +4080,18 @@ sub write { package Blur::Shard; use base qw(Class::Accessor); -Blur::Shard->mk_accessors( qw( shard ) ); +Blur::Shard->mk_accessors( qw( table shard ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; + $self->{table} = undef; $self->{shard} = undef; if (UNIVERSAL::isa($vals,'HASH')) { + if (defined $vals->{table}) { + $self->{table} = $vals->{table}; + } if (defined $vals->{shard}) { $self->{shard} = $vals->{shard}; } @@ -4115,6 +4119,12 @@ sub read { SWITCH: for($fid) { /^1$/ && do{ if ($ftype == TType::STRING) { + $xfer += $input->readString(\$self->{table}); + } else { + $xfer += $input->skip($ftype); + } + last; }; + /^2$/ && do{ if ($ftype == TType::STRING) { $xfer += $input->readString(\$self->{shard}); } else { $xfer += $input->skip($ftype); @@ -4132,8 +4142,13 @@ sub write { my ($self, $output) = @_; my $xfer = 0; $xfer += $output->writeStructBegin('Shard'); + if (defined $self->{table}) { + $xfer += $output->writeFieldBegin('table', TType::STRING, 1); + $xfer += $output->writeString($self->{table}); + $xfer += $output->writeFieldEnd(); + } if (defined $self->{shard}) { - $xfer += $output->writeFieldBegin('shard', TType::STRING, 1); + $xfer += $output->writeFieldBegin('shard', TType::STRING, 2); $xfer += $output->writeString($self->{shard}); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/distribution/src/main/scripts/interface/gen-rb/blur_types.rb ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb index 709b6cf..cef7dcf 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb @@ -1051,9 +1051,11 @@ module Blur class Shard include ::Thrift::Struct, ::Thrift::Struct_Union - SHARD = 1 + TABLE = 1 + SHARD = 2 FIELDS = { + TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'}, SHARD => {:type => ::Thrift::Types::STRING, :name => 'shard'} } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b55cf9e5/docs/Blur.html ---------------------------------------------------------------------- diff --git a/docs/Blur.html b/docs/Blur.html index b62be1e..9c4e1ab 100644 --- a/docs/Blur.html +++ b/docs/Blur.html @@ -683,7 +683,8 @@ be family dot column, "family.column". <tr><td>9</td><td>nullValue</td><td><code>bool</code></td><td></td><td>default</td><td></td></tr> </table><br/></p></section><section><div class="page-header"><h3 id="Struct_Shard">Struct: Shard</h3></div><p class="lead"> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> -<tr><td>1</td><td>shard</td><td><code>string</code></td><td></td><td>default</td><td></td></tr> +<tr><td>1</td><td>table</td><td><code>string</code></td><td></td><td>default</td><td></td></tr> +<tr><td>2</td><td>shard</td><td><code>string</code></td><td></td><td>default</td><td></td></tr> </table><br/></p></section><section><div class="page-header"><h3 id="Struct_Server">Struct: Server</h3></div><p class="lead"> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> <tr><td>1</td><td>server</td><td><code>string</code></td><td></td><td>default</td><td></td></tr>
