You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2016/10/15 23:55:36 UTC
[24/24] lucene-solr:jira/solr-8396: Merge branch 'master' into
jira/solr-8396
Merge branch 'master' into jira/solr-8396
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5fa22cec
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5fa22cec
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5fa22cec
Branch: refs/heads/jira/solr-8396
Commit: 5fa22ceca04578b944456d22af592610fa23efc0
Parents: c36bca5 5261eb0
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Sat Oct 15 16:52:52 2016 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Sat Oct 15 16:52:52 2016 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 11 +
.../org/apache/lucene/codecs/PointsWriter.java | 7 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 5 +-
.../org/apache/lucene/document/BinaryPoint.java | 3 +-
.../java/org/apache/lucene/document/Field.java | 18 +-
.../java/org/apache/lucene/index/FieldInfo.java | 4 +
.../lucene/search/DisjunctionMaxQuery.java | 2 +-
.../lucene/search/DisjunctionMaxScorer.java | 2 +-
.../org/apache/lucene/search/LRUQueryCache.java | 14 +-
.../apache/lucene/index/TestBagOfPositions.java | 4 +-
.../lucene/search/TestDisjunctionMaxQuery.java | 16 ++
.../lucene/search/join/BlockJoinSelector.java | 4 +-
.../queryparser/simple/SimpleQueryParser.java | 4 +
.../simple/TestSimpleQueryParser.java | 7 +
.../analysis/BaseTokenStreamTestCase.java | 3 +-
.../lucene/index/AssertingLeafReader.java | 10 +-
.../lucene/index/BasePointsFormatTestCase.java | 23 ++
solr/CHANGES.txt | 16 ++
solr/bin/solr | 26 ++-
solr/bin/solr.cmd | 41 +++-
solr/bin/solr.in.cmd | 3 +
solr/bin/solr.in.sh | 5 +-
.../java/org/apache/solr/core/SolrConfig.java | 30 +--
.../org/apache/solr/handler/SQLHandler.java | 18 +-
.../org/apache/solr/handler/StreamHandler.java | 55 +++--
.../solr/handler/component/ResponseBuilder.java | 4 +-
.../org/apache/solr/schema/CurrencyField.java | 6 +-
.../java/org/apache/solr/schema/EnumField.java | 4 +-
.../java/org/apache/solr/schema/FieldType.java | 38 +---
.../java/org/apache/solr/schema/LatLonType.java | 6 +-
.../java/org/apache/solr/schema/PointType.java | 6 +-
.../apache/solr/schema/PreAnalyzedField.java | 4 +-
.../org/apache/solr/schema/SchemaField.java | 63 +++++-
.../java/org/apache/solr/schema/TrieField.java | 3 +-
.../apache/solr/search/facet/FacetBucket.java | 189 ++++++++++++++++
.../apache/solr/search/facet/FacetModule.java | 166 --------------
.../search/facet/FacetRequestSortedMerger.java | 25 ++-
.../apache/solr/servlet/SolrDispatchFilter.java | 1 +
.../solr/servlet/StartupLoggingUtils.java | 9 +
.../src/java/org/apache/solr/util/SolrCLI.java | 215 ++++++++++++++++++-
.../solr/HelloWorldSolrCloudTestCase.java | 94 ++++++++
.../solr/cloud/BaseCdcrDistributedZkTest.java | 1 +
.../test/org/apache/solr/core/HelloStream.java | 100 +++++++++
.../org/apache/solr/core/TestCustomStream.java | 94 ++++++++
.../solr/handler/TestSQLHandlerNonCloud.java | 92 ++++++++
.../search/facet/TestJsonFacetRefinement.java | 214 ++++++++++++++++++
solr/server/resources/log4j.properties | 2 +-
47 files changed, 1361 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fa22cec/solr/core/src/java/org/apache/solr/schema/FieldType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fa22cec/solr/core/src/java/org/apache/solr/schema/SchemaField.java
----------------------------------------------------------------------