You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/02/02 10:53:33 UTC
[21/21] lucene-solr git commit: Merge branch 'master' into
master-solr-8622
Merge branch 'master' into master-solr-8622
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/219f7de9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/219f7de9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/219f7de9
Branch: refs/heads/master-solr-8621
Commit: 219f7de9401ab66eab00647a493d97e0296dfbff
Parents: 14d2b0c c136bd7
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Feb 2 09:51:34 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Feb 2 09:51:34 2016 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 7 +
lucene/benchmark/.gitignore | 2 +
.../org/apache/lucene/document/DoublePoint.java | 6 +
.../org/apache/lucene/document/FloatPoint.java | 6 +
.../org/apache/lucene/document/IntPoint.java | 6 +
.../org/apache/lucene/document/LongPoint.java | 6 +
.../apache/lucene/index/MultiPointValues.java | 4 +-
.../apache/lucene/index/TieredMergePolicy.java | 4 +-
.../org/apache/lucene/index/TestAddIndexes.java | 6 +
.../apache/lucene/index/TestAtomicUpdate.java | 1 +
.../lucene/index/TestCodecHoldsOpenFiles.java | 1 +
.../index/TestIndexWriterExceptions2.java | 1 +
.../lucene/index/TestIndexWriterOnDiskFull.java | 2 +
.../lucene/index/TestIndexWriterOnVMError.java | 1 +
.../apache/lucene/index/TestNoMergePolicy.java | 8 +-
.../apache/lucene/index/TestPointValues.java | 71 ++++++++
.../lucene/index/TestSwappedIndexFiles.java | 12 +-
.../index/TestUpgradeIndexMergePolicy.java | 26 +++
.../lucene/index/TestSortingMergePolicy.java | 8 +-
.../index/BaseIndexFileFormatTestCase.java | 5 +
.../lucene/index/BasePointFormatTestCase.java | 7 +
.../org/apache/lucene/util/LuceneTestCase.java | 64 +++++++
solr/CHANGES.txt | 12 ++
.../solr/handler/dataimport/JdbcDataSource.java | 70 +++++---
.../org/apache/solr/handler/SQLHandler.java | 67 ++++++-
.../solr/handler/component/QueryComponent.java | 48 ++---
.../solr/handler/component/ResponseBuilder.java | 4 +
.../apache/solr/handler/component/ShardDoc.java | 166 +----------------
.../component/ShardFieldSortedHitQueue.java | 179 +++++++++++++++++++
.../solr/response/SortingResponseWriter.java | 100 +++++++----
.../apache/solr/schema/ManagedIndexSchema.java | 4 +-
.../apache/solr/search/ReRankQParserPlugin.java | 27 ++-
.../org/apache/solr/search/join/GraphQuery.java | 89 +++++----
.../solr/search/join/GraphTermsCollector.java | 2 +-
.../response/TestSortingResponseWriter.java | 5 +-
.../solr/rest/schema/TestBulkSchemaAPI.java | 83 +++++++++
.../apache/solr/search/QueryEqualityTest.java | 13 +-
.../solr/search/TestReRankQParserPlugin.java | 63 ++++---
.../apache/solr/search/join/GraphQueryTest.java | 23 +++
.../client/solrj/io/sql/ConnectionImpl.java | 30 ++--
.../solrj/io/sql/DatabaseMetaDataImpl.java | 7 +-
.../solr/client/solrj/io/sql/ResultSetImpl.java | 22 ++-
.../solr/client/solrj/io/sql/StatementImpl.java | 29 +--
.../solr/client/solrj/io/sql/JdbcTest.java | 9 +-
.../solrj/io/stream/StreamExpressionTest.java | 63 +++++++
45 files changed, 987 insertions(+), 382 deletions(-)
----------------------------------------------------------------------