Blur-core compiling but several other projects are still broken.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/83aa59f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/83aa59f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/83aa59f5 Branch: refs/heads/0.2-dev-removing-old-thrift Commit: 83aa59f5789165db785e6930ef0aeb99f8961508 Parents: a1df543 Author: Aaron McCurry <[email protected]> Authored: Tue Nov 6 17:31:34 2012 -0500 Committer: Aaron McCurry <[email protected]> Committed: Tue Nov 6 17:31:34 2012 -0500 ---------------------------------------------------------------------- interface/Blur.thrift | 14 - interface/gen-html/Blur.html | 36 - interface/gen-html/index.html | 6 - .../org/apache/blur/thrift/generated/Blur.java | 8332 ++------------- .../apache/blur/thrift/generated/ShardServer.java | 280 +- interface/gen-perl/Blur/Blur.pm | 2356 +---- interface/gen-perl/Blur/ShardServer.pm | 156 +- interface/gen-rb/blur.rb | 378 - .../manager/results/BlurResultIterableClient.java | 149 - .../results/BlurResultIterableMultiple.java | 1 + .../BlurResultPeekableIteratorComparator.java | 1 + .../blur/manager/results/PeekableIterator.java | 66 - .../apache/blur/thrift/BlurControllerServer.java | 232 +- .../org/apache/blur/thrift/BlurShardServer.java | 117 +- .../java/org/apache/blur/utils/BlurConstants.java | 1 - .../main/java/org/apache/blur/utils/BlurUtil.java | 44 - .../org/apache/blur/utils/PeekableIterator.java | 66 + .../src/test/java/org/apache/blur/MiniCluster.java | 79 - .../BlurResultPeekableIteratorComparatorTest.java | 2 +- .../blur/manager/results/PeekableIteratorTest.java | 2 +- .../org/apache/blur/thrift/BlurClusterTest.java | 40 +- .../org/apache/blur/thrift/DoNothingServer.java | 37 +- .../org/apache/blur/thrift/generated/Blur.java | 8332 ++------------- .../apache/blur/thrift/generated/ShardServer.java | 280 +- 24 files changed, 2956 insertions(+), 18051 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/Blur.thrift ---------------------------------------------------------------------- diff --git a/interface/Blur.thrift b/interface/Blur.thrift index f2b9139..9ca7f18 100644 --- a/interface/Blur.thrift +++ b/interface/Blur.thrift @@ -675,13 +675,6 @@ service Blur { TableDescriptor describe(1:string table) throws (1:BlurException ex) /** - * Executes a query against a the given table and returns the results. If this method is executed against a controller the results will contain the aggregated results from all the shards. If this method is executed against a shard server the results will only contain aggregated results from the shards of the given table that are being served on the shard server, if any. - * @param table the table name. - * @param blurQuery the query to execute. - */ - BlurResults query(1:string table, 2:BlurQuery blurQuery) throws (1:BlurException ex) - - /** * Cancels a query that is executing against the given table with the given uuid. Note, the cancel call maybe take some time for the query actually stops executing. * @param table the table name. * @param uuid the uuid of the query. @@ -709,13 +702,6 @@ service Blur { Schema schema(1:string table) throws (1:BlurException ex) TableStats getTableStats(1:string table) throws (1:BlurException ex) TableStats tableStats(1:string table) throws (1:BlurException ex) - list<string> terms(1:string table, 2:string columnFamily, 3:string columnName, 4:string startWith, 5:i16 size) throws (1:BlurException ex) - i64 recordFrequency(1:string table, 2:string columnFamily, 3:string columnName, 4:string value) throws (1:BlurException ex) - - FetchResult fetchRow(1:string table, 2:Selector selector) throws (1:BlurException ex) - - void mutate(1:RowMutation mutation) throws (1:BlurException ex) - void mutateBatch(1:list<RowMutation> mutations) throws (1:BlurException ex) void createTable(1:TableDescriptor tableDescriptor) throws (1:BlurException ex) void enableTable(1:string table) throws (1:BlurException ex) http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/gen-html/Blur.html ---------------------------------------------------------------------- diff --git a/interface/gen-html/Blur.html b/interface/gen-html/Blur.html index f34bea9..68ee727 100644 --- a/interface/gen-html/Blur.html +++ b/interface/gen-html/Blur.html @@ -19,16 +19,11 @@ <li><a href="Blur.html#Fn_Blur_describe">describe</a></li> <li><a href="Blur.html#Fn_Blur_disableTable">disableTable</a></li> <li><a href="Blur.html#Fn_Blur_enableTable">enableTable</a></li> -<li><a href="Blur.html#Fn_Blur_fetchRow">fetchRow</a></li> <li><a href="Blur.html#Fn_Blur_getTableStats">getTableStats</a></li> <li><a href="Blur.html#Fn_Blur_isInSafeMode">isInSafeMode</a></li> -<li><a href="Blur.html#Fn_Blur_mutate">mutate</a></li> -<li><a href="Blur.html#Fn_Blur_mutateBatch">mutateBatch</a></li> <li><a href="Blur.html#Fn_Blur_optimize">optimize</a></li> -<li><a href="Blur.html#Fn_Blur_query">query</a></li> <li><a href="Blur.html#Fn_Blur_queryStatusById">queryStatusById</a></li> <li><a href="Blur.html#Fn_Blur_queryStatusIdList">queryStatusIdList</a></li> -<li><a href="Blur.html#Fn_Blur_recordFrequency">recordFrequency</a></li> <li><a href="Blur.html#Fn_Blur_removeTable">removeTable</a></li> <li><a href="Blur.html#Fn_Blur_schema">schema</a></li> <li><a href="Blur.html#Fn_Blur_shardClusterList">shardClusterList</a></li> @@ -37,7 +32,6 @@ <li><a href="Blur.html#Fn_Blur_tableList">tableList</a></li> <li><a href="Blur.html#Fn_Blur_tableListByCluster">tableListByCluster</a></li> <li><a href="Blur.html#Fn_Blur_tableStats">tableStats</a></li> -<li><a href="Blur.html#Fn_Blur_terms">terms</a></li> </ul> <a href="Blur.html#Svc_ShardServer">ShardServer</a><br/> <ul> @@ -571,13 +565,6 @@ updates through MapReduce are allowed and in fact they are only allowed if the t throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre>Returns a table descriptor for the given table. @param table the table name. -<br/></div><div class="definition"><h4 id="Fn_Blur_query">Function: Blur.query</h4> -<pre><code><a href="Blur.html#Struct_BlurResults">BlurResults</a></code> query(<code>string</code> table, - <code><a href="Blur.html#Struct_BlurQuery">BlurQuery</a></code> blurQuery) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre>Executes a query against a the given table and returns the results. If this method is executed against a controller the results will contain the aggregated results from all the shards. If this method is executed against a shard server the results will only contain aggregated results from the shards of the given table that are being served on the shard server, if any. -@param table the table name. -@param blurQuery the query to execute. <br/></div><div class="definition"><h4 id="Fn_Blur_cancelQuery">Function: Blur.cancelQuery</h4> <pre><code>void</code> cancelQuery(<code>string</code> table, <code>i64</code> uuid) @@ -611,29 +598,6 @@ updates through MapReduce are allowed and in fact they are only allowed if the t </pre></div><div class="definition"><h4 id="Fn_Blur_tableStats">Function: Blur.tableStats</h4> <pre><code><a href="Blur.html#Struct_TableStats">TableStats</a></code> tableStats(<code>string</code> table) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre></div><div class="definition"><h4 id="Fn_Blur_terms">Function: Blur.terms</h4> -<pre><code>list<<code>string</code>></code> terms(<code>string</code> table, - <code>string</code> columnFamily, - <code>string</code> columnName, - <code>string</code> startWith, - <code>i16</code> size) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre></div><div class="definition"><h4 id="Fn_Blur_recordFrequency">Function: Blur.recordFrequency</h4> -<pre><code>i64</code> recordFrequency(<code>string</code> table, - <code>string</code> columnFamily, - <code>string</code> columnName, - <code>string</code> value) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre></div><div class="definition"><h4 id="Fn_Blur_fetchRow">Function: Blur.fetchRow</h4> -<pre><code><a href="Blur.html#Struct_FetchResult">FetchResult</a></code> fetchRow(<code>string</code> table, - <code><a href="Blur.html#Struct_Selector">Selector</a></code> selector) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre></div><div class="definition"><h4 id="Fn_Blur_mutate">Function: Blur.mutate</h4> -<pre><code>void</code> mutate(<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code> mutation) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> -</pre></div><div class="definition"><h4 id="Fn_Blur_mutateBatch">Function: Blur.mutateBatch</h4> -<pre><code>void</code> mutateBatch(<code>list<<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code>></code> mutations) - throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre></div><div class="definition"><h4 id="Fn_Blur_createTable">Function: Blur.createTable</h4> <pre><code>void</code> createTable(<code><a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a></code> tableDescriptor) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/gen-html/index.html ---------------------------------------------------------------------- diff --git a/interface/gen-html/index.html b/interface/gen-html/index.html index 0430044..8ec7aee 100644 --- a/interface/gen-html/index.html +++ b/interface/gen-html/index.html @@ -15,16 +15,11 @@ <li><a href="Blur.html#Fn_Blur_describe">describe</a></li> <li><a href="Blur.html#Fn_Blur_disableTable">disableTable</a></li> <li><a href="Blur.html#Fn_Blur_enableTable">enableTable</a></li> -<li><a href="Blur.html#Fn_Blur_fetchRow">fetchRow</a></li> <li><a href="Blur.html#Fn_Blur_getTableStats">getTableStats</a></li> <li><a href="Blur.html#Fn_Blur_isInSafeMode">isInSafeMode</a></li> -<li><a href="Blur.html#Fn_Blur_mutate">mutate</a></li> -<li><a href="Blur.html#Fn_Blur_mutateBatch">mutateBatch</a></li> <li><a href="Blur.html#Fn_Blur_optimize">optimize</a></li> -<li><a href="Blur.html#Fn_Blur_query">query</a></li> <li><a href="Blur.html#Fn_Blur_queryStatusById">queryStatusById</a></li> <li><a href="Blur.html#Fn_Blur_queryStatusIdList">queryStatusIdList</a></li> -<li><a href="Blur.html#Fn_Blur_recordFrequency">recordFrequency</a></li> <li><a href="Blur.html#Fn_Blur_removeTable">removeTable</a></li> <li><a href="Blur.html#Fn_Blur_schema">schema</a></li> <li><a href="Blur.html#Fn_Blur_shardClusterList">shardClusterList</a></li> @@ -33,7 +28,6 @@ <li><a href="Blur.html#Fn_Blur_tableList">tableList</a></li> <li><a href="Blur.html#Fn_Blur_tableListByCluster">tableListByCluster</a></li> <li><a href="Blur.html#Fn_Blur_tableStats">tableStats</a></li> -<li><a href="Blur.html#Fn_Blur_terms">terms</a></li> </ul> <a href="Blur.html#Svc_ShardServer">ShardServer</a><br/> <ul>
