http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java index ccb417c..8e2be42 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java +++ b/blur-thrift/src/main/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/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java index 6354606..1e36a12 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java +++ b/blur-thrift/src/main/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/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java index ce08cfe..84f6491 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java @@ -69,30 +69,30 @@ public boolean addColumnDefinition(java.lang.String arg0, org.apache.blur.thrift } @Override -public void bulkMutateAdd(java.lang.String arg0, java.lang.String arg1, org.apache.blur.thrift.generated.RowMutation arg2) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void bulkMutateAdd(java.lang.String arg0, org.apache.blur.thrift.generated.RowMutation arg1) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.bulkMutateAdd(arg0, arg1, arg2); + super.bulkMutateAdd(arg0, arg1); } finally {_lock.unlock();} } @Override -public void bulkMutateAddMultiple(java.lang.String arg0, java.lang.String arg1, java.util.List arg2) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void bulkMutateAddMultiple(java.lang.String arg0, java.util.List arg1) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.bulkMutateAddMultiple(arg0, arg1, arg2); + super.bulkMutateAddMultiple(arg0, arg1); } finally {_lock.unlock();} } @Override -public void bulkMutateFinish(java.lang.String arg0, java.lang.String arg1, boolean arg2, boolean arg3) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void bulkMutateFinish(java.lang.String arg0, boolean arg1, boolean arg2) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.bulkMutateFinish(arg0, arg1, arg2, arg3); + super.bulkMutateFinish(arg0, arg1, arg2); } finally {_lock.unlock();} } @Override -public void bulkMutateStart(java.lang.String arg0, java.lang.String arg1) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void bulkMutateStart(java.lang.String arg0) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.bulkMutateStart(arg0, arg1); + super.bulkMutateStart(arg0); } finally {_lock.unlock();} } @@ -734,30 +734,30 @@ public void send_addColumnDefinition(java.lang.String arg0, org.apache.blur.thri } @Override -public void send_bulkMutateAdd(java.lang.String arg0, java.lang.String arg1, org.apache.blur.thrift.generated.RowMutation arg2) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void send_bulkMutateAdd(java.lang.String arg0, org.apache.blur.thrift.generated.RowMutation arg1) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.send_bulkMutateAdd(arg0, arg1, arg2); + super.send_bulkMutateAdd(arg0, arg1); } finally {_lock.unlock();} } @Override -public void send_bulkMutateAddMultiple(java.lang.String arg0, java.lang.String arg1, java.util.List arg2) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void send_bulkMutateAddMultiple(java.lang.String arg0, java.util.List arg1) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.send_bulkMutateAddMultiple(arg0, arg1, arg2); + super.send_bulkMutateAddMultiple(arg0, arg1); } finally {_lock.unlock();} } @Override -public void send_bulkMutateFinish(java.lang.String arg0, java.lang.String arg1, boolean arg2, boolean arg3) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void send_bulkMutateFinish(java.lang.String arg0, boolean arg1, boolean arg2) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.send_bulkMutateFinish(arg0, arg1, arg2, arg3); + super.send_bulkMutateFinish(arg0, arg1, arg2); } finally {_lock.unlock();} } @Override -public void send_bulkMutateStart(java.lang.String arg0, java.lang.String arg1) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { +public void send_bulkMutateStart(java.lang.String arg0) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { _lock.errorFailLock(); try { - super.send_bulkMutateStart(arg0, arg1); + super.send_bulkMutateStart(arg0); } finally {_lock.unlock();} } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java index ef3191c..39e1dbb 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java +++ b/blur-thrift/src/main/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/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java index 37385d7..af622c5 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java +++ b/blur-thrift/src/main/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/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java index 3793c00..1a08bc0 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java +++ b/blur-thrift/src/main/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/dcaf106c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java index 8f152a6..33b0f91 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java +++ b/blur-thrift/src/main/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/dcaf106c/distribution/src/main/scripts/interface/gen-html/Blur.html ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html index a58ab45..e181789 100644 --- a/distribution/src/main/scripts/interface/gen-html/Blur.html +++ b/distribution/src/main/scripts/interface/gen-html/Blur.html @@ -906,52 +906,40 @@ the shard server, if any. <table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>mutations</td><td>the batch of RowMutations. </td></tr> </table></div><div class="definition"><h4 id="Fn_Blur_bulkMutateStart">Function: Blur.bulkMutateStart</h4> -<pre><code>void</code> bulkMutateStart(<code>string</code> table, - <code>string</code> bulkId) +<pre><code>void</code> bulkMutateStart(<code>string</code> bulkId) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre>Starts a transaction for update (e.g. Mutate). Returns a transaction id. <br/><br/><h4 id="Parameters_Blur_bulkMutateStart">Parameters</h4> -<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>The table name. -</td></tr> -<tr><td>bulkId</td><td>The bulk id. +<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>bulkId</td><td>The bulk id. </td></tr> </table></div><div class="definition"><h4 id="Fn_Blur_bulkMutateAdd">Function: Blur.bulkMutateAdd</h4> -<pre><code>void</code> bulkMutateAdd(<code>string</code> table, - <code>string</code> bulkId, +<pre><code>void</code> bulkMutateAdd(<code>string</code> bulkId, <code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code> rowMutation) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre>Adds to the specified transaction. <br/><br/><h4 id="Parameters_Blur_bulkMutateAdd">Parameters</h4> -<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>The table name. -</td></tr> -<tr><td>bulkId</td><td>The bulk id. +<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>bulkId</td><td>The bulk id. </td></tr> <tr><td>rowMutation</td><td>The row mutation. </td></tr> </table></div><div class="definition"><h4 id="Fn_Blur_bulkMutateAddMultiple">Function: Blur.bulkMutateAddMultiple</h4> -<pre><code>void</code> bulkMutateAddMultiple(<code>string</code> table, - <code>string</code> bulkId, +<pre><code>void</code> bulkMutateAddMultiple(<code>string</code> bulkId, <code>list<<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code>></code> rowMutations) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre>Adds to the specified transaction. <br/><br/><h4 id="Parameters_Blur_bulkMutateAddMultiple">Parameters</h4> -<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>The table name. -</td></tr> -<tr><td>bulkId</td><td>The bulk id. +<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>bulkId</td><td>The bulk id. </td></tr> <tr><td>rowMutations</td><td>The row mutation. </td></tr> </table></div><div class="definition"><h4 id="Fn_Blur_bulkMutateFinish">Function: Blur.bulkMutateFinish</h4> -<pre><code>void</code> bulkMutateFinish(<code>string</code> table, - <code>string</code> bulkId, +<pre><code>void</code> bulkMutateFinish(<code>string</code> bulkId, <code>bool</code> apply, <code>bool</code> blockUntilComplete) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre>Finishes the bulk mutate. If apply is true the mutations are applied and committed. If false the bulk mutate is deleted and not applied. <br/><br/><h4 id="Parameters_Blur_bulkMutateFinish">Parameters</h4> -<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>The table name. -</td></tr> -<tr><td>bulkId</td><td>The bulk id. +<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>bulkId</td><td>The bulk id. </td></tr> <tr><td>apply</td><td>Apply the bulk mutate flag. </td></tr> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dcaf106c/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java index 3d58218..53a01a0 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java @@ -367,7 +367,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase< struct.values = new HashMap<String,ValueObject>(2*_map260.size); for (int _i261 = 0; _i261 < _map260.size; ++_i261) { - String _key262; // required + String _key262; // optional ValueObject _val263; // required _key262 = iprot.readString(); _val263 = new ValueObject(); @@ -453,7 +453,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase< struct.values = new HashMap<String,ValueObject>(2*_map266.size); for (int _i267 = 0; _i267 < _map266.size; ++_i267) { - String _key268; // required + String _key268; // optional ValueObject _val269; // required _key268 = iprot.readString(); _val269 = new ValueObject();
