incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/16] git commit: Merge branch '0.2-dev-rat-patch' into 0.2-dev
Date Wed, 31 Oct 2012 02:36:14 GMT
Updated Branches:
  refs/heads/0.2-dev 8d173335a -> 40e607917


Merge branch '0.2-dev-rat-patch' into 0.2-dev


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

Branch: refs/heads/0.2-dev
Commit: 40e607917b366cb50038443b213925f274166274
Parents: 8d17333 99a0c2a
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Oct 30 22:32:54 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Oct 30 22:32:54 2012 -0400

----------------------------------------------------------------------
 conf/hadoop-metrics.properties                     |   16 +
 .../blur/thrift/IndexSearcherParallelCall.java     |   16 +
 .../java/org/apache/blur/thrift/SessionInfo.java   |   26 +-
 .../apache/blur/lucene/search/SuperParserTest.java |   17 +
 src/blur-gui/src/main/webapp/WEB-INF/web.xml       |   22 +-
 src/blur-gui/src/main/webapp/d3.v2.js              |    2 +-
 src/blur-gui/src/main/webapp/index.html            |   20 +
 src/blur-gui/src/main/webapp/style.css             |   20 +-
 src/blur-gui/src/main/webapp/test.html             |   23 +-
 src/blur-new-api-prototype/generateThrift.sh       |    1 -
 src/blur-new-api-prototype/service.thrift          |  165 -
 .../java/org/apache/blur/cache/BlockCache.java     |  178 -
 .../java/org/apache/blur/cache/BlockCacheKey.java  |   73 -
 .../org/apache/blur/cache/BlockCacheLocation.java  |   66 -
 .../java/org/apache/blur/cache/BlockDirectory.java |  295 -
 .../org/apache/blur/cache/BlockDirectoryCache.java |   68 -
 .../java/org/apache/blur/cache/BlockLocks.java     |   96 -
 .../java/org/apache/blur/cache/BufferStore.java    |   96 -
 .../src/main/java/org/apache/blur/cache/Cache.java |   29 -
 .../blur/cache/ReusedBufferedIndexInput.java       |  349 -
 .../main/java/org/apache/blur/core/ServerFile.java |   50 -
 .../main/java/org/apache/blur/core/ServerHdfs.java |  369 -
 .../apache/blur/core/TupleStoredFieldVisitor.java  |  169 -
 .../src/main/java/org/apache/blur/core/Util.java   |  121 -
 .../org/apache/blur/core/sessions/ReadSession.java |   56 -
 .../blur/core/sessions/RunningQuerySession.java    |  193 -
 .../apache/blur/core/sessions/WriteSession.java    |   83 -
 .../blur/core/sessions/WriteSessionThreaded.java   |   99 -
 .../core/sessions/WriteSessionThreadedFile.java    |   50 -
 .../core/sessions/WriteSessionThreadedPath.java    |   49 -
 .../lucene/serializer/AbtractQueryWritable.java    |   10 -
 .../lucene/serializer/BooleanClauseWritable.java   |   71 -
 .../lucene/serializer/BooleanQueryWritable.java    |   57 -
 .../blur/lucene/serializer/FuzzyQueryWritable.java |   89 -
 .../blur/lucene/serializer/ProtoSerializer.java    |   63 -
 .../apache/blur/lucene/serializer/QUERY_TYPE.java  |  113 -
 .../blur/lucene/serializer/QueryWritable.java      |   51 -
 .../blur/lucene/serializer/SerializerUtil.java     |   37 -
 .../blur/lucene/serializer/TermQueryWritable.java  |   46 -
 .../blur/lucene/serializer/TermWritable.java       |   46 -
 .../java/org/apache/blur/parser/BqlException.java  |   17 +
 .../java/org/apache/blur/parser/BqlParser.java     |   17 +
 .../example/clients/LoadThriftClientBatch.java     |  117 -
 .../example/clients/ReadThriftClientBatch.java     |   97 -
 .../blur/proto/example/clients/SimpleCli.java      |  128 -
 .../org/apache/blur/store/SimpleHDFSDirectory.java |  184 -
 .../org/apache/blur/thrift/AbstractCommand.java    |   30 -
 .../java/org/apache/blur/thrift/ClientManager.java |  336 -
 .../main/java/org/apache/blur/thrift/Command.java  |   24 -
 .../java/org/apache/blur/thrift/Connection.java    |  130 -
 .../apache/blur/thrift/generated/Attribute.java    |  524 -
 .../org/apache/blur/thrift/generated/Blur.java     | 7007 -----------
 .../blur/thrift/generated/BlurException.java       |  408 -
 .../apache/blur/thrift/generated/BlurShard.java    | 7105 -----------
 .../apache/blur/thrift/generated/BlurTuple.java    | 7007 -----------
 .../apache/blur/thrift/generated/DocLocation.java  |  403 -
 .../org/apache/blur/thrift/generated/Document.java |  357 -
 .../org/apache/blur/thrift/generated/Field.java    |  613 -
 .../org/apache/blur/thrift/generated/Lucene.java   | 9299 ---------------
 .../apache/blur/thrift/generated/QueryArgs.java    |  993 --
 .../apache/blur/thrift/generated/QuerySession.java |  409 -
 .../org/apache/blur/thrift/generated/Record.java   |  357 -
 .../org/apache/blur/thrift/generated/ScoreDoc.java |  537 -
 .../org/apache/blur/thrift/generated/Session.java  |  453 -
 .../org/apache/blur/thrift/generated/Sort.java     |  357 -
 .../apache/blur/thrift/generated/SortField.java    |  513 -
 .../org/apache/blur/thrift/generated/SortType.java |  116 -
 .../org/apache/blur/thrift/generated/TYPE.java     |   62 -
 .../org/apache/blur/thrift/generated/Term.java     |  419 -
 .../apache/blur/thrift/generated/TopFieldDocs.java |  657 -
 .../org/apache/blur/thrift/generated/Tuple.java    |  357 -
 .../java/org/apache/blur/parser/BqlParserTest.java |   17 +
 src/blur-new-api-prototype/startServer.sh          |    2 -
 .../lucene/serializer/AbtractQueryWritable.java    |   21 +-
 .../lucene/serializer/BooleanClauseWritable.java   |   16 +
 .../lucene/serializer/BooleanQueryWritable.java    |   16 +
 .../blur/lucene/serializer/FuzzyQueryWritable.java |   16 +
 .../blur/lucene/serializer/ProtoSerializer.java    |   16 +
 .../apache/blur/lucene/serializer/QUERY_TYPE.java  |   20 +-
 .../blur/lucene/serializer/QueryWritable.java      |   16 +
 .../blur/lucene/serializer/SerializerUtil.java     |   16 +
 .../blur/lucene/serializer/TermQueryWritable.java  |   16 +
 .../blur/lucene/serializer/TermWritable.java       |   16 +
 .../org/apache/blur/store/hdfs/HdfsDirectory.java  |   17 +
 src/blur-testsuite/conf/blur-env.sh                |   16 +
 src/blur-testsuite/conf/blur-site.properties       |   18 +-
 .../org/apache/blur/thrift/ConnectionTest.java     |   17 +
 .../java/org/apache/blur/metrics/HeapMetrics.java  |   17 +
 .../java/org/apache/blur/metrics/QueryMetrics.java |   17 +
 .../org/apache/blur/metrics/SystemLoadMetrics.java |   17 +
 .../src/main/resources/hadoop-metrics.properties   |   15 +
 src/blur-util/src/test/resources/zoo.cfg           |   18 +-
 .../lucene-core/3.6.1.lm/lucene-core-3.6.1.lm.jar  |  Bin 1538596 -> 0 bytes
 .../lucene-core/3.6.1.lm/lucene_3.6.1.lm.patch     |  367 -
 src/pom.xml                                        |    9 +
 95 files changed, 525 insertions(+), 42624 deletions(-)
----------------------------------------------------------------------



Mime
View raw message