Repository: incubator-blur Updated Branches: refs/heads/removing_table_from_args [created] 2c2e8702a
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 285c697..d0dd35d 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 @@ -60,11 +60,10 @@ public class Blur { /** * Executes the given command by name on the table with the provided arguments. * - * @param table * @param commandName * @param arguments */ - public Response execute(String table, String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException; + public Response execute(String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException; /** * If the execute command times out due to command taking longer than the configured @@ -490,7 +489,7 @@ public class Blur { public interface AsyncIface { - public void execute(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException; + public void execute(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException; public void reconnect(String executionId, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.reconnect_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException; @@ -612,16 +611,15 @@ public class Blur { super(iprot, oprot); } - public Response execute(String table, String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException + public Response execute(String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException { - send_execute(table, commandName, arguments); + send_execute(commandName, arguments); return recv_execute(); } - public void send_execute(String table, String commandName, Arguments arguments) throws org.apache.blur.thirdparty.thrift_0_9_0.TException + public void send_execute(String commandName, Arguments arguments) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { execute_args args = new execute_args(); - args.setTable(table); args.setCommandName(commandName); args.setArguments(arguments); sendBase("execute", args); @@ -1857,20 +1855,18 @@ public class Blur { super(protocolFactory, clientManager, transport); } - public void execute(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void execute(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { checkReady(); - execute_call method_call = new execute_call(table, commandName, arguments, resultHandler, this, ___protocolFactory, ___transport); + execute_call method_call = new execute_call(commandName, arguments, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class execute_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall { - private String table; private String commandName; private Arguments arguments; - public execute_call(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public execute_call(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { super(client, protocolFactory, transport, resultHandler, false); - this.table = table; this.commandName = commandName; this.arguments = arguments; } @@ -1878,7 +1874,6 @@ public class Blur { public void write_args(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { prot.writeMessageBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessage("execute", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessageType.CALL, 0)); execute_args args = new execute_args(); - args.setTable(table); args.setCommandName(commandName); args.setArguments(arguments); args.write(prot); @@ -3587,7 +3582,7 @@ public class Blur { public execute_result getResult(I iface, execute_args args) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { execute_result result = new execute_result(); try { - result.success = iface.execute(args.table, args.commandName, args.arguments); + result.success = iface.execute(args.commandName, args.arguments); } catch (BlurException bex) { result.bex = bex; } catch (TimeoutException tex) { @@ -4764,9 +4759,8 @@ public class Blur { public static class execute_args implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<execute_args, execute_args._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("execute_args"); - 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 COMMAND_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("commandName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)3); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COMMAND_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("commandName", 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 ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4774,15 +4768,13 @@ public class Blur { schemes.put(TupleScheme.class, new execute_argsTupleSchemeFactory()); } - public String table; // required public String commandName; // required public Arguments arguments; // 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 { - TABLE((short)1, "table"), - COMMAND_NAME((short)2, "commandName"), - ARGUMENTS((short)3, "arguments"); + COMMAND_NAME((short)1, "commandName"), + ARGUMENTS((short)2, "arguments"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4797,11 +4789,9 @@ public class Blur { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // TABLE - return TABLE; - case 2: // COMMAND_NAME + case 1: // COMMAND_NAME return COMMAND_NAME; - case 3: // ARGUMENTS + case 2: // ARGUMENTS return ARGUMENTS; default: return null; @@ -4846,8 +4836,6 @@ public class Blur { 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.COMMAND_NAME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("commandName", 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.ARGUMENTS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("arguments", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, @@ -4860,12 +4848,10 @@ public class Blur { } public execute_args( - String table, String commandName, Arguments arguments) { this(); - this.table = table; this.commandName = commandName; this.arguments = arguments; } @@ -4874,9 +4860,6 @@ public class Blur { * Performs a deep copy on <i>other</i>. */ public execute_args(execute_args other) { - if (other.isSetTable()) { - this.table = other.table; - } if (other.isSetCommandName()) { this.commandName = other.commandName; } @@ -4891,35 +4874,10 @@ public class Blur { @Override public void clear() { - this.table = null; this.commandName = null; this.arguments = null; } - public String getTable() { - return this.table; - } - - public execute_args 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 getCommandName() { return this.commandName; } @@ -4970,14 +4928,6 @@ public class Blur { public void setFieldValue(_Fields field, Object value) { switch (field) { - case TABLE: - if (value == null) { - unsetTable(); - } else { - setTable((String)value); - } - break; - case COMMAND_NAME: if (value == null) { unsetCommandName(); @@ -4999,9 +4949,6 @@ public class Blur { public Object getFieldValue(_Fields field) { switch (field) { - case TABLE: - return getTable(); - case COMMAND_NAME: return getCommandName(); @@ -5019,8 +4966,6 @@ public class Blur { } switch (field) { - case TABLE: - return isSetTable(); case COMMAND_NAME: return isSetCommandName(); case ARGUMENTS: @@ -5042,15 +4987,6 @@ public class Blur { 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_commandName = true && this.isSetCommandName(); boolean that_present_commandName = true && that.isSetCommandName(); if (this_present_commandName || that_present_commandName) { @@ -5085,16 +5021,6 @@ public class Blur { int lastComparison = 0; execute_args typedOther = (execute_args)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(isSetCommandName()).compareTo(typedOther.isSetCommandName()); if (lastComparison != 0) { return lastComparison; @@ -5135,14 +5061,6 @@ public class Blur { StringBuilder sb = new StringBuilder("execute_args("); 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("commandName:"); if (this.commandName == null) { sb.append("null"); @@ -5204,15 +5122,7 @@ public class Blur { break; } switch (schemeField.id) { - 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: // COMMAND_NAME + case 1: // COMMAND_NAME if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) { struct.commandName = iprot.readString(); struct.setCommandNameIsSet(true); @@ -5220,7 +5130,7 @@ public class Blur { org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // ARGUMENTS + case 2: // ARGUMENTS if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) { struct.arguments = new Arguments(); struct.arguments.read(iprot); @@ -5244,11 +5154,6 @@ public class Blur { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.table != null) { - oprot.writeFieldBegin(TABLE_FIELD_DESC); - oprot.writeString(struct.table); - oprot.writeFieldEnd(); - } if (struct.commandName != null) { oprot.writeFieldBegin(COMMAND_NAME_FIELD_DESC); oprot.writeString(struct.commandName); @@ -5277,19 +5182,13 @@ public class Blur { public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetTable()) { - optionals.set(0); - } if (struct.isSetCommandName()) { - optionals.set(1); + optionals.set(0); } if (struct.isSetArguments()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); - if (struct.isSetTable()) { - oprot.writeString(struct.table); + optionals.set(1); } + oprot.writeBitSet(optionals, 2); if (struct.isSetCommandName()) { oprot.writeString(struct.commandName); } @@ -5301,16 +5200,12 @@ public class Blur { @Override public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.table = iprot.readString(); - struct.setTableIsSet(true); - } - if (incoming.get(1)) { struct.commandName = iprot.readString(); struct.setCommandNameIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(1)) { struct.arguments = new Arguments(); struct.arguments.read(iprot); struct.setArgumentsIsSet(true); @@ -21830,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; // optional + String _key296; // required List<String> _val297; // required _key296 = iprot.readString(); { @@ -21958,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; // optional + String _key307; // required List<String> _val308; // required _key307 = iprot.readString(); { @@ -36561,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; // optional + String _key386; // required String _val387; // required _key386 = iprot.readString(); _val387 = iprot.readString(); @@ -36666,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; // optional + String _key392; // required String _val393; // required _key392 = iprot.readString(); _val393 = iprot.readString(); @@ -37459,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; // optional + String _key396; // required Map<String,ShardState> _val397; // required _key396 = iprot.readString(); { @@ -37467,7 +37362,7 @@ public class Blur { _val397 = new HashMap<String,ShardState>(2*_map398.size); for (int _i399 = 0; _i399 < _map398.size; ++_i399) { - String _key400; // optional + String _key400; // required ShardState _val401; // required _key400 = iprot.readString(); _val401 = ShardState.findByValue(iprot.readI32()); @@ -37591,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; // optional + String _key408; // required Map<String,ShardState> _val409; // required _key408 = iprot.readString(); { @@ -37599,7 +37494,7 @@ public class Blur { _val409 = new HashMap<String,ShardState>(2*_map410.size); for (int _i411 = 0; _i411 < _map410.size; ++_i411) { - String _key412; // optional + String _key412; // required ShardState _val413; // required _key412 = iprot.readString(); _val413 = ShardState.findByValue(iprot.readI32()); @@ -39084,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; // optional + String _key416; // required String _val417; // required _key416 = iprot.readString(); _val417 = iprot.readString(); @@ -39189,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; // optional + String _key422; // required String _val423; // required _key422 = iprot.readString(); _val423 = iprot.readString(); @@ -40021,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; // optional + String _key434; // required Metric _val435; // required _key434 = iprot.readString(); _val435 = new Metric(); @@ -40127,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; // optional + String _key440; // required Metric _val441; // required _key440 = iprot.readString(); _val441 = new Metric(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 6cac5a1..a9caf29 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; // optional + String _key128; // required 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; // optional + String _key134; // required CpuTime _val135; // required _key134 = iprot.readString(); _val135 = new CpuTime(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 aa923cc..a7fc566 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; // optional + String _key86; // required 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; // optional + String _key107; // required long _val108; // required _key107 = iprot.readString(); _val108 = iprot.readI64(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 55d1744..0ebf5a7 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; // optional + String _key138; // required 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; // optional + String _key144; // required String _val145; // required _key144 = iprot.readString(); _val145 = iprot.readString(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 8e2be42..ccb417c 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; // optional + String _key204; // required 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; // optional + String _key208; // required 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; // optional + String _key212; // required 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; // optional + String _key222; // required 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; // optional + String _key226; // required 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; // optional + String _key230; // required double _val231; // required _key230 = iprot.readString(); _val231 = iprot.readDouble(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 1e36a12..6354606 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; // optional + Shard _key242; // required 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; // optional + Server _key246; // required 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; // optional + Shard _key252; // required 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; // optional + Server _key256; // required ValueObject _val257; // required _key256 = new Server(); _key256.read(iprot); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 39e1dbb..ef3191c 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; // optional + String _key148; // required 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; // optional + String _key152; // required 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; // optional + String _key160; // required 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; // optional + String _key164; // required ColumnDefinition _val165; // required _key164 = iprot.readString(); _val165 = new ColumnDefinition(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 af622c5..37385d7 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; // optional + String _key31; // required 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; // optional + String _key52; // required Set<String> _val53; // required _key52 = iprot.readString(); { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 1a08bc0..3793c00 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; // optional + String _key174; // required 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; // optional + String _key178; // required 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; // optional + String _key196; // required 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; // optional + String _key200; // required String _val201; // required _key200 = iprot.readString(); _val201 = iprot.readString(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/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 33b0f91..8f152a6 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; // optional - String _val3; // required + String _key2; // required + String _val3; // optional _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; // optional - String _val9; // required + String _key8; // required + String _val9; // optional _key8 = iprot.readString(); _val9 = iprot.readString(); struct.attributes.put(_key8, _val9); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/gen-js/Blur.js ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-js/Blur.js b/distribution/src/main/scripts/interface/gen-js/Blur.js index 2e075d4..70b57c3 100644 --- a/distribution/src/main/scripts/interface/gen-js/Blur.js +++ b/distribution/src/main/scripts/interface/gen-js/Blur.js @@ -8,13 +8,9 @@ //HELPER FUNCTIONS AND STRUCTURES Blur_execute_args = function(args) { - this.table = null; this.commandName = null; this.arguments = null; if (args) { - if (args.table !== undefined) { - this.table = args.table; - } if (args.commandName !== undefined) { this.commandName = args.commandName; } @@ -39,19 +35,12 @@ Blur_execute_args.prototype.read = function(input) { { case 1: if (ftype == Thrift.Type.STRING) { - this.table = input.readString().value; - } else { - input.skip(ftype); - } - break; - case 2: - if (ftype == Thrift.Type.STRING) { this.commandName = input.readString().value; } else { input.skip(ftype); } break; - case 3: + case 2: if (ftype == Thrift.Type.STRUCT) { this.arguments = new Arguments(); this.arguments.read(input); @@ -70,18 +59,13 @@ Blur_execute_args.prototype.read = function(input) { Blur_execute_args.prototype.write = function(output) { output.writeStructBegin('Blur_execute_args'); - if (this.table !== null && this.table !== undefined) { - output.writeFieldBegin('table', Thrift.Type.STRING, 1); - output.writeString(this.table); - output.writeFieldEnd(); - } if (this.commandName !== null && this.commandName !== undefined) { - output.writeFieldBegin('commandName', Thrift.Type.STRING, 2); + output.writeFieldBegin('commandName', Thrift.Type.STRING, 1); output.writeString(this.commandName); output.writeFieldEnd(); } if (this.arguments !== null && this.arguments !== undefined) { - output.writeFieldBegin('arguments', Thrift.Type.STRUCT, 3); + output.writeFieldBegin('arguments', Thrift.Type.STRUCT, 2); this.arguments.write(output); output.writeFieldEnd(); } @@ -6588,15 +6572,14 @@ BlurClient = function(input, output) { this.seqid = 0; }; BlurClient.prototype = {}; -BlurClient.prototype.execute = function(table, commandName, arguments) { - this.send_execute(table, commandName, arguments); +BlurClient.prototype.execute = function(commandName, arguments) { + this.send_execute(commandName, arguments); return this.recv_execute(); }; -BlurClient.prototype.send_execute = function(table, commandName, arguments) { +BlurClient.prototype.send_execute = function(commandName, arguments) { this.output.writeMessageBegin('execute', Thrift.MessageType.CALL, this.seqid); var args = new Blur_execute_args(); - args.table = table; args.commandName = commandName; args.arguments = arguments; args.write(this.output); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm index 9ec52d4..eb2d4ac 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm @@ -14,19 +14,15 @@ use Blur::Types; package Blur::Blur_execute_args; use base qw(Class::Accessor); -Blur::Blur_execute_args->mk_accessors( qw( table commandName arguments ) ); +Blur::Blur_execute_args->mk_accessors( qw( commandName arguments ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; - $self->{table} = undef; $self->{commandName} = undef; $self->{arguments} = undef; if (UNIVERSAL::isa($vals,'HASH')) { - if (defined $vals->{table}) { - $self->{table} = $vals->{table}; - } if (defined $vals->{commandName}) { $self->{commandName} = $vals->{commandName}; } @@ -57,18 +53,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->{commandName}); } else { $xfer += $input->skip($ftype); } last; }; - /^3$/ && do{ if ($ftype == TType::STRUCT) { + /^2$/ && do{ if ($ftype == TType::STRUCT) { $self->{arguments} = new Blur::Arguments(); $xfer += $self->{arguments}->read($input); } else { @@ -87,18 +77,13 @@ sub write { my ($self, $output) = @_; my $xfer = 0; $xfer += $output->writeStructBegin('Blur_execute_args'); - if (defined $self->{table}) { - $xfer += $output->writeFieldBegin('table', TType::STRING, 1); - $xfer += $output->writeString($self->{table}); - $xfer += $output->writeFieldEnd(); - } if (defined $self->{commandName}) { - $xfer += $output->writeFieldBegin('commandName', TType::STRING, 2); + $xfer += $output->writeFieldBegin('commandName', TType::STRING, 1); $xfer += $output->writeString($self->{commandName}); $xfer += $output->writeFieldEnd(); } if (defined $self->{arguments}) { - $xfer += $output->writeFieldBegin('arguments', TType::STRUCT, 3); + $xfer += $output->writeFieldBegin('arguments', TType::STRUCT, 2); $xfer += $self->{arguments}->write($output); $xfer += $output->writeFieldEnd(); } @@ -7615,7 +7600,6 @@ use strict; sub execute{ my $self = shift; - my $table = shift; my $commandName = shift; my $arguments = shift; @@ -7995,10 +7979,9 @@ sub new { sub execute{ my ($self, $request) = @_; - my $table = ($request->{'table'}) ? $request->{'table'} : undef; my $commandName = ($request->{'commandName'}) ? $request->{'commandName'} : undef; my $arguments = ($request->{'arguments'}) ? $request->{'arguments'} : undef; - return $self->{impl}->execute($table, $commandName, $arguments); + return $self->{impl}->execute($commandName, $arguments); } sub reconnect{ @@ -8374,23 +8357,20 @@ sub new { sub execute{ my $self = shift; - my $table = shift; my $commandName = shift; my $arguments = shift; - $self->send_execute($table, $commandName, $arguments); + $self->send_execute($commandName, $arguments); return $self->recv_execute(); } sub send_execute{ my $self = shift; - my $table = shift; my $commandName = shift; my $arguments = shift; $self->{output}->writeMessageBegin('execute', TMessageType::CALL, $self->{seqid}); my $args = new Blur::Blur_execute_args(); - $args->{table} = $table; $args->{commandName} = $commandName; $args->{arguments} = $arguments; $args->write($self->{output}); @@ -10632,7 +10612,7 @@ sub process_execute { $input->readMessageEnd(); my $result = new Blur::Blur_execute_result(); eval { - $result->{success} = $self->{handler}->execute($args->table, $args->commandName, $args->arguments); + $result->{success} = $self->{handler}->execute($args->commandName, $args->arguments); }; if( UNIVERSAL::isa($@,'Blur::BlurException') ){ $result->{bex} = $@; }; if( UNIVERSAL::isa($@,'Blur::TimeoutException') ){ http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/gen-rb/blur.rb ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-rb/blur.rb b/distribution/src/main/scripts/interface/gen-rb/blur.rb index a4a2005..fc2307e 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur.rb @@ -12,13 +12,13 @@ module Blur class Client include ::Thrift::Client - def execute(table, commandName, arguments) - send_execute(table, commandName, arguments) + def execute(commandName, arguments) + send_execute(commandName, arguments) return recv_execute() end - def send_execute(table, commandName, arguments) - send_message('execute', Execute_args, :table => table, :commandName => commandName, :arguments => arguments) + def send_execute(commandName, arguments) + send_message('execute', Execute_args, :commandName => commandName, :arguments => arguments) end def recv_execute() @@ -778,7 +778,7 @@ module Blur args = read_args(iprot, Execute_args) result = Execute_result.new() begin - result.success = @handler.execute(args.table, args.commandName, args.arguments) + result.success = @handler.execute(args.commandName, args.arguments) rescue ::Blur::BlurException => bex result.bex = bex rescue ::Blur::TimeoutException => tex @@ -1315,12 +1315,10 @@ module Blur class Execute_args include ::Thrift::Struct, ::Thrift::Struct_Union - TABLE = 1 - COMMANDNAME = 2 - ARGUMENTS = 3 + COMMANDNAME = 1 + ARGUMENTS = 2 FIELDS = { - TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'}, COMMANDNAME => {:type => ::Thrift::Types::STRING, :name => 'commandName'}, ARGUMENTS => {:type => ::Thrift::Types::STRUCT, :name => 'arguments', :class => ::Blur::Arguments} } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/docs/Blur.html ---------------------------------------------------------------------- diff --git a/docs/Blur.html b/docs/Blur.html index 6b8cadc..b62be1e 100644 --- a/docs/Blur.html +++ b/docs/Blur.html @@ -716,8 +716,7 @@ be family dot column, "family.column". The Blur service API. This API is the same for both controller servers as well as shards servers. Each of the methods are documented. <br/><section><div class="page-header"><h4 id="Fn_Blur_execute">Function: Blur.execute</h4></div><p class="lead"> -<pre><code><a href="Blur.html#Struct_Response">Response</a></code> execute(<code>string</code> table, -<code>string</code> commandName, +<pre><code><a href="Blur.html#Struct_Response">Response</a></code> execute(<code>string</code> commandName, <code><a href="Blur.html#Struct_Arguments">Arguments</a></code> arguments) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>, <code><a href="Blur.html#Struct_TimeoutException">TimeoutException</a></code> </pre>Executes the given command by name on the table with the provided arguments.
