Updated Branches: refs/heads/0.1.5 8a0b462f6 -> f4c3cc19e
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4c3cc19/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 9822707..589c8ea 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 @@ -3182,13 +3182,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list166 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list166.size); - for (int _i167 = 0; _i167 < _list166.size; ++_i167) + org.apache.thrift.protocol.TList _list176 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list176.size); + for (int _i177 = 0; _i177 < _list176.size; ++_i177) { - String _elem168; // required - _elem168 = iprot.readString(); - struct.success.add(_elem168); + String _elem178; // required + _elem178 = iprot.readString(); + struct.success.add(_elem178); } iprot.readListEnd(); } @@ -3225,9 +3225,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter169 : struct.success) + for (String _iter179 : struct.success) { - oprot.writeString(_iter169); + oprot.writeString(_iter179); } oprot.writeListEnd(); } @@ -3266,9 +3266,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter170 : struct.success) + for (String _iter180 : struct.success) { - oprot.writeString(_iter170); + oprot.writeString(_iter180); } } } @@ -3283,13 +3283,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list171 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list171.size); - for (int _i172 = 0; _i172 < _list171.size; ++_i172) + org.apache.thrift.protocol.TList _list181 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list181.size); + for (int _i182 = 0; _i182 < _list181.size; ++_i182) { - String _elem173; // required - _elem173 = iprot.readString(); - struct.success.add(_elem173); + String _elem183; // required + _elem183 = iprot.readString(); + struct.success.add(_elem183); } } struct.setSuccessIsSet(true); @@ -4044,13 +4044,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list174 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list174.size); - for (int _i175 = 0; _i175 < _list174.size; ++_i175) + org.apache.thrift.protocol.TList _list184 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list184.size); + for (int _i185 = 0; _i185 < _list184.size; ++_i185) { - String _elem176; // required - _elem176 = iprot.readString(); - struct.success.add(_elem176); + String _elem186; // required + _elem186 = iprot.readString(); + struct.success.add(_elem186); } iprot.readListEnd(); } @@ -4087,9 +4087,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter177 : struct.success) + for (String _iter187 : struct.success) { - oprot.writeString(_iter177); + oprot.writeString(_iter187); } oprot.writeListEnd(); } @@ -4128,9 +4128,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter178 : struct.success) + for (String _iter188 : struct.success) { - oprot.writeString(_iter178); + oprot.writeString(_iter188); } } } @@ -4145,13 +4145,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list179 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list179.size); - for (int _i180 = 0; _i180 < _list179.size; ++_i180) + org.apache.thrift.protocol.TList _list189 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list189.size); + for (int _i190 = 0; _i190 < _list189.size; ++_i190) { - String _elem181; // required - _elem181 = iprot.readString(); - struct.success.add(_elem181); + String _elem191; // required + _elem191 = iprot.readString(); + struct.success.add(_elem191); } } struct.setSuccessIsSet(true); @@ -4798,13 +4798,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list182 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list182.size); - for (int _i183 = 0; _i183 < _list182.size; ++_i183) + org.apache.thrift.protocol.TList _list192 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list192.size); + for (int _i193 = 0; _i193 < _list192.size; ++_i193) { - String _elem184; // required - _elem184 = iprot.readString(); - struct.success.add(_elem184); + String _elem194; // required + _elem194 = iprot.readString(); + struct.success.add(_elem194); } iprot.readListEnd(); } @@ -4841,9 +4841,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter185 : struct.success) + for (String _iter195 : struct.success) { - oprot.writeString(_iter185); + oprot.writeString(_iter195); } oprot.writeListEnd(); } @@ -4882,9 +4882,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter186 : struct.success) + for (String _iter196 : struct.success) { - oprot.writeString(_iter186); + oprot.writeString(_iter196); } } } @@ -4899,13 +4899,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list187 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list187.size); - for (int _i188 = 0; _i188 < _list187.size; ++_i188) + org.apache.thrift.protocol.TList _list197 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list197.size); + for (int _i198 = 0; _i198 < _list197.size; ++_i198) { - String _elem189; // required - _elem189 = iprot.readString(); - struct.success.add(_elem189); + String _elem199; // required + _elem199 = iprot.readString(); + struct.success.add(_elem199); } } struct.setSuccessIsSet(true); @@ -5665,15 +5665,15 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map190 = iprot.readMapBegin(); - struct.success = new HashMap<String,String>(2*_map190.size); - for (int _i191 = 0; _i191 < _map190.size; ++_i191) + org.apache.thrift.protocol.TMap _map200 = iprot.readMapBegin(); + struct.success = new HashMap<String,String>(2*_map200.size); + for (int _i201 = 0; _i201 < _map200.size; ++_i201) { - String _key192; // required - String _val193; // optional - _key192 = iprot.readString(); - _val193 = iprot.readString(); - struct.success.put(_key192, _val193); + String _key202; // required + String _val203; // optional + _key202 = iprot.readString(); + _val203 = iprot.readString(); + struct.success.put(_key202, _val203); } iprot.readMapEnd(); } @@ -5710,10 +5710,10 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (Map.Entry<String, String> _iter194 : struct.success.entrySet()) + for (Map.Entry<String, String> _iter204 : struct.success.entrySet()) { - oprot.writeString(_iter194.getKey()); - oprot.writeString(_iter194.getValue()); + oprot.writeString(_iter204.getKey()); + oprot.writeString(_iter204.getValue()); } oprot.writeMapEnd(); } @@ -5752,10 +5752,10 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Map.Entry<String, String> _iter195 : struct.success.entrySet()) + for (Map.Entry<String, String> _iter205 : struct.success.entrySet()) { - oprot.writeString(_iter195.getKey()); - oprot.writeString(_iter195.getValue()); + oprot.writeString(_iter205.getKey()); + oprot.writeString(_iter205.getValue()); } } } @@ -5770,15 +5770,15 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map196 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new HashMap<String,String>(2*_map196.size); - for (int _i197 = 0; _i197 < _map196.size; ++_i197) + org.apache.thrift.protocol.TMap _map206 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new HashMap<String,String>(2*_map206.size); + for (int _i207 = 0; _i207 < _map206.size; ++_i207) { - String _key198; // required - String _val199; // optional - _key198 = iprot.readString(); - _val199 = iprot.readString(); - struct.success.put(_key198, _val199); + String _key208; // required + String _val209; // optional + _key208 = iprot.readString(); + _val209 = iprot.readString(); + struct.success.put(_key208, _val209); } } struct.setSuccessIsSet(true); @@ -6425,13 +6425,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list200 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list200.size); - for (int _i201 = 0; _i201 < _list200.size; ++_i201) + org.apache.thrift.protocol.TList _list210 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list210.size); + for (int _i211 = 0; _i211 < _list210.size; ++_i211) { - String _elem202; // required - _elem202 = iprot.readString(); - struct.success.add(_elem202); + String _elem212; // required + _elem212 = iprot.readString(); + struct.success.add(_elem212); } iprot.readListEnd(); } @@ -6468,9 +6468,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter203 : struct.success) + for (String _iter213 : struct.success) { - oprot.writeString(_iter203); + oprot.writeString(_iter213); } oprot.writeListEnd(); } @@ -6509,9 +6509,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter204 : struct.success) + for (String _iter214 : struct.success) { - oprot.writeString(_iter204); + oprot.writeString(_iter214); } } } @@ -6526,13 +6526,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list205 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list205.size); - for (int _i206 = 0; _i206 < _list205.size; ++_i206) + org.apache.thrift.protocol.TList _list215 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list215.size); + for (int _i216 = 0; _i216 < _list215.size; ++_i216) { - String _elem207; // required - _elem207 = iprot.readString(); - struct.success.add(_elem207); + String _elem217; // required + _elem217 = iprot.readString(); + struct.success.add(_elem217); } } struct.setSuccessIsSet(true); @@ -7287,13 +7287,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list208 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list208.size); - for (int _i209 = 0; _i209 < _list208.size; ++_i209) + org.apache.thrift.protocol.TList _list218 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list218.size); + for (int _i219 = 0; _i219 < _list218.size; ++_i219) { - String _elem210; // required - _elem210 = iprot.readString(); - struct.success.add(_elem210); + String _elem220; // required + _elem220 = iprot.readString(); + struct.success.add(_elem220); } iprot.readListEnd(); } @@ -7330,9 +7330,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter211 : struct.success) + for (String _iter221 : struct.success) { - oprot.writeString(_iter211); + oprot.writeString(_iter221); } oprot.writeListEnd(); } @@ -7371,9 +7371,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter212 : struct.success) + for (String _iter222 : struct.success) { - oprot.writeString(_iter212); + oprot.writeString(_iter222); } } } @@ -7388,13 +7388,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list213 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list213.size); - for (int _i214 = 0; _i214 < _list213.size; ++_i214) + org.apache.thrift.protocol.TList _list223 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list223.size); + for (int _i224 = 0; _i224 < _list223.size; ++_i224) { - String _elem215; // required - _elem215 = iprot.readString(); - struct.success.add(_elem215); + String _elem225; // required + _elem225 = iprot.readString(); + struct.success.add(_elem225); } } struct.setSuccessIsSet(true); @@ -10692,14 +10692,14 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list216 = iprot.readListBegin(); - struct.success = new ArrayList<BlurQueryStatus>(_list216.size); - for (int _i217 = 0; _i217 < _list216.size; ++_i217) + org.apache.thrift.protocol.TList _list226 = iprot.readListBegin(); + struct.success = new ArrayList<BlurQueryStatus>(_list226.size); + for (int _i227 = 0; _i227 < _list226.size; ++_i227) { - BlurQueryStatus _elem218; // required - _elem218 = new BlurQueryStatus(); - _elem218.read(iprot); - struct.success.add(_elem218); + BlurQueryStatus _elem228; // required + _elem228 = new BlurQueryStatus(); + _elem228.read(iprot); + struct.success.add(_elem228); } iprot.readListEnd(); } @@ -10736,9 +10736,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (BlurQueryStatus _iter219 : struct.success) + for (BlurQueryStatus _iter229 : struct.success) { - _iter219.write(oprot); + _iter229.write(oprot); } oprot.writeListEnd(); } @@ -10777,9 +10777,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (BlurQueryStatus _iter220 : struct.success) + for (BlurQueryStatus _iter230 : struct.success) { - _iter220.write(oprot); + _iter230.write(oprot); } } } @@ -10794,14 +10794,14 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList<BlurQueryStatus>(_list221.size); - for (int _i222 = 0; _i222 < _list221.size; ++_i222) + org.apache.thrift.protocol.TList _list231 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList<BlurQueryStatus>(_list231.size); + for (int _i232 = 0; _i232 < _list231.size; ++_i232) { - BlurQueryStatus _elem223; // required - _elem223 = new BlurQueryStatus(); - _elem223.read(iprot); - struct.success.add(_elem223); + BlurQueryStatus _elem233; // required + _elem233 = new BlurQueryStatus(); + _elem233.read(iprot); + struct.success.add(_elem233); } } struct.setSuccessIsSet(true); @@ -11556,13 +11556,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list224 = iprot.readListBegin(); - struct.success = new ArrayList<Long>(_list224.size); - for (int _i225 = 0; _i225 < _list224.size; ++_i225) + org.apache.thrift.protocol.TList _list234 = iprot.readListBegin(); + struct.success = new ArrayList<Long>(_list234.size); + for (int _i235 = 0; _i235 < _list234.size; ++_i235) { - long _elem226; // required - _elem226 = iprot.readI64(); - struct.success.add(_elem226); + long _elem236; // required + _elem236 = iprot.readI64(); + struct.success.add(_elem236); } iprot.readListEnd(); } @@ -11599,9 +11599,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.success.size())); - for (long _iter227 : struct.success) + for (long _iter237 : struct.success) { - oprot.writeI64(_iter227); + oprot.writeI64(_iter237); } oprot.writeListEnd(); } @@ -11640,9 +11640,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (long _iter228 : struct.success) + for (long _iter238 : struct.success) { - oprot.writeI64(_iter228); + oprot.writeI64(_iter238); } } } @@ -11657,13 +11657,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.success = new ArrayList<Long>(_list229.size); - for (int _i230 = 0; _i230 < _list229.size; ++_i230) + org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.success = new ArrayList<Long>(_list239.size); + for (int _i240 = 0; _i240 < _list239.size; ++_i240) { - long _elem231; // required - _elem231 = iprot.readI64(); - struct.success.add(_elem231); + long _elem241; // required + _elem241 = iprot.readI64(); + struct.success.add(_elem241); } } struct.setSuccessIsSet(true); @@ -16174,13 +16174,13 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list232 = iprot.readListBegin(); - struct.success = new ArrayList<String>(_list232.size); - for (int _i233 = 0; _i233 < _list232.size; ++_i233) + org.apache.thrift.protocol.TList _list242 = iprot.readListBegin(); + struct.success = new ArrayList<String>(_list242.size); + for (int _i243 = 0; _i243 < _list242.size; ++_i243) { - String _elem234; // required - _elem234 = iprot.readString(); - struct.success.add(_elem234); + String _elem244; // required + _elem244 = iprot.readString(); + struct.success.add(_elem244); } iprot.readListEnd(); } @@ -16217,9 +16217,9 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter235 : struct.success) + for (String _iter245 : struct.success) { - oprot.writeString(_iter235); + oprot.writeString(_iter245); } oprot.writeListEnd(); } @@ -16258,9 +16258,9 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter236 : struct.success) + for (String _iter246 : struct.success) { - oprot.writeString(_iter236); + oprot.writeString(_iter246); } } } @@ -16275,13 +16275,13 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new ArrayList<String>(_list237.size); - for (int _i238 = 0; _i238 < _list237.size; ++_i238) + org.apache.thrift.protocol.TList _list247 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new ArrayList<String>(_list247.size); + for (int _i248 = 0; _i248 < _list247.size; ++_i248) { - String _elem239; // required - _elem239 = iprot.readString(); - struct.success.add(_elem239); + String _elem249; // required + _elem249 = iprot.readString(); + struct.success.add(_elem249); } } struct.setSuccessIsSet(true); @@ -19350,14 +19350,14 @@ public class Blur { case 1: // MUTATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list240 = iprot.readListBegin(); - struct.mutations = new ArrayList<RowMutation>(_list240.size); - for (int _i241 = 0; _i241 < _list240.size; ++_i241) + org.apache.thrift.protocol.TList _list250 = iprot.readListBegin(); + struct.mutations = new ArrayList<RowMutation>(_list250.size); + for (int _i251 = 0; _i251 < _list250.size; ++_i251) { - RowMutation _elem242; // required - _elem242 = new RowMutation(); - _elem242.read(iprot); - struct.mutations.add(_elem242); + RowMutation _elem252; // required + _elem252 = new RowMutation(); + _elem252.read(iprot); + struct.mutations.add(_elem252); } iprot.readListEnd(); } @@ -19385,9 +19385,9 @@ public class Blur { oprot.writeFieldBegin(MUTATIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.mutations.size())); - for (RowMutation _iter243 : struct.mutations) + for (RowMutation _iter253 : struct.mutations) { - _iter243.write(oprot); + _iter253.write(oprot); } oprot.writeListEnd(); } @@ -19418,9 +19418,9 @@ public class Blur { if (struct.isSetMutations()) { { oprot.writeI32(struct.mutations.size()); - for (RowMutation _iter244 : struct.mutations) + for (RowMutation _iter254 : struct.mutations) { - _iter244.write(oprot); + _iter254.write(oprot); } } } @@ -19432,14 +19432,14 @@ public class Blur { BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list245 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.mutations = new ArrayList<RowMutation>(_list245.size); - for (int _i246 = 0; _i246 < _list245.size; ++_i246) + org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.mutations = new ArrayList<RowMutation>(_list255.size); + for (int _i256 = 0; _i256 < _list255.size; ++_i256) { - RowMutation _elem247; // required - _elem247 = new RowMutation(); - _elem247.read(iprot); - struct.mutations.add(_elem247); + RowMutation _elem257; // required + _elem257 = new RowMutation(); + _elem257.read(iprot); + struct.mutations.add(_elem257); } } struct.setMutationsIsSet(true); @@ -25003,15 +25003,15 @@ public class Blur { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map248 = iprot.readMapBegin(); - struct.success = new HashMap<String,String>(2*_map248.size); - for (int _i249 = 0; _i249 < _map248.size; ++_i249) + org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin(); + struct.success = new HashMap<String,String>(2*_map258.size); + for (int _i259 = 0; _i259 < _map258.size; ++_i259) { - String _key250; // required - String _val251; // optional - _key250 = iprot.readString(); - _val251 = iprot.readString(); - struct.success.put(_key250, _val251); + String _key260; // required + String _val261; // optional + _key260 = iprot.readString(); + _val261 = iprot.readString(); + struct.success.put(_key260, _val261); } iprot.readMapEnd(); } @@ -25048,10 +25048,10 @@ public class Blur { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (Map.Entry<String, String> _iter252 : struct.success.entrySet()) + for (Map.Entry<String, String> _iter262 : struct.success.entrySet()) { - oprot.writeString(_iter252.getKey()); - oprot.writeString(_iter252.getValue()); + oprot.writeString(_iter262.getKey()); + oprot.writeString(_iter262.getValue()); } oprot.writeMapEnd(); } @@ -25090,10 +25090,10 @@ public class Blur { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Map.Entry<String, String> _iter253 : struct.success.entrySet()) + for (Map.Entry<String, String> _iter263 : struct.success.entrySet()) { - oprot.writeString(_iter253.getKey()); - oprot.writeString(_iter253.getValue()); + oprot.writeString(_iter263.getKey()); + oprot.writeString(_iter263.getValue()); } } } @@ -25108,15 +25108,15 @@ public class Blur { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map254 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new HashMap<String,String>(2*_map254.size); - for (int _i255 = 0; _i255 < _map254.size; ++_i255) + org.apache.thrift.protocol.TMap _map264 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new HashMap<String,String>(2*_map264.size); + for (int _i265 = 0; _i265 < _map264.size; ++_i265) { - String _key256; // required - String _val257; // optional - _key256 = iprot.readString(); - _val257 = iprot.readString(); - struct.success.put(_key256, _val257); + String _key266; // required + String _val267; // optional + _key266 = iprot.readString(); + _val267 = iprot.readString(); + struct.success.put(_key266, _val267); } } struct.setSuccessIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4c3cc19/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java ---------------------------------------------------------------------- diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java index 816b66f..fd08187 100644 --- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java +++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java @@ -68,6 +68,7 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, private static final org.apache.thrift.protocol.TField BLOCK_CACHING_FILE_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockCachingFileTypes", org.apache.thrift.protocol.TType.SET, (short)11); private static final org.apache.thrift.protocol.TField READ_ONLY_FIELD_DESC = new org.apache.thrift.protocol.TField("readOnly", org.apache.thrift.protocol.TType.BOOL, (short)12); private static final org.apache.thrift.protocol.TField COLUMN_PRE_CACHE_FIELD_DESC = new org.apache.thrift.protocol.TField("columnPreCache", org.apache.thrift.protocol.TType.STRUCT, (short)13); + private static final org.apache.thrift.protocol.TField TABLE_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("tableProperties", org.apache.thrift.protocol.TType.MAP, (short)14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -128,6 +129,10 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, * Sets what column families and columns to prefetch into block cache on shard open. */ public ColumnPreCache columnPreCache; // required + /** + * Properties, used to override default settings on a per table basis. + */ + public Map<String,String> tableProperties; // 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 { @@ -183,7 +188,11 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, /** * Sets what column families and columns to prefetch into block cache on shard open. */ - COLUMN_PRE_CACHE((short)13, "columnPreCache"); + COLUMN_PRE_CACHE((short)13, "columnPreCache"), + /** + * Properties, used to override default settings on a per table basis. + */ + TABLE_PROPERTIES((short)14, "tableProperties"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -224,6 +233,8 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, return READ_ONLY; case 13: // COLUMN_PRE_CACHE return COLUMN_PRE_CACHE; + case 14: // TABLE_PROPERTIES + return TABLE_PROPERTIES; default: return null; } @@ -300,6 +311,10 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.COLUMN_PRE_CACHE, new org.apache.thrift.meta_data.FieldMetaData("columnPreCache", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnPreCache.class))); + tmpMap.put(_Fields.TABLE_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("tableProperties", 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(TableDescriptor.class, metaDataMap); } @@ -334,7 +349,8 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, boolean blockCaching, Set<String> blockCachingFileTypes, boolean readOnly, - ColumnPreCache columnPreCache) + ColumnPreCache columnPreCache, + Map<String,String> tableProperties) { this(); this.isEnabled = isEnabled; @@ -355,6 +371,7 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, this.readOnly = readOnly; setReadOnlyIsSet(true); this.columnPreCache = columnPreCache; + this.tableProperties = tableProperties; } /** @@ -395,6 +412,21 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, if (other.isSetColumnPreCache()) { this.columnPreCache = new ColumnPreCache(other.columnPreCache); } + if (other.isSetTableProperties()) { + Map<String,String> __this__tableProperties = new HashMap<String,String>(); + for (Map.Entry<String, String> other_element : other.tableProperties.entrySet()) { + + String other_element_key = other_element.getKey(); + String other_element_value = other_element.getValue(); + + String __this__tableProperties_copy_key = other_element_key; + + String __this__tableProperties_copy_value = other_element_value; + + __this__tableProperties.put(__this__tableProperties_copy_key, __this__tableProperties_copy_value); + } + this.tableProperties = __this__tableProperties; + } } public TableDescriptor deepCopy() { @@ -423,6 +455,7 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, this.readOnly = false; this.columnPreCache = null; + this.tableProperties = null; } /** @@ -827,6 +860,47 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, } } + public int getTablePropertiesSize() { + return (this.tableProperties == null) ? 0 : this.tableProperties.size(); + } + + public void putToTableProperties(String key, String val) { + if (this.tableProperties == null) { + this.tableProperties = new HashMap<String,String>(); + } + this.tableProperties.put(key, val); + } + + /** + * Properties, used to override default settings on a per table basis. + */ + public Map<String,String> getTableProperties() { + return this.tableProperties; + } + + /** + * Properties, used to override default settings on a per table basis. + */ + public TableDescriptor setTableProperties(Map<String,String> tableProperties) { + this.tableProperties = tableProperties; + return this; + } + + public void unsetTableProperties() { + this.tableProperties = null; + } + + /** Returns true if field tableProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetTableProperties() { + return this.tableProperties != null; + } + + public void setTablePropertiesIsSet(boolean value) { + if (!value) { + this.tableProperties = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IS_ENABLED: @@ -933,6 +1007,14 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, } break; + case TABLE_PROPERTIES: + if (value == null) { + unsetTableProperties(); + } else { + setTableProperties((Map<String,String>)value); + } + break; + } } @@ -977,6 +1059,9 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, case COLUMN_PRE_CACHE: return getColumnPreCache(); + case TABLE_PROPERTIES: + return getTableProperties(); + } throw new IllegalStateException(); } @@ -1014,6 +1099,8 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, return isSetReadOnly(); case COLUMN_PRE_CACHE: return isSetColumnPreCache(); + case TABLE_PROPERTIES: + return isSetTableProperties(); } throw new IllegalStateException(); } @@ -1148,6 +1235,15 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, return false; } + boolean this_present_tableProperties = true && this.isSetTableProperties(); + boolean that_present_tableProperties = true && that.isSetTableProperties(); + if (this_present_tableProperties || that_present_tableProperties) { + if (!(this_present_tableProperties && that_present_tableProperties)) + return false; + if (!this.tableProperties.equals(that.tableProperties)) + return false; + } + return true; } @@ -1294,6 +1390,16 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, return lastComparison; } } + lastComparison = Boolean.valueOf(isSetTableProperties()).compareTo(typedOther.isSetTableProperties()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTableProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableProperties, typedOther.tableProperties); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1397,6 +1503,14 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, sb.append(this.columnPreCache); } first = false; + if (!first) sb.append(", "); + sb.append("tableProperties:"); + if (this.tableProperties == null) { + sb.append("null"); + } else { + sb.append(this.tableProperties); + } + first = false; sb.append(")"); return sb.toString(); } @@ -1564,6 +1678,26 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 14: // TABLE_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map161 = iprot.readMapBegin(); + struct.tableProperties = new HashMap<String,String>(2*_map161.size); + for (int _i162 = 0; _i162 < _map161.size; ++_i162) + { + String _key163; // required + String _val164; // optional + _key163 = iprot.readString(); + _val164 = iprot.readString(); + struct.tableProperties.put(_key163, _val164); + } + iprot.readMapEnd(); + } + struct.setTablePropertiesIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1625,9 +1759,9 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, oprot.writeFieldBegin(BLOCK_CACHING_FILE_TYPES_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.blockCachingFileTypes.size())); - for (String _iter161 : struct.blockCachingFileTypes) + for (String _iter165 : struct.blockCachingFileTypes) { - oprot.writeString(_iter161); + oprot.writeString(_iter165); } oprot.writeSetEnd(); } @@ -1641,6 +1775,19 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, struct.columnPreCache.write(oprot); oprot.writeFieldEnd(); } + if (struct.tableProperties != null) { + oprot.writeFieldBegin(TABLE_PROPERTIES_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.tableProperties.size())); + for (Map.Entry<String, String> _iter166 : struct.tableProperties.entrySet()) + { + oprot.writeString(_iter166.getKey()); + oprot.writeString(_iter166.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1698,7 +1845,10 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, if (struct.isSetColumnPreCache()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetTableProperties()) { + optionals.set(13); + } + oprot.writeBitSet(optionals, 14); if (struct.isSetIsEnabled()) { oprot.writeBool(struct.isEnabled); } @@ -1732,9 +1882,9 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, if (struct.isSetBlockCachingFileTypes()) { { oprot.writeI32(struct.blockCachingFileTypes.size()); - for (String _iter162 : struct.blockCachingFileTypes) + for (String _iter167 : struct.blockCachingFileTypes) { - oprot.writeString(_iter162); + oprot.writeString(_iter167); } } } @@ -1744,12 +1894,22 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, if (struct.isSetColumnPreCache()) { struct.columnPreCache.write(oprot); } + if (struct.isSetTableProperties()) { + { + oprot.writeI32(struct.tableProperties.size()); + for (Map.Entry<String, String> _iter168 : struct.tableProperties.entrySet()) + { + oprot.writeString(_iter168.getKey()); + oprot.writeString(_iter168.getValue()); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, TableDescriptor struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(13); + BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.isEnabled = iprot.readBool(); struct.setIsEnabledIsSet(true); @@ -1793,13 +1953,13 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, } if (incoming.get(10)) { { - org.apache.thrift.protocol.TSet _set163 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.blockCachingFileTypes = new HashSet<String>(2*_set163.size); - for (int _i164 = 0; _i164 < _set163.size; ++_i164) + org.apache.thrift.protocol.TSet _set169 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.blockCachingFileTypes = new HashSet<String>(2*_set169.size); + for (int _i170 = 0; _i170 < _set169.size; ++_i170) { - String _elem165; // required - _elem165 = iprot.readString(); - struct.blockCachingFileTypes.add(_elem165); + String _elem171; // required + _elem171 = iprot.readString(); + struct.blockCachingFileTypes.add(_elem171); } } struct.setBlockCachingFileTypesIsSet(true); @@ -1813,6 +1973,21 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, struct.columnPreCache.read(iprot); struct.setColumnPreCacheIsSet(true); } + if (incoming.get(13)) { + { + org.apache.thrift.protocol.TMap _map172 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.tableProperties = new HashMap<String,String>(2*_map172.size); + for (int _i173 = 0; _i173 < _map172.size; ++_i173) + { + String _key174; // required + String _val175; // optional + _key174 = iprot.readString(); + _val175 = iprot.readString(); + struct.tableProperties.put(_key174, _val175); + } + } + struct.setTablePropertiesIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4c3cc19/src/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-util/pom.xml b/src/blur-util/pom.xml index 1fcc976..710a458 100644 --- a/src/blur-util/pom.xml +++ b/src/blur-util/pom.xml @@ -100,6 +100,11 @@ <artifactId>metrics-core</artifactId> <version>${metrics-core.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4c3cc19/src/blur-util/src/main/java/org/apache/blur/metrics/HDFSReporter.java ---------------------------------------------------------------------- diff --git a/src/blur-util/src/main/java/org/apache/blur/metrics/HDFSReporter.java b/src/blur-util/src/main/java/org/apache/blur/metrics/HDFSReporter.java new file mode 100644 index 0000000..9031881 --- /dev/null +++ b/src/blur-util/src/main/java/org/apache/blur/metrics/HDFSReporter.java @@ -0,0 +1,73 @@ +package org.apache.blur.metrics; + +import java.io.DataOutput; +import java.io.File; +import java.util.concurrent.TimeUnit; + +import com.yammer.metrics.Metrics; +import com.yammer.metrics.core.Counter; +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.core.Histogram; +import com.yammer.metrics.core.Metered; +import com.yammer.metrics.core.MetricName; +import com.yammer.metrics.core.MetricProcessor; +import com.yammer.metrics.core.MetricsRegistry; +import com.yammer.metrics.core.Timer; +import com.yammer.metrics.reporting.AbstractPollingReporter; +import com.yammer.metrics.reporting.CsvReporter; + +public class HDFSReporter extends AbstractPollingReporter implements +MetricProcessor<DataOutput> { + + protected HDFSReporter(MetricsRegistry registry, String name) { + super(registry, name); + } + + public static void main(String[] args) throws InterruptedException { + File file = new File("./target/metrics/"); + file.mkdirs(); + CsvReporter.enable(file, 1, TimeUnit.SECONDS); + Counter counter = Metrics.newCounter(HDFSReporter.class, "test"); + while (true) { + counter.inc(); + Thread.sleep(10); + } + } + + @Override + public void processMeter(MetricName name, Metered meter, DataOutput context) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void processCounter(MetricName name, Counter counter, DataOutput context) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void processHistogram(MetricName name, Histogram histogram, DataOutput context) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void processTimer(MetricName name, Timer timer, DataOutput context) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void processGauge(MetricName name, Gauge<?> gauge, DataOutput context) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void run() { + // TODO Auto-generated method stub + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f4c3cc19/src/pom.xml ---------------------------------------------------------------------- diff --git a/src/pom.xml b/src/pom.xml index a789a44..919f699 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -49,7 +49,7 @@ under the License. <commons-cli.version>1.2</commons-cli.version> <concurrentlinkedhashmap-lru.version>1.3.2</concurrentlinkedhashmap-lru.version> <jline.version>2.7</jline.version> - <guava.version>12.0</guava.version> + <guava.version>14.0</guava.version> <metrics-core.version>2.2.0</metrics-core.version> </properties>
