incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [19/19] git commit: Merge branch '0.1.5-blur-103' into 0.1.5
Date Thu, 23 May 2013 19:39:58 GMT
Merge branch '0.1.5-blur-103' into 0.1.5


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7abb183c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7abb183c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7abb183c

Branch: refs/heads/0.1.5
Commit: 7abb183c929b7c2f521dfa57dafd5198ea1e2357
Parents: 8526ce5 9f63daf
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu May 23 15:39:23 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu May 23 15:39:23 2013 -0400

----------------------------------------------------------------------
 .../clusterstatus/ZookeeperClusterStatus.java      |    8 +-
 .../org/apache/blur/server/ShardServerContext.java |    2 +-
 .../blur/server/ShardServerEventHandler.java       |    8 +-
 .../apache/blur/thrift/BlurControllerServer.java   |    2 +-
 .../org/apache/blur/thrift/BlurShardServer.java    |    2 +-
 .../java/org/apache/blur/thrift/TableAdmin.java    |    2 +-
 .../apache/blur/thrift/ThriftBlurShardServer.java  |    4 +-
 .../java/org/apache/blur/thrift/ThriftServer.java  |   12 +-
 .../main/java/org/apache/blur/utils/BlurUtil.java  |    8 +-
 .../src/test/java/org/apache/blur/MiniCluster.java |    4 +-
 .../org/apache/blur/thrift/BlurClusterTest.java    |    2 +-
 .../java/org/apache/blur/mapreduce/BlurTask.java   |    6 +-
 .../blur/mapreduce/lib/BlurOutputFormat.java       |    6 +-
 .../apache/blur/mapreduce/lib/CsvBlurDriver.java   |    2 +-
 .../mapreduce/lib/CsvBlurDriverFamilyPerInput.java |    2 +-
 .../org/apache/blur/analysis/BlurAnalyzer.java     |    8 +-
 .../main/java/org/apache/blur/shell/Command.java   |    2 +-
 .../org/apache/blur/shell/CreateTableCommand.java  |    2 +-
 .../apache/blur/shell/DescribeTableCommand.java    |    2 +-
 .../blur/shell/EnableDisableTableCommand.java      |    2 +-
 .../java/org/apache/blur/shell/GetRowCommand.java  |    2 +-
 .../apache/blur/shell/IndexAccessLogCommand.java   |    2 +-
 .../org/apache/blur/shell/ListTablesCommand.java   |    2 +-
 .../src/main/java/org/apache/blur/shell/Main.java  |   12 +-
 .../org/apache/blur/shell/MutateRowCommand.java    |    2 +-
 .../java/org/apache/blur/shell/QueryCommand.java   |    2 +-
 .../org/apache/blur/shell/RemoveTableCommand.java  |    2 +-
 .../org/apache/blur/shell/SchemaTableCommand.java  |    2 +-
 .../apache/blur/shell/ShardClusterListCommand.java |    2 +-
 .../blur/shell/ShardServerLayoutCommand.java       |    2 +-
 .../org/apache/blur/shell/TableStatsCommand.java   |    2 +-
 .../blur/testsuite/CreateInsertQueryRepeating.java |    2 +-
 .../org/apache/blur/testsuite/CreateTable.java     |    2 +-
 .../org/apache/blur/testsuite/DisableTable.java    |    2 +-
 .../org/apache/blur/testsuite/EnableTable.java     |    2 +-
 .../java/org/apache/blur/testsuite/ListTables.java |    2 +-
 .../java/org/apache/blur/testsuite/LoadData.java   |    2 +-
 .../org/apache/blur/testsuite/LoadDataAsync.java   |    4 +-
 .../blur/testsuite/LoadDataAsyncContinuously.java  |    4 +-
 .../blur/testsuite/LoadDataContinuously.java       |    2 +-
 .../org/apache/blur/testsuite/OptimizeTable.java   |    2 +-
 .../apache/blur/testsuite/RandomSearchTable.java   |    2 +-
 .../testsuite/RandomSearchTableContinuously.java   |    2 +-
 .../testsuite/RapidlyCreateAndDeleteTables.java    |    2 +-
 .../org/apache/blur/testsuite/RemoveTable.java     |    2 +-
 .../testsuite/ShardServerLayoutStateTables.java    |    2 +-
 .../apache/blur/testsuite/SimpleQueryExample.java  |    2 +-
 .../java/org/apache/blur/testsuite/StatsTable.java |    2 +-
 src/blur-thrift/pom.xml                            |   40 +-
 .../thirdparty/thrift_0_9_0/EncodingUtils.java     |  148 +
 .../thirdparty/thrift_0_9_0/ProcessFunction.java   |   68 +
 .../blur/thirdparty/thrift_0_9_0/ShortStack.java   |   82 +
 .../thrift_0_9_0/TApplicationException.java        |  124 +
 .../apache/blur/thirdparty/thrift_0_9_0/TBase.java |   81 +
 .../blur/thirdparty/thrift_0_9_0/TBaseHelper.java  |  306 +
 .../thirdparty/thrift_0_9_0/TBaseProcessor.java    |   42 +
 .../thrift_0_9_0/TByteArrayOutputStream.java       |   45 +
 .../thirdparty/thrift_0_9_0/TDeserializer.java     |  346 ++
 .../apache/blur/thirdparty/thrift_0_9_0/TEnum.java |   24 +
 .../blur/thirdparty/thrift_0_9_0/TEnumHelper.java  |   57 +
 .../blur/thirdparty/thrift_0_9_0/TException.java   |   45 +
 .../blur/thirdparty/thrift_0_9_0/TFieldIdEnum.java |   34 +
 .../thrift_0_9_0/TFieldRequirementType.java        |   30 +
 .../blur/thirdparty/thrift_0_9_0/TProcessor.java   |   32 +
 .../thirdparty/thrift_0_9_0/TProcessorFactory.java |   39 +
 .../blur/thirdparty/thrift_0_9_0/TSerializer.java  |  110 +
 .../thirdparty/thrift_0_9_0/TServiceClient.java    |   81 +
 .../thrift_0_9_0/TServiceClientFactory.java        |   45 +
 .../blur/thirdparty/thrift_0_9_0/TUnion.java       |  279 +
 .../thrift_0_9_0/async/AsyncMethodCallback.java    |   39 +
 .../thrift_0_9_0/async/TAsyncClient.java           |  102 +
 .../thrift_0_9_0/async/TAsyncClientFactory.java    |   25 +
 .../thrift_0_9_0/async/TAsyncClientManager.java    |  194 +
 .../thrift_0_9_0/async/TAsyncMethodCall.java       |  270 +
 .../thrift_0_9_0/meta_data/EnumMetaData.java       |   31 +
 .../thrift_0_9_0/meta_data/FieldMetaData.java      |   71 +
 .../thrift_0_9_0/meta_data/FieldValueMetaData.java |   72 +
 .../thrift_0_9_0/meta_data/ListMetaData.java       |   29 +
 .../thrift_0_9_0/meta_data/MapMetaData.java        |   31 +
 .../thrift_0_9_0/meta_data/SetMetaData.java        |   29 +
 .../thrift_0_9_0/meta_data/StructMetaData.java     |   31 +
 .../thrift_0_9_0/protocol/TBase64Utils.java        |  127 +
 .../thrift_0_9_0/protocol/TBinaryProtocol.java     |  398 ++
 .../thrift_0_9_0/protocol/TCompactProtocol.java    |  854 +++
 .../thirdparty/thrift_0_9_0/protocol/TField.java   |   48 +
 .../thrift_0_9_0/protocol/TJSONProtocol.java       |  936 ++++
 .../thirdparty/thrift_0_9_0/protocol/TList.java    |   38 +
 .../thirdparty/thrift_0_9_0/protocol/TMap.java     |   40 +
 .../thirdparty/thrift_0_9_0/protocol/TMessage.java |   57 +
 .../thrift_0_9_0/protocol/TMessageType.java        |   31 +
 .../thrift_0_9_0/protocol/TProtocol.java           |  162 +
 .../thrift_0_9_0/protocol/TProtocolException.java  |   81 +
 .../thrift_0_9_0/protocol/TProtocolFactory.java    |   31 +
 .../thrift_0_9_0/protocol/TProtocolUtil.java       |  220 +
 .../thirdparty/thrift_0_9_0/protocol/TSet.java     |   42 +
 .../thrift_0_9_0/protocol/TSimpleJSONProtocol.java |  385 ++
 .../thirdparty/thrift_0_9_0/protocol/TStruct.java  |   36 +
 .../thrift_0_9_0/protocol/TTupleProtocol.java      |   98 +
 .../thirdparty/thrift_0_9_0/protocol/TType.java    |   40 +
 .../thirdparty/thrift_0_9_0/scheme/IScheme.java    |   29 +
 .../thrift_0_9_0/scheme/SchemeFactory.java         |   25 +
 .../thrift_0_9_0/scheme/StandardScheme.java        |   25 +
 .../thrift_0_9_0/scheme/TupleScheme.java           |   25 +
 .../server/AbstractNonblockingServer.java          |  562 ++
 .../thirdparty/thrift_0_9_0/server/Invocation.java |   20 +
 .../thrift_0_9_0/server/ServerContext.java         |   26 +
 .../thrift_0_9_0/server/TExtensibleServlet.java    |  171 +
 .../thrift_0_9_0/server/THsHaServer.java           |  168 +
 .../thrift_0_9_0/server/TNonblockingServer.java    |  235 +
 .../thirdparty/thrift_0_9_0/server/TServer.java    |  165 +
 .../thrift_0_9_0/server/TServerEventHandler.java   |   59 +
 .../thirdparty/thrift_0_9_0/server/TServlet.java   |  119 +
 .../thrift_0_9_0/server/TSimpleServer.java         |  120 +
 .../thrift_0_9_0/server/TThreadPoolServer.java     |  231 +
 .../server/TThreadedSelectorServer.java            |  649 +++
 .../transport/AutoExpandingBuffer.java             |   52 +
 .../AutoExpandingBufferReadTransport.java          |   86 +
 .../AutoExpandingBufferWriteTransport.java         |   68 +
 .../transport/TFastFramedTransport.java            |  188 +
 .../thrift_0_9_0/transport/TFileProcessor.java     |  130 +
 .../thrift_0_9_0/transport/TFileTransport.java     |  628 +++
 .../thrift_0_9_0/transport/TFramedTransport.java   |  175 +
 .../thrift_0_9_0/transport/THttpClient.java        |  343 ++
 .../thrift_0_9_0/transport/TIOStreamTransport.java |  164 +
 .../thrift_0_9_0/transport/TMemoryBuffer.java      |  103 +
 .../transport/TMemoryInputTransport.java           |   96 +
 .../transport/TNonblockingServerSocket.java        |  150 +
 .../transport/TNonblockingServerTransport.java     |   31 +
 .../thrift_0_9_0/transport/TNonblockingSocket.java |  210 +
 .../transport/TNonblockingTransport.java           |   47 +
 .../transport/TSSLTransportFactory.java            |  332 ++
 .../transport/TSaslClientTransport.java            |  107 +
 .../transport/TSaslServerTransport.java            |  229 +
 .../thrift_0_9_0/transport/TSaslTransport.java     |  548 ++
 .../thrift_0_9_0/transport/TSeekableFile.java      |   33 +
 .../thrift_0_9_0/transport/TServerSocket.java      |  142 +
 .../thrift_0_9_0/transport/TServerTransport.java   |   51 +
 .../thirdparty/thrift_0_9_0/transport/TSocket.java |  207 +
 .../thrift_0_9_0/transport/TStandardFile.java      |   60 +
 .../thrift_0_9_0/transport/TTransport.java         |  161 +
 .../transport/TTransportException.java             |   80 +
 .../thrift_0_9_0/transport/TTransportFactory.java  |   41 +
 .../org/apache/blur/thrift/AbstractCommand.java    |    2 +-
 .../org/apache/blur/thrift/AsyncClientPool.java    |   14 +-
 .../java/org/apache/blur/thrift/BlurClient.java    |    2 +-
 .../org/apache/blur/thrift/BlurClientManager.java  |   12 +-
 .../generated/AlternateColumnDefinition.java       |   70 +-
 .../blur/thrift/generated/AnalyzerDefinition.java  |  104 +-
 .../org/apache/blur/thrift/generated/Blur.java     | 4360 +++++++-------
 .../blur/thrift/generated/BlurException.java       |   82 +-
 .../apache/blur/thrift/generated/BlurQuery.java    |  248 +-
 .../blur/thrift/generated/BlurQueryStatus.java     |  140 +-
 .../apache/blur/thrift/generated/BlurResult.java   |   94 +-
 .../apache/blur/thrift/generated/BlurResults.java  |  164 +-
 .../org/apache/blur/thrift/generated/Column.java   |   82 +-
 .../blur/thrift/generated/ColumnDefinition.java    |  104 +-
 .../thrift/generated/ColumnFamilyDefinition.java   |   92 +-
 .../blur/thrift/generated/ColumnPreCache.java      |   78 +-
 .../org/apache/blur/thrift/generated/CpuTime.java  |   82 +-
 .../apache/blur/thrift/generated/ExpertQuery.java  |   94 +-
 .../org/apache/blur/thrift/generated/Facet.java    |   82 +-
 .../blur/thrift/generated/FetchRecordResult.java   |   82 +-
 .../apache/blur/thrift/generated/FetchResult.java  |  118 +-
 .../blur/thrift/generated/FetchRowResult.java      |   70 +-
 .../apache/blur/thrift/generated/QueryState.java   |    5 +-
 .../org/apache/blur/thrift/generated/Record.java   |  102 +-
 .../blur/thrift/generated/RecordMutation.java      |   82 +-
 .../blur/thrift/generated/RecordMutationType.java  |    5 +-
 .../java/org/apache/blur/thrift/generated/Row.java |  102 +-
 .../apache/blur/thrift/generated/RowMutation.java  |  138 +-
 .../blur/thrift/generated/RowMutationType.java     |    5 +-
 .../org/apache/blur/thrift/generated/Schema.java   |  100 +-
 .../apache/blur/thrift/generated/ScoreType.java    |    5 +-
 .../org/apache/blur/thrift/generated/Selector.java |  194 +-
 .../apache/blur/thrift/generated/ShardState.java   |    5 +-
 .../apache/blur/thrift/generated/SimpleQuery.java  |  118 +-
 .../blur/thrift/generated/TableDescriptor.java     |  246 +-
 .../apache/blur/thrift/generated/TableStats.java   |  118 +-
 .../thrift/server/AbstractNonblockingServer.java   |   26 +-
 .../thrift/server/TThreadedSelectorServer.java     |    6 +-
 src/pom.xml                                        |    2 +-
 181 files changed, 17471 insertions(+), 3817 deletions(-)
----------------------------------------------------------------------



Mime
View raw message